From bceabd7c4b4afde6d5771b172fc99c6da09f825b Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Fri, 20 Mar 2020 21:01:36 +0100 Subject: LibJS: Add ArrayPrototype and implement Array.prototype.push() This function is ultimately supposed to be generic and allow any |this| that has a length property, but for now it only works on our own Array object type. --- Base/home/anon/js/array.js | 6 +++- Libraries/LibJS/AST.cpp | 2 +- Libraries/LibJS/Interpreter.cpp | 3 ++ Libraries/LibJS/Interpreter.h | 2 ++ Libraries/LibJS/Makefile | 1 + Libraries/LibJS/Runtime/Array.cpp | 4 ++- Libraries/LibJS/Runtime/Array.h | 2 +- Libraries/LibJS/Runtime/ArrayPrototype.cpp | 52 ++++++++++++++++++++++++++++++ Libraries/LibJS/Runtime/ArrayPrototype.h | 42 ++++++++++++++++++++++++ 9 files changed, 110 insertions(+), 4 deletions(-) create mode 100644 Libraries/LibJS/Runtime/ArrayPrototype.cpp create mode 100644 Libraries/LibJS/Runtime/ArrayPrototype.h diff --git a/Base/home/anon/js/array.js b/Base/home/anon/js/array.js index 2a643b96f3..b62f262396 100644 --- a/Base/home/anon/js/array.js +++ b/Base/home/anon/js/array.js @@ -2,6 +2,10 @@ var a = [1, 2, 3]; a[1] = 5; -for (var i = 0; i < 3; ++i) { +var push_result = a.push(7); + +for (var i = 0; i < a.length; ++i) { console.log(a[i]); } + +console.log("push result: " + push_result); diff --git a/Libraries/LibJS/AST.cpp b/Libraries/LibJS/AST.cpp index 99087bc5f0..2a077f8133 100644 --- a/Libraries/LibJS/AST.cpp +++ b/Libraries/LibJS/AST.cpp @@ -697,7 +697,7 @@ Value ArrayExpression::execute(Interpreter& interpreter) const { auto* array = interpreter.heap().allocate(); for (auto& element : m_elements) { - array->append(element.execute(interpreter)); + array->push(element.execute(interpreter)); } return array; } diff --git a/Libraries/LibJS/Interpreter.cpp b/Libraries/LibJS/Interpreter.cpp index 6c6b1563f2..4485b5c86a 100644 --- a/Libraries/LibJS/Interpreter.cpp +++ b/Libraries/LibJS/Interpreter.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -42,6 +43,7 @@ Interpreter::Interpreter() m_global_object = heap().allocate(); m_object_prototype = heap().allocate(); m_string_prototype = heap().allocate(); + m_array_prototype = heap().allocate(); } Interpreter::~Interpreter() @@ -143,6 +145,7 @@ void Interpreter::gather_roots(Badge, HashTable& roots) roots.set(m_global_object); roots.set(m_string_prototype); roots.set(m_object_prototype); + roots.set(m_array_prototype); for (auto& scope : m_scope_stack) { for (auto& it : scope.variables) { diff --git a/Libraries/LibJS/Interpreter.h b/Libraries/LibJS/Interpreter.h index fd4e92ecb8..52962c6d78 100644 --- a/Libraries/LibJS/Interpreter.h +++ b/Libraries/LibJS/Interpreter.h @@ -97,6 +97,7 @@ public: Object* string_prototype() { return m_string_prototype; } Object* object_prototype() { return m_object_prototype; } + Object* array_prototype() { return m_array_prototype; } private: Heap m_heap; @@ -107,6 +108,7 @@ private: Object* m_global_object { nullptr }; Object* m_string_prototype { nullptr }; Object* m_object_prototype { nullptr }; + Object* m_array_prototype { nullptr }; }; } diff --git a/Libraries/LibJS/Makefile b/Libraries/LibJS/Makefile index cf1ef690f8..cb1f5141ed 100644 --- a/Libraries/LibJS/Makefile +++ b/Libraries/LibJS/Makefile @@ -7,6 +7,7 @@ OBJS = \ Lexer.o \ Parser.o \ Runtime/Array.o \ + Runtime/ArrayPrototype.o \ Runtime/Cell.o \ Runtime/ConsoleObject.o \ Runtime/Function.o \ diff --git a/Libraries/LibJS/Runtime/Array.cpp b/Libraries/LibJS/Runtime/Array.cpp index 09e7267621..db94e19029 100644 --- a/Libraries/LibJS/Runtime/Array.cpp +++ b/Libraries/LibJS/Runtime/Array.cpp @@ -25,12 +25,14 @@ */ #include +#include #include namespace JS { Array::Array() { + set_prototype(interpreter().array_prototype()); put_native_property( "length", [this](Object*) { @@ -45,7 +47,7 @@ Array::~Array() { } -void Array::append(Value value) +void Array::push(Value value) { m_elements.append(value); } diff --git a/Libraries/LibJS/Runtime/Array.h b/Libraries/LibJS/Runtime/Array.h index 7cc3ac3c7a..d99873544f 100644 --- a/Libraries/LibJS/Runtime/Array.h +++ b/Libraries/LibJS/Runtime/Array.h @@ -39,7 +39,7 @@ public: const Vector& elements() const { return m_elements; } Vector& elements() { return m_elements; } - void append(Value); + void push(Value); private: virtual const char* class_name() const override { return "Array"; } diff --git a/Libraries/LibJS/Runtime/ArrayPrototype.cpp b/Libraries/LibJS/Runtime/ArrayPrototype.cpp new file mode 100644 index 0000000000..2aed718142 --- /dev/null +++ b/Libraries/LibJS/Runtime/ArrayPrototype.cpp @@ -0,0 +1,52 @@ +/* + * 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 +#include +#include +#include + +namespace JS { + +ArrayPrototype::ArrayPrototype() +{ + put_native_function("push", [](Object* this_object, const Vector& arguments) -> Value { + if (arguments.is_empty()) + return js_undefined(); + ASSERT(this_object); + ASSERT(this_object->is_array()); + static_cast(this_object)->push(arguments[0]); + return Value(static_cast(this_object)->length()); + }); +} + +ArrayPrototype::~ArrayPrototype() +{ +} + +} diff --git a/Libraries/LibJS/Runtime/ArrayPrototype.h b/Libraries/LibJS/Runtime/ArrayPrototype.h new file mode 100644 index 0000000000..2ada6dee17 --- /dev/null +++ b/Libraries/LibJS/Runtime/ArrayPrototype.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 ArrayPrototype final : public Object { +public: + ArrayPrototype(); + virtual ~ArrayPrototype() override; + +private: + virtual const char* class_name() const override { return "ArrayPrototype"; } +}; + +} -- cgit v1.2.3