RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-30 23:18:10 +00:00
Code Issues Activity Actions

LibJS: Reduce Interpreter& usage in the Object class

Browse source
This commit is contained in:
Andreas Kling 2020-09-27 19:57:16 +02:00
parent b9793e603c
commit c59a8d84d3
1 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Libraries/LibJS/Runtime/Object.cpp
View file

@ -189,13 +189,13 @@ Value Object::get_own_properties(const Object& this_object, PropertyKind kind, b
for (size_t i = 0; i < str.length(); ++i) { for (size_t i = 0; i < str.length(); ++i) {
if (kind == PropertyKind::Key) { if (kind == PropertyKind::Key) {
properties_array->define_property(i, js_string(interpreter(), String::number(i))); properties_array->define_property(i, js_string(vm(), String::number(i)));
} else if (kind == PropertyKind::Value) { } else if (kind == PropertyKind::Value) {
properties_array->define_property(i, js_string(interpreter(), String::format("%c", str[i]))); properties_array->define_property(i, js_string(vm(), String::format("%c", str[i])));
} else { } else {
auto* entry_array = Array::create(global_object()); auto* entry_array = Array::create(global_object());
entry_array->define_property(0, js_string(interpreter(), String::number(i))); entry_array->define_property(0, js_string(vm(), String::number(i)));
entry_array->define_property(1, js_string(interpreter(), String::format("%c", str[i]))); entry_array->define_property(1, js_string(vm(), String::format("%c", str[i])));
properties_array->define_property(i, entry_array); properties_array->define_property(i, entry_array);
} }
if (vm().exception()) if (vm().exception())
@ -212,12 +212,12 @@ Value Object::get_own_properties(const Object& this_object, PropertyKind kind, b
continue; continue;
if (kind == PropertyKind::Key) { if (kind == PropertyKind::Key) {
properties_array->define_property(property_index, js_string(interpreter(), String::number(entry.index()))); properties_array->define_property(property_index, js_string(vm(), String::number(entry.index())));
} else if (kind == PropertyKind::Value) { } else if (kind == PropertyKind::Value) {
properties_array->define_property(property_index, value_and_attributes.value); properties_array->define_property(property_index, value_and_attributes.value);
} else { } else {
auto* entry_array = Array::create(global_object()); auto* entry_array = Array::create(global_object());
entry_array->define_property(0, js_string(interpreter(), String::number(entry.index()))); entry_array->define_property(0, js_string(vm(), String::number(entry.index())));
entry_array->define_property(1, value_and_attributes.value); entry_array->define_property(1, value_and_attributes.value);
properties_array->define_property(property_index, entry_array); properties_array->define_property(property_index, entry_array);
} }
@ -358,7 +358,7 @@ bool Object::define_property(const StringOrSymbol& property_name, const Object&
if (is_accessor_property) { if (is_accessor_property) {
if (descriptor.has_property("value") || descriptor.has_property("writable")) { if (descriptor.has_property("value") || descriptor.has_property("writable")) {
if (throw_exceptions) if (throw_exceptions)
interpreter().vm().throw_exception<TypeError>(global_object(), ErrorType::AccessorValueOrWritable); vm().throw_exception<TypeError>(global_object(), ErrorType::AccessorValueOrWritable);
return false; return false;
} }
@ -375,14 +375,14 @@ bool Object::define_property(const StringOrSymbol& property_name, const Object&
if (getter.is_function()) { if (getter.is_function()) {
getter_function = &getter.as_function(); getter_function = &getter.as_function();
} else if (!getter.is_undefined()) { } else if (!getter.is_undefined()) {
interpreter().vm().throw_exception<TypeError>(global_object(), ErrorType::AccessorBadField, "get"); vm().throw_exception<TypeError>(global_object(), ErrorType::AccessorBadField, "get");
return false; return false;
} }
if (setter.is_function()) { if (setter.is_function()) {
setter_function = &setter.as_function(); setter_function = &setter.as_function();
} else if (!setter.is_undefined()) { } else if (!setter.is_undefined()) {
interpreter().vm().throw_exception<TypeError>(global_object(), ErrorType::AccessorBadField, "set"); vm().throw_exception<TypeError>(global_object(), ErrorType::AccessorBadField, "set");
return false; return false;
} }
@ -465,7 +465,7 @@ bool Object::put_own_property(Object& this_object, const StringOrSymbol& propert
dbg() << "Disallow define_property of non-extensible object"; dbg() << "Disallow define_property of non-extensible object";
#endif #endif
if (throw_exceptions && interpreter().in_strict_mode()) if (throw_exceptions && interpreter().in_strict_mode())
interpreter().vm().throw_exception<TypeError>(global_object(), ErrorType::NonExtensibleDefine, property_name.to_display_string().characters()); vm().throw_exception<TypeError>(global_object(), ErrorType::NonExtensibleDefine, property_name.to_display_string().characters());
return false; return false;
} }
@ -499,7 +499,7 @@ bool Object::put_own_property(Object& this_object, const StringOrSymbol& propert
dbg() << "Disallow reconfig of non-configurable property"; dbg() << "Disallow reconfig of non-configurable property";
#endif #endif
if (throw_exceptions) if (throw_exceptions)
interpreter().vm().throw_exception<TypeError>(global_object(), ErrorType::DescChangeNonConfigurable, property_name.to_display_string().characters()); vm().throw_exception<TypeError>(global_object(), ErrorType::DescChangeNonConfigurable, property_name.to_display_string().characters());
return false; return false;
} }
@ -837,17 +837,17 @@ Value Object::to_primitive(Value::PreferredType preferred_type) const
Value Object::to_string() const Value Object::to_string() const
{ {
auto& vm = this->vm();
auto to_string_property = get("toString"); auto to_string_property = get("toString");
if (to_string_property.is_function()) { if (to_string_property.is_function()) {
auto& to_string_function = to_string_property.as_function(); auto& to_string_function = to_string_property.as_function();
auto& interpreter = const_cast<Object*>(this)->interpreter(); auto to_string_result = vm.call(to_string_function, const_cast<Object*>(this));
auto to_string_result = interpreter.call(to_string_function, const_cast<Object*>(this));
if (to_string_result.is_object()) if (to_string_result.is_object())
interpreter.vm().throw_exception<TypeError>(global_object(), ErrorType::Convert, "object", "string"); vm.throw_exception<TypeError>(global_object(), ErrorType::Convert, "object", "string");
if (interpreter.exception()) if (vm.exception())
return {}; return {};
auto* string = to_string_result.to_primitive_string(global_object()); auto* string = to_string_result.to_primitive_string(global_object());
if (interpreter.exception()) if (vm.exception())
return {}; return {};
return string; return string;
} }
@ -856,15 +856,15 @@ Value Object::to_string() const
Value Object::invoke(const StringOrSymbol& property_name, Optional<MarkedValueList> arguments) Value Object::invoke(const StringOrSymbol& property_name, Optional<MarkedValueList> arguments)
{ {
auto& interpreter = this->interpreter(); auto& vm = this->vm();
auto property = get(property_name).value_or(js_undefined()); auto property = get(property_name).value_or(js_undefined());
if (interpreter.exception()) if (vm.exception())
return {}; return {};
if (!property.is_function()) { if (!property.is_function()) {
interpreter.vm().throw_exception<TypeError>(global_object(), ErrorType::NotAFunction, property.to_string_without_side_effects().characters()); vm.throw_exception<TypeError>(global_object(), ErrorType::NotAFunction, property.to_string_without_side_effects().characters());
return {}; return {};
} }
return interpreter.call(property.as_function(), this, move(arguments)); return vm.call(property.as_function(), this, move(arguments));
} }
Value Object::call_native_property_getter(Object* this_object, Value property) const Value Object::call_native_property_getter(Object* this_object, Value property) const