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

LibJS: Pass GlobalObject& to Reference get/put

Browse source
This commit is contained in:
Andreas Kling 2020-06-20 16:47:31 +02:00
parent 8d56e6103e
commit 32c121a8f7
3 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Libraries/LibJS/AST.cpp
View file

@ -1110,7 +1110,7 @@ Value AssignmentExpression::execute(Interpreter& interpreter, GlobalObject& glob
return interpreter.throw_exception<ReferenceError>(ErrorType::InvalidLeftHandAssignment); return interpreter.throw_exception<ReferenceError>(ErrorType::InvalidLeftHandAssignment);
update_function_name(rhs_result, reference.name().as_string()); update_function_name(rhs_result, reference.name().as_string());
reference.put(interpreter, rhs_result); reference.put(interpreter, global_object, rhs_result);
if (interpreter.exception()) if (interpreter.exception())
return {}; return {};
@ -1122,7 +1122,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); auto old_value = reference.get(interpreter, global_object);
if (interpreter.exception()) if (interpreter.exception())
return {}; return {};
old_value = old_value.to_numeric(interpreter); old_value = old_value.to_numeric(interpreter);
@ -1147,7 +1147,7 @@ Value UpdateExpression::execute(Interpreter& interpreter, GlobalObject& global_o
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
} }
reference.put(interpreter, new_value); reference.put(interpreter, 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;

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

@ -33,20 +33,20 @@
namespace JS { namespace JS {
void Reference::put(Interpreter& interpreter, Value value) void Reference::put(Interpreter& interpreter, GlobalObject& global_object, Value value)
{ {
// NOTE: The caller is responsible for doing an exception check after assign(). // NOTE: The caller is responsible for doing an exception check after assign().
if (is_unresolvable()) { if (is_unresolvable()) {
throw_reference_error(interpreter); throw_reference_error(interpreter, 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.set_variable(m_name.to_string(), value, interpreter.global_object()); interpreter.set_variable(m_name.to_string(), value, global_object);
else else
interpreter.global_object().put(m_name, value); global_object.put(m_name, value);
return; return;
} }
@ -55,14 +55,14 @@ void Reference::put(Interpreter& interpreter, Value value)
return; return;
} }
auto* object = base().to_object(interpreter, interpreter.global_object()); auto* object = base().to_object(interpreter, global_object);
if (!object) if (!object)
return; return;
object->put(m_name, value); object->put(m_name, value);
} }
void Reference::throw_reference_error(Interpreter& interpreter) void Reference::throw_reference_error(Interpreter& interpreter, GlobalObject&)
{ {
auto property_name = m_name.to_string(); auto property_name = m_name.to_string();
String message; String message;
@ -73,31 +73,31 @@ void Reference::throw_reference_error(Interpreter& interpreter)
} }
} }
Value Reference::get(Interpreter& interpreter) Value Reference::get(Interpreter& interpreter, GlobalObject& global_object)
{ {
// NOTE: The caller is responsible for doing an exception check after fetch(). // NOTE: The caller is responsible for doing an exception check after fetch().
if (is_unresolvable()) { if (is_unresolvable()) {
throw_reference_error(interpreter); throw_reference_error(interpreter, 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.get_variable(m_name.to_string(), interpreter.global_object()); value = interpreter.get_variable(m_name.to_string(), global_object);
else else
value = interpreter.global_object().get(m_name); value = global_object.get(m_name);
if (interpreter.exception()) if (interpreter.exception())
return {}; return {};
if (value.is_empty()) { if (value.is_empty()) {
throw_reference_error(interpreter); throw_reference_error(interpreter, global_object);
return {}; return {};
} }
return value; return value;
} }
auto* object = base().to_object(interpreter, interpreter.global_object()); auto* object = base().to_object(interpreter, global_object);
if (!object) if (!object)
return {}; return {};

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

@ -34,7 +34,7 @@ namespace JS {
class Reference { class Reference {
public: public:
Reference() {} Reference() { }
Reference(Value base, const PropertyName& name, bool strict = false) Reference(Value base, const PropertyName& name, bool strict = false)
: m_base(base) : m_base(base)
, m_name(name) , m_name(name)
@ -85,11 +85,11 @@ public:
return m_global_variable; return m_global_variable;
} }
void put(Interpreter&, Value); void put(Interpreter&, GlobalObject&, Value);
Value get(Interpreter&); Value get(Interpreter&, GlobalObject&);
private: private:
void throw_reference_error(Interpreter&); void throw_reference_error(Interpreter&, GlobalObject&);
Value m_base { js_undefined() }; Value m_base { js_undefined() };
PropertyName m_name; PropertyName m_name;