eliott/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird synced 2026-05-01 12:07:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

LibJS: Integrate Symbols into objects as valid keys

Browse Source 
This allows objects properties to be created for symbol keys in addition
to just plain strings/numbers
This commit is contained in:
Matthew Olsson
2020-07-07 21:38:46 -07:00
committed by Andreas Kling
parent 9783a4936c
commit 7a1d485b19
Notes: sideshowbarker 2024-07-19 04:59:39 +09:00 
Author: https://github.com/mattco98
Commit: https://github.com/SerenityOS/serenity/commit/7a1d485b19a
Pull-request: https://github.com/SerenityOS/serenity/pull/2744
14 changed files with 424 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Libraries/LibJS/Runtime/ObjectConstructor.cpp
View File

@@ -84,8 +84,11 @@ JS_DEFINE_NATIVE_FUNCTION(ObjectConstructor::get_own_property_names)
auto* result = Array::create(global_object);
for (auto& entry : object->indexed_properties())
result->indexed_properties().append(js_string(interpreter, String::number(entry.index())));
for (auto& it : object->shape().property_table_ordered())
result->indexed_properties().append(js_string(interpreter, it.key));
for (auto& it : object->shape().property_table_ordered()) {
if (!it.key.is_string())
continue;
result->indexed_properties().append(js_string(interpreter, it.key.as_string()));
}
return result;
}
@@ -151,7 +154,7 @@ JS_DEFINE_NATIVE_FUNCTION(ObjectConstructor::get_own_property_descriptor)
auto* object = interpreter.argument(0).to_object(interpreter, global_object);
if (interpreter.exception())
return {};
auto property_key = interpreter.argument(1).to_string(interpreter);
auto property_key = PropertyName::from_value(interpreter, interpreter.argument(1));
if (interpreter.exception())
return {};
return object->get_own_property_descriptor_object(property_key);
@@ -164,7 +167,7 @@ JS_DEFINE_NATIVE_FUNCTION(ObjectConstructor::define_property_)
if (!interpreter.argument(2).is_object())
return interpreter.throw_exception<TypeError>(ErrorType::NotAnObject, "Descriptor argument");
auto& object = interpreter.argument(0).as_object();
auto property_key = interpreter.argument(1).to_string(interpreter);
auto property_key = StringOrSymbol::from_value(interpreter, interpreter.argument(1));
if (interpreter.exception())
return {};
auto& descriptor = interpreter.argument(2).as_object();
@@ -173,7 +176,7 @@ JS_DEFINE_NATIVE_FUNCTION(ObjectConstructor::define_property_)
if (object.is_proxy_object()) {
interpreter.throw_exception<TypeError>(ErrorType::ObjectDefinePropertyReturnedFalse);
} else {
interpreter.throw_exception<TypeError>(ErrorType::NonExtensibleDefine, property_key.characters());
interpreter.throw_exception<TypeError>(ErrorType::NonExtensibleDefine, property_key.to_display_string().characters());
}
}
return {};
@@ -195,7 +198,7 @@ JS_DEFINE_NATIVE_FUNCTION(ObjectConstructor::keys)
if (interpreter.exception())
return {};
return obj_arg->get_own_properties(*obj_arg, GetOwnPropertyMode::Key, true);
return obj_arg->get_own_properties(*obj_arg, GetOwnPropertyReturnMode::Key, true);
}
JS_DEFINE_NATIVE_FUNCTION(ObjectConstructor::values)
@@ -207,7 +210,7 @@ JS_DEFINE_NATIVE_FUNCTION(ObjectConstructor::values)
if (interpreter.exception())
return {};
return obj_arg->get_own_properties(*obj_arg, GetOwnPropertyMode::Value, true);
return obj_arg->get_own_properties(*obj_arg, GetOwnPropertyReturnMode::Value, true);
}
JS_DEFINE_NATIVE_FUNCTION(ObjectConstructor::entries)
@@ -219,7 +222,7 @@ JS_DEFINE_NATIVE_FUNCTION(ObjectConstructor::entries)
if (interpreter.exception())
return {};
return obj_arg->get_own_properties(*obj_arg, GetOwnPropertyMode::KeyAndValue, true);
return obj_arg->get_own_properties(*obj_arg, GetOwnPropertyReturnMode::KeyAndValue, true);
}
}