LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-11 01:06:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

LibJS: Fix that '_' no longer accessed the last value in the REPL

Browse Source 
This is now also not a concept that VM knows about and handled
completely by the REPL.
This commit is contained in:
davidot 2022-01-16 02:05:32 +01:00 committed by Linus Groh
parent 30af8121ce
commit a5b11f7484
Notes: sideshowbarker 2024-07-17 20:45:09 +09:00 
Author: https://github.com/davidot
Commit: https://github.com/SerenityOS/serenity/commit/a5b11f74844
Pull-request: https://github.com/SerenityOS/serenity/pull/11936
Issue: https://github.com/SerenityOS/serenity/issues/11935
Reviewed-by: https://github.com/linusg
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Userland/Libraries/LibJS/Runtime/VM.h
View File

@ -156,9 +156,6 @@ public:
const StackInfo& stack_info() const { return m_stack_info; }; const StackInfo& stack_info() const { return m_stack_info; };
bool underscore_is_last_value() const { return m_underscore_is_last_value; }
void set_underscore_is_last_value(bool b) { m_underscore_is_last_value = b; }
u32 execution_generation() const { return m_execution_generation; } u32 execution_generation() const { return m_execution_generation; }
void finish_execution_generation() { ++m_execution_generation; } void finish_execution_generation() { ++m_execution_generation; }
@ -279,8 +276,6 @@ private:
JS_ENUMERATE_WELL_KNOWN_SYMBOLS JS_ENUMERATE_WELL_KNOWN_SYMBOLS
#undef __JS_ENUMERATE #undef __JS_ENUMERATE
bool m_underscore_is_last_value { false };
u32 m_execution_generation { 0 }; u32 m_execution_generation { 0 };
OwnPtr<CustomData> m_custom_data; OwnPtr<CustomData> m_custom_data;

24
Userland/Utilities/js.cpp
View File

@ -71,6 +71,7 @@
RefPtr<JS::VM> vm; RefPtr<JS::VM> vm;
Vector<String> repl_statements; Vector<String> repl_statements;
JS::Handle<JS::Value> last_value = JS::make_handle(JS::js_undefined());
class ReplObject final : public JS::GlobalObject { class ReplObject final : public JS::GlobalObject {
JS_OBJECT(ReplObject, JS::GlobalObject); JS_OBJECT(ReplObject, JS::GlobalObject);
@ -86,6 +87,7 @@ private:
JS_DECLARE_NATIVE_FUNCTION(load_file); JS_DECLARE_NATIVE_FUNCTION(load_file);
JS_DECLARE_NATIVE_FUNCTION(save_to_file); JS_DECLARE_NATIVE_FUNCTION(save_to_file);
JS_DECLARE_NATIVE_FUNCTION(load_json); JS_DECLARE_NATIVE_FUNCTION(load_json);
JS_DECLARE_NATIVE_FUNCTION(last_value_getter);
}; };
class ScriptObject final : public JS::GlobalObject { class ScriptObject final : public JS::GlobalObject {
@ -986,6 +988,9 @@ static bool parse_and_run(JS::Interpreter& interpreter, StringView source, Strin
} }
}; };
if (!result.is_error())
last_value = JS::make_handle(result.value());
if (result.is_error()) { if (result.is_error()) {
handle_exception(); handle_exception();
return false; return false;
@ -1041,6 +1046,24 @@ void ReplObject::initialize_global_object()
define_native_function("load", load_file, 1, attr); define_native_function("load", load_file, 1, attr);
define_native_function("save", save_to_file, 1, attr); define_native_function("save", save_to_file, 1, attr);
define_native_function("loadJSON", load_json, 1, attr); define_native_function("loadJSON", load_json, 1, attr);
define_native_accessor(
"_",
[](JS::VM&, JS::GlobalObject&) {
return last_value.value();
},
[](JS::VM& vm, JS::GlobalObject& global_object) -> JS::ThrowCompletionOr<JS::Value> {
VERIFY(is<ReplObject>(global_object));
outln("Disable writing last value to '_'");
// We must delete first otherwise this setter gets called recursively.
TRY(global_object.internal_delete(JS::PropertyKey { "_" }));
auto value = vm.argument(0);
TRY(global_object.internal_set(JS::PropertyKey { "_" }, value, &global_object));
return value;
},
attr);
} }
JS_DEFINE_NATIVE_FUNCTION(ReplObject::save_to_file) JS_DEFINE_NATIVE_FUNCTION(ReplObject::save_to_file)
@ -1263,7 +1286,6 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
#ifdef JS_TRACK_ZOMBIE_CELLS #ifdef JS_TRACK_ZOMBIE_CELLS
interpreter->heap().set_zombify_dead_cells(zombify_dead_cells); interpreter->heap().set_zombify_dead_cells(zombify_dead_cells);
#endif #endif
interpreter->vm().set_underscore_is_last_value(true);
auto& global_environment = interpreter->realm().global_environment(); auto& global_environment = interpreter->realm().global_environment();