RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-06-01 04:08:10 +00:00
Code Issues Activity Actions

LibJS: Use correct MarkedValueList append method

Browse source
This commit is contained in:
Matthew Olsson 2020-07-02 15:23:42 -07:00 • committed by Andreas Kling
parent 02debd8a6d
commit 21064a1883
3 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Libraries/LibJS/Runtime/Accessor.h
View file

@ -64,7 +64,7 @@ public:
if (!m_setter) if (!m_setter)
return; return;
MarkedValueList arguments(interpreter().heap()); MarkedValueList arguments(interpreter().heap());
arguments.values().append(setter_value); arguments.append(setter_value);
interpreter().call(*m_setter, this_value, move(arguments)); interpreter().call(*m_setter, this_value, move(arguments));
} }

8
Libraries/LibJS/Runtime/JSONObject.cpp
View file

@ -151,8 +151,8 @@ String JSONObject::serialize_json_property(Interpreter& interpreter, StringifySt
if (state.replacer_function) { if (state.replacer_function) {
MarkedValueList arguments(interpreter.heap()); MarkedValueList arguments(interpreter.heap());
arguments.values().append(js_string(interpreter, key.to_string())); arguments.append(js_string(interpreter, key.to_string()));
arguments.values().append(value); arguments.append(value);
value = interpreter.call(*state.replacer_function, holder, move(arguments)); value = interpreter.call(*state.replacer_function, holder, move(arguments));
if (interpreter.exception()) if (interpreter.exception())
return {}; return {};
@ -482,8 +482,8 @@ Value JSONObject::internalize_json_property(Interpreter& interpreter, Object* ho
} }
} }
MarkedValueList arguments(interpreter.heap()); MarkedValueList arguments(interpreter.heap());
arguments.values().append(js_string(interpreter, name.to_string())); arguments.append(js_string(interpreter, name.to_string()));
arguments.values().append(value); arguments.append(value);
return interpreter.call(reviver, Value(holder), move(arguments)); return interpreter.call(reviver, Value(holder), move(arguments));
} }

54
Libraries/LibJS/Runtime/ProxyObject.cpp
View file

