From dadf2e8251389f048b246fd23d5557308d16fedb Mon Sep 17 00:00:00 2001 From: Linus Groh Date: Tue, 16 Mar 2021 09:09:56 +0100 Subject: [PATCH] LibJS: Make Interpreter::run() a void function With one small exception, this is how we've been using this API already, and it makes sense: a Program is just a ScopeNode with any number of statements, which are executed one by one. There's no explicit return value at the end, only a completion value of the last value-producing statement, which we then access using VM::last_value() if needed (e.g. in the REPL). --- Userland/Libraries/LibJS/Interpreter.cpp | 5 ++--- Userland/Libraries/LibJS/Interpreter.h | 2 +- Userland/Libraries/LibWeb/DOM/Document.cpp | 9 +++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Userland/Libraries/LibJS/Interpreter.cpp b/Userland/Libraries/LibJS/Interpreter.cpp index 3fcdc00852..132bfa32f5 100644 --- a/Userland/Libraries/LibJS/Interpreter.cpp +++ b/Userland/Libraries/LibJS/Interpreter.cpp @@ -54,7 +54,7 @@ Interpreter::~Interpreter() { } -Value Interpreter::run(GlobalObject& global_object, const Program& program) +void Interpreter::run(GlobalObject& global_object, const Program& program) { auto& vm = this->vm(); VERIFY(!vm.exception()); @@ -71,9 +71,8 @@ Value Interpreter::run(GlobalObject& global_object, const Program& program) global_call_frame.is_strict_mode = program.is_strict_mode(); vm.push_call_frame(global_call_frame, global_object); VERIFY(!vm.exception()); - auto result = program.execute(*this, global_object); + program.execute(*this, global_object); vm.pop_call_frame(); - return result; } GlobalObject& Interpreter::global_object() diff --git a/Userland/Libraries/LibJS/Interpreter.h b/Userland/Libraries/LibJS/Interpreter.h index f32e4e1ccb..b84b980662 100644 --- a/Userland/Libraries/LibJS/Interpreter.h +++ b/Userland/Libraries/LibJS/Interpreter.h @@ -61,7 +61,7 @@ public: ~Interpreter(); - Value run(GlobalObject&, const Program&); + void run(GlobalObject&, const Program&); GlobalObject& global_object(); const GlobalObject& global_object() const; diff --git a/Userland/Libraries/LibWeb/DOM/Document.cpp b/Userland/Libraries/LibWeb/DOM/Document.cpp index ca319f175e..2bb381b152 100644 --- a/Userland/Libraries/LibWeb/DOM/Document.cpp +++ b/Userland/Libraries/LibWeb/DOM/Document.cpp @@ -555,10 +555,11 @@ JS::Value Document::run_javascript(const StringView& source, const StringView& f return JS::js_undefined(); } auto& interpreter = document().interpreter(); - auto result = interpreter.run(interpreter.global_object(), *program); - if (interpreter.exception()) - interpreter.vm().clear_exception(); - return result; + auto& vm = interpreter.vm(); + interpreter.run(interpreter.global_object(), *program); + if (vm.exception()) + vm.clear_exception(); + return vm.last_value(); } // https://dom.spec.whatwg.org/#dom-document-createelement