From 2e92c2e5e16e75970c3cc0a0e520a905f18c3e49 Mon Sep 17 00:00:00 2001 From: Emanuele Torre Date: Fri, 1 May 2020 14:40:43 +0200 Subject: [PATCH] LibJS: Start implementing a Console class for the interpreter The goal is to start factoring out core ConsoleObject functionality and to make ConsoleObject only a JS wrapper around Console. --- Libraries/LibJS/Console.cpp | 36 ++++++++++++++++ Libraries/LibJS/Console.h | 52 +++++++++++++++++++++++ Libraries/LibJS/Interpreter.cpp | 1 + Libraries/LibJS/Interpreter.h | 5 ++- Libraries/LibJS/Makefile | 1 + Libraries/LibJS/Runtime/ConsoleObject.cpp | 4 +- 6 files changed, 95 insertions(+), 4 deletions(-) create mode 100644 Libraries/LibJS/Console.cpp create mode 100644 Libraries/LibJS/Console.h diff --git a/Libraries/LibJS/Console.cpp b/Libraries/LibJS/Console.cpp new file mode 100644 index 0000000000..49947f0394 --- /dev/null +++ b/Libraries/LibJS/Console.cpp @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2020, Emanuele Torre + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include + +namespace JS { + +Console::Console(Interpreter& interpreter) + : m_interpreter(interpreter) +{ +} + +} diff --git a/Libraries/LibJS/Console.h b/Libraries/LibJS/Console.h new file mode 100644 index 0000000000..09f61d695b --- /dev/null +++ b/Libraries/LibJS/Console.h @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2020, Emanuele Torre + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#pragma once + +#include +#include +#include + +namespace JS { + +class Console { + AK_MAKE_NONCOPYABLE(Console); + AK_MAKE_NONMOVABLE(Console); + +public: + Console(Interpreter&); + + Interpreter& interpreter() { return m_interpreter; } + + HashMap& counters() { return m_counters; } + +private: + Interpreter& m_interpreter; + + HashMap m_counters; +}; + +} diff --git a/Libraries/LibJS/Interpreter.cpp b/Libraries/LibJS/Interpreter.cpp index 65bc317482..5a94ff8bb0 100644 --- a/Libraries/LibJS/Interpreter.cpp +++ b/Libraries/LibJS/Interpreter.cpp @@ -41,6 +41,7 @@ namespace JS { Interpreter::Interpreter() : m_heap(*this) + , m_console(*this) { } diff --git a/Libraries/LibJS/Interpreter.h b/Libraries/LibJS/Interpreter.h index 4315867fea..da41b49afb 100644 --- a/Libraries/LibJS/Interpreter.h +++ b/Libraries/LibJS/Interpreter.h @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -163,7 +164,7 @@ public: Value last_value() const { return m_last_value; } - HashMap& console_counters() { return m_console_counters; } + Console& console() { return m_console; } private: Interpreter(); @@ -181,7 +182,7 @@ private: ScopeType m_unwind_until { ScopeType::None }; - HashMap m_console_counters; + Console m_console; }; } diff --git a/Libraries/LibJS/Makefile b/Libraries/LibJS/Makefile index 2cd44ab903..aaae3b10f4 100644 --- a/Libraries/LibJS/Makefile +++ b/Libraries/LibJS/Makefile @@ -1,5 +1,6 @@ OBJS = \ AST.o \ + Console.o \ Heap/Handle.o \ Heap/Heap.o \ Heap/HeapBlock.o \ diff --git a/Libraries/LibJS/Runtime/ConsoleObject.cpp b/Libraries/LibJS/Runtime/ConsoleObject.cpp index 4c6b9f326a..3f01bf3449 100644 --- a/Libraries/LibJS/Runtime/ConsoleObject.cpp +++ b/Libraries/LibJS/Runtime/ConsoleObject.cpp @@ -121,7 +121,7 @@ Value ConsoleObject::count(Interpreter& interpreter) else counter_name = interpreter.argument(0).to_string(); - auto& counters = interpreter.console_counters(); + auto& counters = interpreter.console().counters(); auto counter_value = counters.get(counter_name); if (counter_value.has_value()) { @@ -142,7 +142,7 @@ Value ConsoleObject::count_reset(Interpreter& interpreter) else counter_name = interpreter.argument(0).to_string(); - auto& counters = interpreter.console_counters(); + auto& counters = interpreter.console().counters(); if (counters.contains(counter_name)) { counters.remove(counter_name);