@ -90,7 +90,7 @@ Object* ProxyObject::prototype()
return nullptr; return nullptr;
} }
MarkedValueList arguments(interpreter().heap()); MarkedValueList arguments(interpreter().heap());
arguments.values().append(Value(&m_target)); arguments.append(Value(&m_target));
auto trap_result = interpreter().call(trap.as_function(), Value(&m_handler), move(arguments)); auto trap_result = interpreter().call(trap.as_function(), Value(&m_handler), move(arguments));
if (interpreter().exception()) if (interpreter().exception())
return nullptr; return nullptr;
@ -140,8 +140,8 @@ bool ProxyObject::set_prototype(Object* object)
return false; return false;
} }
MarkedValueList arguments(interpreter().heap()); MarkedValueList arguments(interpreter().heap());
arguments.values().append(Value(&m_target)); arguments.append(Value(&m_target));
arguments.values().append(Value(object)); arguments.append(Value(object));
auto trap_result = interpreter().call(trap.as_function(), Value(&m_handler), move(arguments)).to_boolean(); auto trap_result = interpreter().call(trap.as_function(), Value(&m_handler), move(arguments)).to_boolean();
if (interpreter().exception() || !trap_result) if (interpreter().exception() || !trap_result)
return false; return false;
@ -173,7 +173,7 @@ bool ProxyObject::is_extensible() const
return {}; return {};
} }
MarkedValueList arguments(interpreter().heap()); MarkedValueList arguments(interpreter().heap());
arguments.values().append(Value(&m_target)); arguments.append(Value(&m_target));
auto trap_result = interpreter().call(trap.as_function(), Value(&m_handler), move(arguments)).to_boolean(); auto trap_result = interpreter().call(trap.as_function(), Value(&m_handler), move(arguments)).to_boolean();
if (interpreter().exception()) if (interpreter().exception())
return false; return false;
@ -201,7 +201,7 @@ bool ProxyObject::prevent_extensions()
return {}; return {};
} }
MarkedValueList arguments(interpreter().heap()); MarkedValueList arguments(interpreter().heap());
arguments.values().append(Value(&m_target)); arguments.append(Value(&m_target));
auto trap_result = interpreter().call(trap.as_function(), Value(&m_handler), move(arguments)).to_boolean(); auto trap_result = interpreter().call(trap.as_function(), Value(&m_handler), move(arguments)).to_boolean();
if (interpreter().exception()) if (interpreter().exception())
return false; return false;
@ -229,8 +229,8 @@ Optional<PropertyDescriptor> ProxyObject::get_own_property_descriptor(PropertyNa
return {}; return {};
} }
MarkedValueList arguments(interpreter().heap()); MarkedValueList arguments(interpreter().heap());
arguments.values().append(Value(&m_target)); arguments.append(Value(&m_target));
arguments.values().append(js_string(interpreter(), name.to_string())); arguments.append(js_string(interpreter(), name.to_string()));
auto trap_result = interpreter().call(trap.as_function(), Value(&m_handler), move(arguments)); auto trap_result = interpreter().call(trap.as_function(), Value(&m_handler), move(arguments));
if (interpreter().exception()) if (interpreter().exception())
return {}; return {};
@ -286,9 +286,9 @@ bool ProxyObject::define_property(const FlyString& property_name, const Object&
return false; return false;
} }
MarkedValueList arguments(interpreter().heap()); MarkedValueList arguments(interpreter().heap());
arguments.values().append(Value(&m_target)); arguments.append(Value(&m_target));
arguments.values().append(js_string(interpreter(), property_name)); arguments.append(js_string(interpreter(), property_name));
arguments.values().append(Value(const_cast<Object*>(&descriptor))); arguments.append(Value(const_cast<Object*>(&descriptor)));
auto trap_result = interpreter().call(trap.as_function(), Value(&m_handler), move(arguments)).to_boolean(); auto trap_result = interpreter().call(trap.as_function(), Value(&m_handler), move(arguments)).to_boolean();
if (interpreter().exception() || !trap_result) if (interpreter().exception() || !trap_result)
return false; return false;
@ -340,8 +340,8 @@ bool ProxyObject::has_property(PropertyName name) const
return false; return false;
} }
MarkedValueList arguments(interpreter().heap()); MarkedValueList arguments(interpreter().heap());
arguments.values().append(Value(&m_target)); arguments.append(Value(&m_target));
arguments.values().append(js_string(interpreter(), name.to_string())); arguments.append(js_string(interpreter(), name.to_string()));
auto trap_result = interpreter().call(trap.as_function(), Value(&m_handler), move(arguments)).to_boolean(); auto trap_result = interpreter().call(trap.as_function(), Value(&m_handler), move(arguments)).to_boolean();
if (interpreter().exception()) if (interpreter().exception())
return false; return false;
@ -378,9 +378,9 @@ Value ProxyObject::get(PropertyName name, Value) const
if (!trap.is_function()) if (!trap.is_function())
return interpreter().throw_exception<TypeError>(ErrorType::ProxyInvalidTrap, "get"); return interpreter().throw_exception<TypeError>(ErrorType::ProxyInvalidTrap, "get");
MarkedValueList arguments(interpreter().heap()); MarkedValueList arguments(interpreter().heap());
arguments.values().append(Value(&m_target)); arguments.append(Value(&m_target));
arguments.values().append(js_string(interpreter(), name.to_string())); arguments.append(js_string(interpreter(), name.to_string()));
arguments.values().append(Value(const_cast<ProxyObject*>(this))); arguments.append(Value(const_cast<ProxyObject*>(this)));
auto trap_result = interpreter().call(trap.as_function(), Value(&m_handler), move(arguments)); auto trap_result = interpreter().call(trap.as_function(), Value(&m_handler), move(arguments));
if (interpreter().exception()) if (interpreter().exception())
return {}; return {};
@ -412,10 +412,10 @@ bool ProxyObject::put(PropertyName name, Value value, Value)
return false; return false;
} }
MarkedValueList arguments(interpreter().heap()); MarkedValueList arguments(interpreter().heap());
arguments.values().append(Value(&m_target)); arguments.append(Value(&m_target));
arguments.values().append(js_string(interpreter(), name.to_string())); arguments.append(js_string(interpreter(), name.to_string()));
arguments.values().append(value); arguments.append(value);
arguments.values().append(Value(const_cast<ProxyObject*>(this))); arguments.append(Value(const_cast<ProxyObject*>(this)));
auto trap_result = interpreter().call(trap.as_function(), Value(&m_handler), move(arguments)).to_boolean(); auto trap_result = interpreter().call(trap.as_function(), Value(&m_handler), move(arguments)).to_boolean();
if (interpreter().exception() || !trap_result) if (interpreter().exception() || !trap_result)
return false; return false;
@ -448,8 +448,8 @@ Value ProxyObject::delete_property(PropertyName name)
if (!trap.is_function()) if (!trap.is_function())
return interpreter().throw_exception<TypeError>(ErrorType::ProxyInvalidTrap, "deleteProperty"); return interpreter().throw_exception<TypeError>(ErrorType::ProxyInvalidTrap, "deleteProperty");
MarkedValueList arguments(interpreter().heap()); MarkedValueList arguments(interpreter().heap());
arguments.values().append(Value(&m_target)); arguments.append(Value(&m_target));
arguments.values().append(js_string(interpreter(), name.to_string())); arguments.append(js_string(interpreter(), name.to_string()));
auto trap_result = interpreter().call(trap.as_function(), Value(&m_handler), move(arguments)).to_boolean(); auto trap_result = interpreter().call(trap.as_function(), Value(&m_handler), move(arguments)).to_boolean();
if (interpreter().exception()) if (interpreter().exception())
return {}; return {};
@ -489,14 +489,14 @@ Value ProxyObject::call(Interpreter& interpreter) {
return interpreter.throw_exception<TypeError>(ErrorType::ProxyInvalidTrap, "apply"); return interpreter.throw_exception<TypeError>(ErrorType::ProxyInvalidTrap, "apply");
MarkedValueList arguments(interpreter.heap()); MarkedValueList arguments(interpreter.heap());
arguments.values().append(Value(&m_target)); arguments.append(Value(&m_target));
arguments.values().append(Value(&m_handler)); arguments.append(Value(&m_handler));
// FIXME: Pass global object // FIXME: Pass global object
auto arguments_array = Array::create(interpreter.global_object()); auto arguments_array = Array::create(interpreter.global_object());
interpreter.for_each_argument([&](auto& argument) { interpreter.for_each_argument([&](auto& argument) {
arguments_array->indexed_properties().append(argument); arguments_array->indexed_properties().append(argument);
}); });
arguments.values().append(arguments_array); arguments.append(arguments_array);
return interpreter.call(trap.as_function(), Value(&m_handler), move(arguments)); return interpreter.call(trap.as_function(), Value(&m_handler), move(arguments));
} }
@ -518,13 +518,13 @@ Value ProxyObject::construct(Interpreter& interpreter, Function& new_target) {
return interpreter.throw_exception<TypeError>(ErrorType::ProxyInvalidTrap, "construct"); return interpreter.throw_exception<TypeError>(ErrorType::ProxyInvalidTrap, "construct");
MarkedValueList arguments(interpreter.heap()); MarkedValueList arguments(interpreter.heap());
arguments.values().append(Value(&m_target)); arguments.append(Value(&m_target));
auto arguments_array = Array::create(interpreter.global_object()); auto arguments_array = Array::create(interpreter.global_object());
interpreter.for_each_argument([&](auto& argument) { interpreter.for_each_argument([&](auto& argument) {
arguments_array->indexed_properties().append(argument); arguments_array->indexed_properties().append(argument);
}); });
arguments.values().append(arguments_array); arguments.append(arguments_array);
arguments.values().append(Value(&new_target)); arguments.append(Value(&new_target));
auto result = interpreter.call(trap.as_function(), Value(&m_handler), move(arguments)); auto result = interpreter.call(trap.as_function(), Value(&m_handler), move(arguments));
if (!result.is_object()) if (!result.is_object())
return interpreter.throw_exception<TypeError>(ErrorType::ProxyConstructBadReturnType); return interpreter.throw_exception<TypeError>(ErrorType::ProxyConstructBadReturnType);