RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-20 17:05:07 +00:00
Code Issues Activity Actions

LibJS: Reduce use of Interpreter in Reference

Browse source
This commit is contained in:
Andreas Kling 2020-09-29 16:45:24 +02:00
parent 3df604ad12
commit be055b3ddd
3 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Libraries/LibJS/AST.cpp
View file

@ -1286,7 +1286,7 @@ Value AssignmentExpression::execute(Interpreter& interpreter, GlobalObject& glob
return {}; return {};
} }
update_function_name(rhs_result, get_function_name(global_object, reference.name().to_value(interpreter.vm()))); update_function_name(rhs_result, get_function_name(global_object, reference.name().to_value(interpreter.vm())));
reference.put(interpreter, global_object, rhs_result); reference.put(global_object, rhs_result);
if (interpreter.exception()) if (interpreter.exception())
return {}; return {};
@ -1298,7 +1298,7 @@ Value UpdateExpression::execute(Interpreter& interpreter, GlobalObject& global_o
auto reference = m_argument->to_reference(interpreter, global_object); auto reference = m_argument->to_reference(interpreter, global_object);
if (interpreter.exception()) if (interpreter.exception())
return {}; return {};
auto old_value = reference.get(interpreter, global_object); auto old_value = reference.get(global_object);
if (interpreter.exception()) if (interpreter.exception())
return {}; return {};
old_value = old_value.to_numeric(global_object); old_value = old_value.to_numeric(global_object);
@ -1323,7 +1323,7 @@ Value UpdateExpression::execute(Interpreter& interpreter, GlobalObject& global_o
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
} }
reference.put(interpreter, global_object, new_value); reference.put(global_object, new_value);
if (interpreter.exception()) if (interpreter.exception())
return {}; return {};
return m_prefixed ? new_value : old_value; return m_prefixed ? new_value : old_value;

30
Libraries/LibJS/Runtime/Reference.cpp
View file

@ -33,25 +33,25 @@
namespace JS { namespace JS {
void Reference::put(Interpreter& interpreter, GlobalObject& global_object, Value value) void Reference::put(GlobalObject& global_object, Value value)
{ {
// NOTE: The caller is responsible for doing an exception check after assign(). auto& vm = global_object.vm();
if (is_unresolvable()) { if (is_unresolvable()) {
throw_reference_error(interpreter, global_object); throw_reference_error(global_object);
return; return;
} }
if (is_local_variable() || is_global_variable()) { if (is_local_variable() || is_global_variable()) {
if (is_local_variable()) if (is_local_variable())
interpreter.vm().set_variable(m_name.to_string(), value, global_object); vm.set_variable(m_name.to_string(), value, global_object);
else else
global_object.put(m_name, value); global_object.put(m_name, value);
return; return;
} }
if (!base().is_object() && interpreter.in_strict_mode()) { if (!base().is_object() && vm.interpreter().in_strict_mode()) {
interpreter.vm().throw_exception<TypeError>(global_object, ErrorType::ReferencePrimitiveAssignment, m_name.to_string().characters()); vm.throw_exception<TypeError>(global_object, ErrorType::ReferencePrimitiveAssignment, m_name.to_string().characters());
return; return;
} }
@ -62,36 +62,36 @@ void Reference::put(Interpreter& interpreter, GlobalObject& global_object, Value
object->put(m_name, value); object->put(m_name, value);
} }
void Reference::throw_reference_error(Interpreter& interpreter, GlobalObject& global_object) void Reference::throw_reference_error(GlobalObject& global_object)
{ {
auto property_name = m_name.to_string(); auto property_name = m_name.to_string();
String message; String message;
if (property_name.is_empty()) { if (property_name.is_empty()) {
interpreter.vm().throw_exception<ReferenceError>(global_object, ErrorType::ReferenceUnresolvable); global_object.vm().throw_exception<ReferenceError>(global_object, ErrorType::ReferenceUnresolvable);
} else { } else {
interpreter.vm().throw_exception<ReferenceError>(global_object, ErrorType::UnknownIdentifier, property_name.characters()); global_object.vm().throw_exception<ReferenceError>(global_object, ErrorType::UnknownIdentifier, property_name.characters());
} }
} }
Value Reference::get(Interpreter& interpreter, GlobalObject& global_object) Value Reference::get(GlobalObject& global_object)
{ {
// NOTE: The caller is responsible for doing an exception check after fetch(). auto& vm = global_object.vm();
if (is_unresolvable()) { if (is_unresolvable()) {
throw_reference_error(interpreter, global_object); throw_reference_error(global_object);
return {}; return {};
} }
if (is_local_variable() || is_global_variable()) { if (is_local_variable() || is_global_variable()) {
Value value; Value value;
if (is_local_variable()) if (is_local_variable())
value = interpreter.vm().get_variable(m_name.to_string(), global_object); value = vm.get_variable(m_name.to_string(), global_object);
else else
value = global_object.get(m_name); value = global_object.get(m_name);
if (interpreter.exception()) if (vm.exception())
return {}; return {};
if (value.is_empty()) { if (value.is_empty()) {
throw_reference_error(interpreter, global_object); throw_reference_error(global_object);
return {}; return {};
} }
return value; return value;

6
Libraries/LibJS/Runtime/Reference.h
View file

@ -85,11 +85,11 @@ public:
return m_global_variable; return m_global_variable;
} }
void put(Interpreter&, GlobalObject&, Value); void put(GlobalObject&, Value);
Value get(Interpreter&, GlobalObject&); Value get(GlobalObject&);
private: private:
void throw_reference_error(Interpreter&, GlobalObject&); void throw_reference_error(GlobalObject&);
Value m_base { js_undefined() }; Value m_base { js_undefined() };
PropertyName m_name; PropertyName m_name;