RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 09:38:11 +00:00
Code Issues Activity Actions

LibJS: Replace $gc() hack with a NativeFunction on the global object

Browse source 
To make this work, also start passing Interpreter& to native functions.
This commit is contained in:
Andreas Kling 2020-03-12 20:04:54 +01:00
parent 9ad17d4674
commit d1d136b4e5
5 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Base/home/anon/js/forced-gc.js
View file

@ -1,5 +1,5 @@
function foo() { function foo() {
var x = {}; var x = {};
$gc(); gc();
} }
foo(); foo();

7
Libraries/LibJS/AST.cpp
View file

@ -55,11 +55,6 @@ Value ExpressionStatement::execute(Interpreter& interpreter) const
Value CallExpression::execute(Interpreter& interpreter) const Value CallExpression::execute(Interpreter& interpreter) const
{ {
if (name() == "$gc") {
interpreter.heap().collect_garbage();
return js_undefined();
}
auto callee = interpreter.get_variable(name()); auto callee = interpreter.get_variable(name());
ASSERT(callee.is_object()); ASSERT(callee.is_object());
auto* callee_object = callee.as_object(); auto* callee_object = callee.as_object();
@ -78,7 +73,7 @@ Value CallExpression::execute(Interpreter& interpreter) const
return interpreter.run(static_cast<Function&>(*callee_object).body(), move(passed_arguments), ScopeType::Function); return interpreter.run(static_cast<Function&>(*callee_object).body(), move(passed_arguments), ScopeType::Function);
if (callee_object->is_native_function()) { if (callee_object->is_native_function()) {
return static_cast<NativeFunction&>(*callee_object).native_function()(move(passed_arguments)); return static_cast<NativeFunction&>(*callee_object).native_function()(interpreter, move(passed_arguments));
} }
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();

7
Libraries/LibJS/Interpreter.cpp
View file

@ -38,11 +38,16 @@ Interpreter::Interpreter()
: m_heap(*this) : m_heap(*this)
{ {
m_global_object = heap().allocate<Object>(); m_global_object = heap().allocate<Object>();
m_global_object->put("print", heap().allocate<NativeFunction>([](Vector<Argument> arguments) -> Value { m_global_object->put("print", heap().allocate<NativeFunction>([](Interpreter&, Vector<Argument> arguments) -> Value {
for (auto& argument : arguments) for (auto& argument : arguments)
printf("%s ", argument.value.to_string().characters()); printf("%s ", argument.value.to_string().characters());
return js_undefined(); return js_undefined();
})); }));
m_global_object->put("gc", heap().allocate<NativeFunction>([](Interpreter& interpreter, Vector<Argument>) -> Value {
dbg() << "Forced garbage collection requested!";
interpreter.heap().collect_garbage();
return js_undefined();
}));
} }
Interpreter::~Interpreter() Interpreter::~Interpreter()

2
Libraries/LibJS/NativeFunction.cpp
View file

@ -30,7 +30,7 @@
namespace JS { namespace JS {
NativeFunction::NativeFunction(AK::Function<Value(Vector<Argument>)> native_function) NativeFunction::NativeFunction(AK::Function<Value(Interpreter&, Vector<Argument>)> native_function)
: m_native_function(move(native_function)) : m_native_function(move(native_function))
{ {
} }

6
Libraries/LibJS/NativeFunction.h
View file

@ -33,16 +33,16 @@ namespace JS {
class NativeFunction final : public Object { class NativeFunction final : public Object {
public: public:
explicit NativeFunction(AK::Function<Value(Vector<Argument>)>); explicit NativeFunction(AK::Function<Value(Interpreter&, Vector<Argument>)>);
virtual ~NativeFunction() override; virtual ~NativeFunction() override;
AK::Function<Value(Vector<Argument>)>& native_function() { return m_native_function; } AK::Function<Value(Interpreter&, Vector<Argument>)>& native_function() { return m_native_function; }
private: private:
virtual bool is_native_function() const override { return true; } virtual bool is_native_function() const override { return true; }
virtual const char* class_name() const override { return "NativeFunction"; } virtual const char* class_name() const override { return "NativeFunction"; }
AK::Function<Value(Vector<Argument>)> m_native_function; AK::Function<Value(Interpreter&, Vector<Argument>)> m_native_function;
}; };
} }