summaryrefslogtreecommitdiff
path: root/Libraries/LibJS/Runtime
diff options
context:
space:
mode:
authorEmanuele Torre <torreemanuele6@gmail.com>2020-05-01 17:34:43 +0200
committerAndreas Kling <kling@serenityos.org>2020-05-02 11:41:35 +0200
commitbe1a5bf3f788d54f00a9439fc15adaaf883e7f0c (patch)
tree68960f3dc3ccc47168d45bf8d31b9fcd385e8fda /Libraries/LibJS/Runtime
parente9c7d4524af15dc1df1f871b78b92063b5b43f1d (diff)
downloadserenity-be1a5bf3f788d54f00a9439fc15adaaf883e7f0c.zip
LibJS: Add ConsoleMessage concept
A ConsoleMessage is a struct cointaining: * AK::String text; represents the text of the message sent to the console. * ConsoleMessageKind kind; represents the kind of JS `console` function from which the message was sent. Now, Javascript `console` functions only send a ConsoleMessage to the Interpreter's Console instead of printing text directly to stdout. The Console then stores the recived ConsoleMessage in Console::m_messages; the Console does not print to stdout by default. You can set Console::on_new_message to a void(ConsoleMessage&); this function will get call everytime a new message is added to the Console's messages and can be used, for example, to print ConsoleMessages to stdout or to color the output based on the kind of ConsoleMessage. In this patch, I also: * Re-implement all the previously implemented functions in the JavaScript ConsoleObject, as wrappers around Console functions that add new message to the Console. * Implement console.clear() like so: - m_messages get cleared; - a new_message with kind set ConsoleMessageKind::Clear gets added to m_messages, its text is an empty AK::String; * Give credit to linusg in Console.cpp since I used his console.trace() algorithm in Console::trace(). I think that having this abstration will help us in the implementation of a browser console or a JS debugger. We could also add more MetaData to ConsoleMessage, e.g. Object IDs of the arguments passed to console functions in order to make hyperlinks, Timestamps, ecc.; which could be interesting to see. This will also help in implementing a `/bin/js` option to make, for example, return a ConsoleMessageWrapper to console functions instead of undefined. This will be useful to make tests for functions like console.count() and console.countClear(). :^)
Diffstat (limited to 'Libraries/LibJS/Runtime')
-rw-r--r--Libraries/LibJS/Runtime/ConsoleObject.cpp44
-rw-r--r--Libraries/LibJS/Runtime/ConsoleObject.h1
2 files changed, 20 insertions, 25 deletions
diff --git a/Libraries/LibJS/Runtime/ConsoleObject.cpp b/Libraries/LibJS/Runtime/ConsoleObject.cpp
index c4d2be4fa3..b6a5eb81ad 100644
--- a/Libraries/LibJS/Runtime/ConsoleObject.cpp
+++ b/Libraries/LibJS/Runtime/ConsoleObject.cpp
@@ -28,22 +28,23 @@
#include <AK/FlyString.h>
#include <AK/Function.h>
+#include <AK/StringBuilder.h>
#include <LibJS/Console.h>
#include <LibJS/Interpreter.h>
#include <LibJS/Runtime/ConsoleObject.h>
#include <LibJS/Runtime/GlobalObject.h>
-#include <stdio.h>
namespace JS {
-static void print_args(Interpreter& interpreter)
+static String join_args(Interpreter& interpreter)
{
+ StringBuilder joined_arguments;
for (size_t i = 0; i < interpreter.argument_count(); ++i) {
- printf("%s", interpreter.argument(i).to_string().characters());
+ joined_arguments.append(interpreter.argument(i).to_string().characters());
if (i != interpreter.argument_count() - 1)
- putchar(' ');
+ joined_arguments.append(' ');
}
- putchar('\n');
+ return joined_arguments.build();
}
ConsoleObject::ConsoleObject()
@@ -57,6 +58,7 @@ ConsoleObject::ConsoleObject()
put_native_function("trace", trace);
put_native_function("count", count);
put_native_function("countReset", count_reset);
+ put_native_function("clear", clear);
}
ConsoleObject::~ConsoleObject()
@@ -65,51 +67,37 @@ ConsoleObject::~ConsoleObject()
Value ConsoleObject::log(Interpreter& interpreter)
{
- print_args(interpreter);
+ interpreter.console().log(join_args(interpreter));
return js_undefined();
}
Value ConsoleObject::debug(Interpreter& interpreter)
{
- printf("\033[36;1m");
- print_args(interpreter);
- printf("\033[0m");
+ interpreter.console().debug(join_args(interpreter));
return js_undefined();
}
Value ConsoleObject::info(Interpreter& interpreter)
{
- print_args(interpreter);
+ interpreter.console().info(join_args(interpreter));
return js_undefined();
}
Value ConsoleObject::warn(Interpreter& interpreter)
{
- printf("\033[33;1m");
- print_args(interpreter);
- printf("\033[0m");
+ interpreter.console().warn(join_args(interpreter));
return js_undefined();
}
Value ConsoleObject::error(Interpreter& interpreter)
{
- printf("\033[31;1m");
- print_args(interpreter);
- printf("\033[0m");
+ interpreter.console().error(join_args(interpreter));
return js_undefined();
}
Value ConsoleObject::trace(Interpreter& interpreter)
{
- print_args(interpreter);
- auto call_stack = interpreter.call_stack();
- // -2 to skip the console.trace() call frame
- for (ssize_t i = call_stack.size() - 2; i >= 0; --i) {
- auto function_name = call_stack[i].function_name;
- if (String(function_name).is_empty())
- function_name = "<anonymous>";
- printf("%s\n", function_name.characters());
- }
+ interpreter.console().trace(join_args(interpreter));
return js_undefined();
}
@@ -131,4 +119,10 @@ Value ConsoleObject::count_reset(Interpreter& interpreter)
return js_undefined();
}
+Value ConsoleObject::clear(Interpreter& interpreter)
+{
+ interpreter.console().clear();
+ return js_undefined();
+}
+
}
diff --git a/Libraries/LibJS/Runtime/ConsoleObject.h b/Libraries/LibJS/Runtime/ConsoleObject.h
index eff99da621..eb5fedf84e 100644
--- a/Libraries/LibJS/Runtime/ConsoleObject.h
+++ b/Libraries/LibJS/Runtime/ConsoleObject.h
@@ -46,6 +46,7 @@ private:
static Value trace(Interpreter&);
static Value count(Interpreter&);
static Value count_reset(Interpreter&);
+ static Value clear(Interpreter&);
};
}