From 73bead5ae91606a36a426416866e0b151efcb32e Mon Sep 17 00:00:00 2001 From: Emanuele Torre Date: Mon, 4 May 2020 12:34:49 +0200 Subject: [PATCH] LibJS: Move join_args() in Interpreter It can be useful outside of Runtime/ConsoleObject.cpp. join_args() => Interpreter::join_arguments() --- Libraries/LibJS/Interpreter.cpp | 12 ++++++++++++ Libraries/LibJS/Interpreter.h | 2 ++ Libraries/LibJS/Runtime/ConsoleObject.cpp | 23 ++++++----------------- 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/Libraries/LibJS/Interpreter.cpp b/Libraries/LibJS/Interpreter.cpp index 5a94ff8bb0..22f961af87 100644 --- a/Libraries/LibJS/Interpreter.cpp +++ b/Libraries/LibJS/Interpreter.cpp @@ -25,6 +25,7 @@ */ #include +#include #include #include #include @@ -261,4 +262,15 @@ const GlobalObject& Interpreter::global_object() const return static_cast(*m_global_object); } +String Interpreter::join_arguments() +{ + StringBuilder joined_arguments; + for (size_t i = 0; i < argument_count(); ++i) { + joined_arguments.append(argument(i).to_string().characters()); + if (i != argument_count() - 1) + joined_arguments.append(' '); + } + return joined_arguments.build(); +} + } diff --git a/Libraries/LibJS/Interpreter.h b/Libraries/LibJS/Interpreter.h index da41b49afb..426aa78fb5 100644 --- a/Libraries/LibJS/Interpreter.h +++ b/Libraries/LibJS/Interpreter.h @@ -166,6 +166,8 @@ public: Console& console() { return m_console; } + String join_arguments(); + private: Interpreter(); diff --git a/Libraries/LibJS/Runtime/ConsoleObject.cpp b/Libraries/LibJS/Runtime/ConsoleObject.cpp index b6a5eb81ad..0feec51a40 100644 --- a/Libraries/LibJS/Runtime/ConsoleObject.cpp +++ b/Libraries/LibJS/Runtime/ConsoleObject.cpp @@ -36,17 +36,6 @@ namespace JS { -static String join_args(Interpreter& interpreter) -{ - StringBuilder joined_arguments; - for (size_t i = 0; i < interpreter.argument_count(); ++i) { - joined_arguments.append(interpreter.argument(i).to_string().characters()); - if (i != interpreter.argument_count() - 1) - joined_arguments.append(' '); - } - return joined_arguments.build(); -} - ConsoleObject::ConsoleObject() : Object(interpreter().global_object().object_prototype()) { @@ -67,37 +56,37 @@ ConsoleObject::~ConsoleObject() Value ConsoleObject::log(Interpreter& interpreter) { - interpreter.console().log(join_args(interpreter)); + interpreter.console().log(interpreter.join_arguments()); return js_undefined(); } Value ConsoleObject::debug(Interpreter& interpreter) { - interpreter.console().debug(join_args(interpreter)); + interpreter.console().debug(interpreter.join_arguments()); return js_undefined(); } Value ConsoleObject::info(Interpreter& interpreter) { - interpreter.console().info(join_args(interpreter)); + interpreter.console().info(interpreter.join_arguments()); return js_undefined(); } Value ConsoleObject::warn(Interpreter& interpreter) { - interpreter.console().warn(join_args(interpreter)); + interpreter.console().warn(interpreter.join_arguments()); return js_undefined(); } Value ConsoleObject::error(Interpreter& interpreter) { - interpreter.console().error(join_args(interpreter)); + interpreter.console().error(interpreter.join_arguments()); return js_undefined(); } Value ConsoleObject::trace(Interpreter& interpreter) { - interpreter.console().trace(join_args(interpreter)); + interpreter.console().trace(interpreter.join_arguments()); return js_undefined(); }