summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Base/home/anon/js/charAt.js2
-rw-r--r--Base/home/anon/js/hasOwnProperty.js2
-rw-r--r--Base/home/anon/js/native-function.js2
-rw-r--r--Base/home/anon/js/simple-scopes.js2
-rw-r--r--Base/home/anon/js/strings.js10
-rw-r--r--Base/home/anon/js/type-play.js20
-rw-r--r--Libraries/LibJS/Makefile1
-rw-r--r--Libraries/LibJS/Runtime/ConsoleObject.cpp46
-rw-r--r--Libraries/LibJS/Runtime/ConsoleObject.h42
-rw-r--r--Libraries/LibJS/Runtime/GlobalObject.cpp7
10 files changed, 109 insertions, 25 deletions
diff --git a/Base/home/anon/js/charAt.js b/Base/home/anon/js/charAt.js
index 610305e6ce..9a452fb4f5 100644
--- a/Base/home/anon/js/charAt.js
+++ b/Base/home/anon/js/charAt.js
@@ -1,2 +1,2 @@
var foo = "foobar";
-print(foo.charAt(3));
+console.log(foo.charAt(3));
diff --git a/Base/home/anon/js/hasOwnProperty.js b/Base/home/anon/js/hasOwnProperty.js
index 26456344ab..d874105c00 100644
--- a/Base/home/anon/js/hasOwnProperty.js
+++ b/Base/home/anon/js/hasOwnProperty.js
@@ -1,2 +1,2 @@
var x = "foobar";
-print(x.hasOwnProperty("length"));
+console.log(x.hasOwnProperty("length"));
diff --git a/Base/home/anon/js/native-function.js b/Base/home/anon/js/native-function.js
index 932eb9cf56..529c4df04f 100644
--- a/Base/home/anon/js/native-function.js
+++ b/Base/home/anon/js/native-function.js
@@ -1 +1 @@
-print("Hello friends!")
+console.log("Hello friends!")
diff --git a/Base/home/anon/js/simple-scopes.js b/Base/home/anon/js/simple-scopes.js
index 8580a8c770..14e6c35e75 100644
--- a/Base/home/anon/js/simple-scopes.js
+++ b/Base/home/anon/js/simple-scopes.js
@@ -8,4 +8,4 @@ function foo() {
return y;
}
-print(foo());
+console.log(foo());
diff --git a/Base/home/anon/js/strings.js b/Base/home/anon/js/strings.js
index 74cf39785d..1928d61d6f 100644
--- a/Base/home/anon/js/strings.js
+++ b/Base/home/anon/js/strings.js
@@ -1,12 +1,12 @@
var d = "Double quoted string\n";
-print(d);
+console.log(d);
var s = 'Single quoted string\n';
-print(s)
+console.log(s)
var e = "Escaped characters \b \f \n \r \t \v \' \" \\ \n";
-print(e)
+console.log(e)
var u = "Unterminated string
this is not possible in js\n";
-print(u);
+console.log(u);
var u2 = 'This is neither\n
-print(u2);
+console.log(u2);
diff --git a/Base/home/anon/js/type-play.js b/Base/home/anon/js/type-play.js
index 038841397c..a9a8bb3d53 100644
--- a/Base/home/anon/js/type-play.js
+++ b/Base/home/anon/js/type-play.js
@@ -1,12 +1,12 @@
const object = {};
-print(true == 1);
-print(null == undefined);
-print("12" == 12);
-print(1 + "12");
-print(12 / "12" == true);
-print(2 * "12");
-print(~"24");
-print(~true);
-print(2*2 + "4");
-print(object == "[object Object]");
+console.log(true == 1);
+console.log(null == undefined);
+console.log("12" == 12);
+console.log(1 + "12");
+console.log(12 / "12" == true);
+console.log(2 * "12");
+console.log(~"24");
+console.log(~true);
+console.log(2*2 + "4");
+console.log(object == "[object Object]");
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 <kling@serenityos.org>
+ * 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 <AK/Function.h>
+#include <LibJS/Runtime/ConsoleObject.h>
+#include <stdio.h>
+
+namespace JS {
+
+ConsoleObject::ConsoleObject()
+{
+ put_native_function("log", [](Object*, Vector<Value> 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 <kling@serenityos.org>
+ * 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 <LibJS/Runtime/Object.h>
+
+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 <LibJS/Runtime/GlobalObject.h>
#include <LibJS/Runtime/NativeFunction.h>
#include <LibJS/Runtime/Value.h>
-#include <stdio.h>
namespace JS {
GlobalObject::GlobalObject()
{
- put_native_function("print", [](Object*, Vector<Value> arguments) -> Value {
- for (auto& argument : arguments)
- printf("%s ", argument.to_string().characters());
- return js_undefined();
- });
+ put("console", heap().allocate<ConsoleObject>());
put_native_function("gc", [](Object* this_object, Vector<Value>) -> Value {
dbg() << "Forced garbage collection requested!";
this_object->heap().collect_garbage();
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 00:29:55 +0000