RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 02:27:43 +00:00
Code Issues Activity Actions

js: Use generic reference instead of Variant<A,B>

Browse source 
As the two types are used in exactly the same way, just make the lambda
generic over the type instead of explicitly moving them into a variant
and then visiting with a generic lambda.
This commit is contained in:
Ali Mohammad Pur 2022-01-24 12:43:05 +03:30 • committed by Linus Groh
parent a9a1d0afb4
commit 1c121d7488
1 changed files with 6 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Userland/Utilities/js.cpp
View file

@ -973,17 +973,12 @@ static bool parse_and_run(JS::Interpreter& interpreter, StringView source, Strin
JS::ThrowCompletionOr<JS::Value> result { JS::js_undefined() }; JS::ThrowCompletionOr<JS::Value> result { JS::js_undefined() };
auto run_script_or_module = [&](Variant<NonnullRefPtr<JS::Script>, NonnullRefPtr<JS::SourceTextModule>> script_or_module) { auto run_script_or_module = [&](auto& script_or_module) {
auto program = script_or_module.visit(
[](auto& visitor) -> NonnullRefPtr<JS::Program> {
return visitor->parse_node();
});
if (s_dump_ast) if (s_dump_ast)
program->dump(0); script_or_module->parse_node().dump(0);
if (JS::Bytecode::g_dump_bytecode || s_run_bytecode) { if (JS::Bytecode::g_dump_bytecode || s_run_bytecode) {
auto executable = JS::Bytecode::Generator::generate(*program); auto executable = JS::Bytecode::Generator::generate(script_or_module->parse_node());
executable.name = source_name; executable.name = source_name;
if (s_opt_bytecode) { if (s_opt_bytecode) {
auto& passes = JS::Bytecode::Interpreter::optimization_pipeline(); auto& passes = JS::Bytecode::Interpreter::optimization_pipeline();
@ -1001,10 +996,7 @@ static bool parse_and_run(JS::Interpreter& interpreter, StringView source, Strin
return ReturnEarly::Yes; return ReturnEarly::Yes;
} }
} else { } else {
result = script_or_module.visit( result = interpreter.run(*script_or_module);
[&](auto& visitor) {
return interpreter.run(*visitor);
});
} }
return ReturnEarly::No; return ReturnEarly::No;
@ -1020,7 +1012,7 @@ static bool parse_and_run(JS::Interpreter& interpreter, StringView source, Strin
outln(error.to_string()); outln(error.to_string());
vm->throw_exception<JS::SyntaxError>(interpreter.global_object(), error.to_string()); vm->throw_exception<JS::SyntaxError>(interpreter.global_object(), error.to_string());
} else { } else {
auto return_early = run_script_or_module(move(script_or_error.value())); auto return_early = run_script_or_module(script_or_error.value());
if (return_early == ReturnEarly::Yes) if (return_early == ReturnEarly::Yes)
return true; return true;
} }
@ -1034,7 +1026,7 @@ static bool parse_and_run(JS::Interpreter& interpreter, StringView source, Strin
outln(error.to_string()); outln(error.to_string());
vm->throw_exception<JS::SyntaxError>(interpreter.global_object(), error.to_string()); vm->throw_exception<JS::SyntaxError>(interpreter.global_object(), error.to_string());
} else { } else {
auto return_early = run_script_or_module(move(module_or_error.value())); auto return_early = run_script_or_module(module_or_error.value());
if (return_early == ReturnEarly::Yes) if (return_early == ReturnEarly::Yes)
return true; return true;
} }