diff options
author | Andreas Kling <kling@serenityos.org> | 2021-03-14 16:20:01 +0100 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2021-03-15 21:20:33 +0100 |
commit | 4da3e5d91fd10424ffe791ecdc93b982daa0cc16 (patch) | |
tree | ae8c16efef3d6e8e28022e073cd94542717f3a3f /Userland/Libraries/LibJS/Runtime | |
parent | 64cb04996f31c5163a3376a6ab649df59816430c (diff) | |
download | serenity-4da3e5d91fd10424ffe791ecdc93b982daa0cc16.zip |
LibJS: Add naive implementation of eval() :^)
This parses and executes a code string in the caller's lexical scope.
Diffstat (limited to 'Userland/Libraries/LibJS/Runtime')
-rw-r--r-- | Userland/Libraries/LibJS/Runtime/CommonPropertyNames.h | 1 | ||||
-rw-r--r-- | Userland/Libraries/LibJS/Runtime/GlobalObject.cpp | 20 | ||||
-rw-r--r-- | Userland/Libraries/LibJS/Runtime/GlobalObject.h | 1 |
3 files changed, 22 insertions, 0 deletions
diff --git a/Userland/Libraries/LibJS/Runtime/CommonPropertyNames.h b/Userland/Libraries/LibJS/Runtime/CommonPropertyNames.h index 691939286d..18fb2ec114 100644 --- a/Userland/Libraries/LibJS/Runtime/CommonPropertyNames.h +++ b/Userland/Libraries/LibJS/Runtime/CommonPropertyNames.h @@ -100,6 +100,7 @@ namespace JS { P(entries) \ P(enumerable) \ P(error) \ + P(eval) \ P(every) \ P(exec) \ P(exp) \ diff --git a/Userland/Libraries/LibJS/Runtime/GlobalObject.cpp b/Userland/Libraries/LibJS/Runtime/GlobalObject.cpp index 0a17ac6186..952858077e 100644 --- a/Userland/Libraries/LibJS/Runtime/GlobalObject.cpp +++ b/Userland/Libraries/LibJS/Runtime/GlobalObject.cpp @@ -25,9 +25,13 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include <AK/TemporaryChange.h> #include <AK/Utf8View.h> #include <LibJS/Console.h> #include <LibJS/Heap/DeferGC.h> +#include <LibJS/Interpreter.h> +#include <LibJS/Lexer.h> +#include <LibJS/Parser.h> #include <LibJS/Runtime/ArrayBufferConstructor.h> #include <LibJS/Runtime/ArrayBufferPrototype.h> #include <LibJS/Runtime/ArrayConstructor.h> @@ -119,6 +123,7 @@ void GlobalObject::initialize() define_native_function(vm.names.isFinite, is_finite, 1, attr); define_native_function(vm.names.parseFloat, parse_float, 1, attr); define_native_function(vm.names.parseInt, parse_int, 1, attr); + define_native_function(vm.names.eval, eval, 1, attr); define_property(vm.names.NaN, js_nan(), 0); define_property(vm.names.Infinity, js_infinity(), 0); @@ -309,4 +314,19 @@ Value GlobalObject::get_this_binding(GlobalObject&) const return Value(this); } +JS_DEFINE_NATIVE_FUNCTION(GlobalObject::eval) +{ + auto code = vm.argument(0).to_string(global_object); + if (code.is_null()) + return {}; + JS::Parser parser { JS::Lexer { code } }; + auto program = parser.parse_program(); + + auto& caller_frame = vm.call_stack().at(vm.call_stack().size() - 2); + TemporaryChange scope_change(vm.call_frame().scope, caller_frame->scope); + + // FIXME: eval() should return the result of the executed code. This currently does not work. + return vm.interpreter().execute_statement(global_object, program); +} + } diff --git a/Userland/Libraries/LibJS/Runtime/GlobalObject.h b/Userland/Libraries/LibJS/Runtime/GlobalObject.h index d3b7041e43..791bde78ad 100644 --- a/Userland/Libraries/LibJS/Runtime/GlobalObject.h +++ b/Userland/Libraries/LibJS/Runtime/GlobalObject.h @@ -81,6 +81,7 @@ private: JS_DECLARE_NATIVE_FUNCTION(is_finite); JS_DECLARE_NATIVE_FUNCTION(parse_float); JS_DECLARE_NATIVE_FUNCTION(parse_int); + JS_DECLARE_NATIVE_FUNCTION(eval); NonnullOwnPtr<Console> m_console; |