diff options
| -rw-r--r-- | Base/home/anon/js/array.js | 5 | ||||
| -rw-r--r-- | Libraries/LibJS/Runtime/Array.h | 1 | ||||
| -rw-r--r-- | Libraries/LibJS/Runtime/Object.cpp | 20 |
3 files changed, 23 insertions, 3 deletions
diff --git a/Base/home/anon/js/array.js b/Base/home/anon/js/array.js index 41e3b559a3..2a643b96f3 100644 --- a/Base/home/anon/js/array.js +++ b/Base/home/anon/js/array.js @@ -1,8 +1,7 @@ var a = [1, 2, 3]; -console.log(a); -/* +a[1] = 5; + for (var i = 0; i < 3; ++i) { console.log(a[i]); } -*/ diff --git a/Libraries/LibJS/Runtime/Array.h b/Libraries/LibJS/Runtime/Array.h index 63baca7dfe..7cc3ac3c7a 100644 --- a/Libraries/LibJS/Runtime/Array.h +++ b/Libraries/LibJS/Runtime/Array.h @@ -37,6 +37,7 @@ public: i32 length() const { return static_cast<i32>(m_elements.size()); } const Vector<Value>& elements() const { return m_elements; } + Vector<Value>& elements() { return m_elements; } void append(Value); diff --git a/Libraries/LibJS/Runtime/Object.cpp b/Libraries/LibJS/Runtime/Object.cpp index d1211c2d39..01fe5bff80 100644 --- a/Libraries/LibJS/Runtime/Object.cpp +++ b/Libraries/LibJS/Runtime/Object.cpp @@ -27,6 +27,7 @@ #include <AK/String.h> #include <LibJS/Heap/Heap.h> #include <LibJS/Interpreter.h> +#include <LibJS/Runtime/Array.h> #include <LibJS/Runtime/NativeFunction.h> #include <LibJS/Runtime/NativeProperty.h> #include <LibJS/Runtime/Object.h> @@ -47,6 +48,15 @@ Value Object::get(String property_name) const { const Object* object = this; while (object) { + if (object->is_array()) { + auto* array = static_cast<const Array*>(object); + bool ok; + i32 index = property_name.to_int(ok); + if (ok) { + if (index >= 0 && index < array->length()) + return array->elements()[index]; + } + } auto value = object->m_properties.get(property_name); if (value.has_value()) { if (value.value().is_object() && value.value().as_object()->is_native_property()) @@ -62,6 +72,16 @@ void Object::put(String property_name, Value value) { Object* object = this; while (object) { + if (object->is_array()) { + auto* array = static_cast<Array*>(object); + bool ok; + i32 index = property_name.to_int(ok); + if (ok && index >= 0) { + if (index >= array->length()) + array->elements().resize(index + 1); + array->elements()[index] = value; + } + } auto value_here = object->m_properties.get(property_name); if (value_here.has_value()) { if (value_here.value().is_object() && value_here.value().as_object()->is_native_property()) { |