From 086f68e878472034574c4bb7ccf5288d5035a7d2 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Mon, 16 Mar 2020 14:58:20 +0100 Subject: LibJS: Replace the global print() function with console.log() :^) --- Libraries/LibJS/Makefile | 1 + Libraries/LibJS/Runtime/ConsoleObject.cpp | 46 +++++++++++++++++++++++++++++++ Libraries/LibJS/Runtime/ConsoleObject.h | 42 ++++++++++++++++++++++++++++ Libraries/LibJS/Runtime/GlobalObject.cpp | 7 +---- 4 files changed, 90 insertions(+), 6 deletions(-) create mode 100644 Libraries/LibJS/Runtime/ConsoleObject.cpp create mode 100644 Libraries/LibJS/Runtime/ConsoleObject.h (limited to 'Libraries') diff --git a/Libraries/LibJS/Makefile b/Libraries/LibJS/Makefile index e8c7ba3877..d7e06e7b4b 100644 --- a/Libraries/LibJS/Makefile +++ b/Libraries/LibJS/Makefile @@ -6,6 +6,7 @@ OBJS = \ Lexer.o \ Parser.o \ Runtime/Cell.o \ + Runtime/ConsoleObject.o \ Runtime/Function.o \ Runtime/GlobalObject.o \ Runtime/NativeFunction.o \ diff --git a/Libraries/LibJS/Runtime/ConsoleObject.cpp b/Libraries/LibJS/Runtime/ConsoleObject.cpp new file mode 100644 index 0000000000..8fb4194801 --- /dev/null +++ b/Libraries/LibJS/Runtime/ConsoleObject.cpp @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2020, Andreas Kling + * 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 +#include +#include + +namespace JS { + +ConsoleObject::ConsoleObject() +{ + put_native_function("log", [](Object*, Vector arguments) -> Value { + for (auto& argument : arguments) + printf("%s ", argument.to_string().characters()); + return js_undefined(); + }); +} + +ConsoleObject::~ConsoleObject() +{ +} + +} diff --git a/Libraries/LibJS/Runtime/ConsoleObject.h b/Libraries/LibJS/Runtime/ConsoleObject.h new file mode 100644 index 0000000000..635e6f11c0 --- /dev/null +++ b/Libraries/LibJS/Runtime/ConsoleObject.h @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2020, Andreas Kling + * 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 + +namespace JS { + +class ConsoleObject final : public Object { +public: + ConsoleObject(); + virtual ~ConsoleObject() override; + +private: + virtual const char* class_name() const override { return "ConsoleObject"; } +}; + +} diff --git a/Libraries/LibJS/Runtime/GlobalObject.cpp b/Libraries/LibJS/Runtime/GlobalObject.cpp index b87b2f431b..c8459d7105 100644 --- a/Libraries/LibJS/Runtime/GlobalObject.cpp +++ b/Libraries/LibJS/Runtime/GlobalObject.cpp @@ -6,17 +6,12 @@ #include #include #include -#include namespace JS { GlobalObject::GlobalObject() { - put_native_function("print", [](Object*, Vector arguments) -> Value { - for (auto& argument : arguments) - printf("%s ", argument.to_string().characters()); - return js_undefined(); - }); + put("console", heap().allocate()); put_native_function("gc", [](Object* this_object, Vector) -> Value { dbg() << "Forced garbage collection requested!"; this_object->heap().collect_garbage(); -- cgit v1.2.3