Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement Object.hasOwn property #952

Merged
merged 1 commit into from
Aug 24, 2021
Merged

Implement Object.hasOwn property #952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/builtins/BuiltinObject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,13 @@ static Value builtinObjectToString(ExecutionState& state, Value thisValue, size_
return strings->lazyObjectObjectToString().string();
}

static Value builtinObjectHasOwn(ExecutionState& state, Value thisValue, size_t argc, Value* argv, Optional<Object*> newTarget)
{
Object* obj = argv[0].toObject(state);
Value key = argv[1].toPropertyKey(state);
return Value(obj->hasOwnProperty(state, ObjectPropertyName(state, key)));
}

static Value builtinObjectHasOwnProperty(ExecutionState& state, Value thisValue, size_t argc, Value* argv, Optional<Object*> newTarget)
{
Value key = argv[0].toPrimitive(state, Value::PrimitiveTypeHint::PreferString);
Expand Down Expand Up @@ -869,6 +876,10 @@ void GlobalObject::installObject(ExecutionState& state)
ObjectPropertyDescriptor(new NativeFunctionObject(state, NativeFunctionInfo(strings.entries, builtinObjectEntries, 1, NativeFunctionInfo::Strict)),
(ObjectPropertyDescriptor::PresentAttribute)(ObjectPropertyDescriptor::WritablePresent | ObjectPropertyDescriptor::ConfigurablePresent)));

// Object.hasOwn
m_object->defineOwnProperty(state, ObjectPropertyName(strings.hasOwn),
ObjectPropertyDescriptor(new NativeFunctionObject(state, NativeFunctionInfo(strings.hasOwn, builtinObjectHasOwn, 2, NativeFunctionInfo::Strict)), (ObjectPropertyDescriptor::PresentAttribute)(ObjectPropertyDescriptor::WritablePresent | ObjectPropertyDescriptor::ConfigurablePresent)));

// $19.1.3.2 Object.prototype.hasOwnProperty(V)
m_objectPrototype->defineOwnProperty(state, ObjectPropertyName(strings.hasOwnProperty),
ObjectPropertyDescriptor(new NativeFunctionObject(state, NativeFunctionInfo(strings.hasOwnProperty, builtinObjectHasOwnProperty, 1, NativeFunctionInfo::Strict)), (ObjectPropertyDescriptor::PresentAttribute)(ObjectPropertyDescriptor::WritablePresent | ObjectPropertyDescriptor::ConfigurablePresent)));
Expand Down
1 change: 1 addition & 0 deletions src/runtime/StaticStrings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,7 @@ namespace Escargot {
F(groups) \
F(has) \
F(hasInstance) \
F(hasOwn) \
F(hasOwnProperty) \
F(hourCycle) \
F(hypot) \
Expand Down
58 changes: 0 additions & 58 deletions tools/test/test262/excludelist.orig.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,64 +246,6 @@
<test id="built-ins/NativeErrors/AggregateError/cause-property"><reason>TODO</reason></test>
<test id="built-ins/NativeErrors/cause_property_native_error"><reason>TODO</reason></test>
<test id="built-ins/Object/freeze/proxy-with-defineProperty-handler"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/descriptor"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_inherited_exists"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_inherited_getter"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_inherited_getter_and_setter"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_inherited_getter_and_setter_configurable_enumerable"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_inherited_getter_and_setter_configurable_nonenumerable"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_inherited_getter_and_setter_nonconfigurable_enumerable"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_inherited_getter_and_setter_nonconfigurable_nonenumerable"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_inherited_getter_configurable_enumerable"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_inherited_getter_configurable_nonenumerable"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_inherited_getter_nonconfigurable_enumerable"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_inherited_getter_nonconfigurable_nonenumerable"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_inherited_nonwritable_configurable_enumerable"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_inherited_nonwritable_configurable_nonenumerable"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_inherited_nonwritable_nonconfigurable_enumerable"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_inherited_nonwritable_nonconfigurable_nonenumerable"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_inherited_setter"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_inherited_setter_configurable_enumerable"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_inherited_setter_configurable_nonenumerable"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_inherited_setter_nonconfigurable_enumerable"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_inherited_setter_nonconfigurable_nonenumerable"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_inherited_writable_configurable_enumerable"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_inherited_writable_configurable_nonenumerable"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_inherited_writable_nonconfigurable_enumerable"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_inherited_writable_nonconfigurable_nonenumerable"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_nonexistent"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_own_getter"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_own_getter_and_setter"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_own_getter_and_setter_configurable_enumerable"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_own_getter_and_setter_configurable_nonenumerable"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_own_getter_and_setter_nonconfigurable_enumerable"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_own_getter_and_setter_nonconfigurable_nonenumerable"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_own_getter_configurable_enumerable"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_own_getter_configurable_nonenumerable"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_own_getter_nonconfigurable_enumerable"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_own_getter_nonconfigurable_nonenumerable"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_own_nonwritable_configurable_enumerable"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_own_nonwritable_nonconfigurable_enumerable"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_own_nonwriteable_configurable_nonenumerable"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_own_nonwriteable_nonconfigurable_nonenumerable"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_own_property_exists"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_own_setter"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_own_setter_configurable_enumerable"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_own_setter_configurable_nonenumerable"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_own_setter_nonconfigurable_enumerable"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_own_setter_nonconfigurable_nonenumerable"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_own_writable_configurable_enumerable"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_own_writable_configurable_nonenumerable"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_own_writable_nonconfigurable_enumerable"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/hasown_own_writable_nonconfigurable_nonenumerable"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/length"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/name"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/prototype"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/symbol_own_property"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/symbol_property_toPrimitive"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/symbol_property_toString"><reason>TODO</reason></test>
<test id="built-ins/Object/hasOwn/symbol_property_valueOf"><reason>TODO</reason></test>
<test id="built-ins/Object/seal/proxy-with-defineProperty-handler"><reason>TODO</reason></test>
<test id="built-ins/Realm/constructor"><reason>TODO</reason></test>
<test id="built-ins/Realm/descriptor"><reason>TODO</reason></test>
Expand Down