summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Libraries/LibJS/Runtime/Array.cpp41
-rw-r--r--Libraries/LibJS/Runtime/Array.h9
-rw-r--r--Libraries/LibJS/Runtime/Object.cpp41
-rw-r--r--Libraries/LibJS/Runtime/Object.h7
-rw-r--r--Libraries/LibJS/Runtime/ObjectConstructor.cpp8
-rw-r--r--Userland/js.cpp13
6 files changed, 69 insertions, 50 deletions
diff --git a/Libraries/LibJS/Runtime/Array.cpp b/Libraries/LibJS/Runtime/Array.cpp
index 019697fe74..e779630c2c 100644
--- a/Libraries/LibJS/Runtime/Array.cpp
+++ b/Libraries/LibJS/Runtime/Array.cpp
@@ -43,52 +43,21 @@ Array::~Array()
Value Array::shift()
{
- if (m_elements.size() == 0)
+ if (elements().size() == 0)
return js_undefined();
- return Value(m_elements.take_first());
+ return Value(elements().take_first());
}
Value Array::pop()
{
- if (m_elements.size() == 0)
+ if (elements().size() == 0)
return js_undefined();
- return Value(m_elements.take_last());
+ return Value(elements().take_last());
}
void Array::push(Value value)
{
- m_elements.append(value);
-}
-
-void Array::visit_children(Cell::Visitor& visitor)
-{
- Object::visit_children(visitor);
- for (auto& element : m_elements)
- visitor.visit(element);
-}
-
-Optional<Value> Array::get_own_property(const Object& this_object, const FlyString& property_name) const
-{
- bool ok;
- i32 index = property_name.to_int(ok);
- if (ok) {
- if (index >= 0 && index < length())
- return m_elements[index];
- }
- return Object::get_own_property(this_object, property_name);
-}
-
-bool Array::put_own_property(Object& this_object, const FlyString& property_name, Value value)
-{
- bool ok;
- i32 index = property_name.to_int(ok);
- if (ok && index >= 0) {
- if (index >= length())
- m_elements.resize(index + 1);
- m_elements[index] = value;
- return true;
- }
- return Object::put_own_property(this_object, property_name, value);
+ elements().append(value);
}
Value Array::length_getter(Interpreter& interpreter)
diff --git a/Libraries/LibJS/Runtime/Array.h b/Libraries/LibJS/Runtime/Array.h
index 61c45644a0..10906e0256 100644
--- a/Libraries/LibJS/Runtime/Array.h
+++ b/Libraries/LibJS/Runtime/Array.h
@@ -35,9 +35,7 @@ public:
Array();
virtual ~Array() override;
- i32 length() const { return static_cast<i32>(m_elements.size()); }
- const Vector<Value>& elements() const { return m_elements; }
- Vector<Value>& elements() { return m_elements; }
+ i32 length() const { return static_cast<i32>(elements().size()); }
Value shift();
Value pop();
@@ -45,15 +43,10 @@ public:
private:
virtual const char* class_name() const override { return "Array"; }
- virtual void visit_children(Cell::Visitor&) override;
virtual bool is_array() const override { return true; }
- virtual Optional<Value> get_own_property(const Object& this_object, const FlyString& property_name) const override;
- virtual bool put_own_property(Object& this_object, const FlyString& property_name, Value) override;
static Value length_getter(Interpreter&);
static void length_setter(Interpreter&, Value);
-
- Vector<Value> m_elements;
};
}
diff --git a/Libraries/LibJS/Runtime/Object.cpp b/Libraries/LibJS/Runtime/Object.cpp
index 18185cc116..9751ddc0fd 100644
--- a/Libraries/LibJS/Runtime/Object.cpp
+++ b/Libraries/LibJS/Runtime/Object.cpp
@@ -119,8 +119,27 @@ bool Object::put_own_property(Object& this_object, const FlyString& property_nam
return true;
}
+Optional<Value> Object::get_by_index(i32 property_index) const
+{
+ if (property_index < 0)
+ return get(String::number(property_index));
+
+ const Object* object = this;
+ while (object) {
+ if (static_cast<size_t>(property_index) < object->m_elements.size())
+ return object->m_elements[property_index];
+ object = object->prototype();
+ }
+ return {};
+}
+
Optional<Value> Object::get(const FlyString& property_name) const
{
+ bool ok;
+ i32 property_index = property_name.to_int(ok);
+ if (ok && property_index >= 0)
+ return get_by_index(property_index);
+
const Object* object = this;
while (object) {
auto value = object->get_own_property(*this, property_name);
@@ -131,8 +150,23 @@ Optional<Value> Object::get(const FlyString& property_name) const
return {};
}
+void Object::put_by_index(i32 property_index, Value value)
+{
+ if (property_index < 0)
+ return put(String::number(property_index), value);
+ // FIXME: Implement some kind of sparse storage for arrays with huge indices.
+ if (static_cast<size_t>(property_index) >= m_elements.size())
+ m_elements.resize(property_index + 1);
+ m_elements[property_index] = value;
+}
+
void Object::put(const FlyString& property_name, Value value)
{
+ bool ok;
+ i32 property_index = property_name.to_int(ok);
+ if (ok && property_index >= 0)
+ return put_by_index(property_index, value);
+
// If there's a setter in the prototype chain, we go to the setter.
// Otherwise, it goes in the own property storage.
Object* object = this;
@@ -174,10 +208,17 @@ void Object::visit_children(Cell::Visitor& visitor)
for (auto& value : m_storage)
visitor.visit(value);
+
+ for (auto& value : m_elements)
+ visitor.visit(value);
}
bool Object::has_own_property(const FlyString& property_name) const
{
+ bool ok;
+ i32 property_index = property_name.to_int(ok);
+ if (ok && property_index >= 0)
+ return static_cast<size_t>(property_index) < m_elements.size();
return shape().lookup(property_name).has_value();
}
diff --git a/Libraries/LibJS/Runtime/Object.h b/Libraries/LibJS/Runtime/Object.h
index f47b35ac72..529fdb92cc 100644
--- a/Libraries/LibJS/Runtime/Object.h
+++ b/Libraries/LibJS/Runtime/Object.h
@@ -43,7 +43,10 @@ public:
Shape& shape() { return *m_shape; }
const Shape& shape() const { return *m_shape; }
+ Optional<Value> get_by_index(i32 property_index) const;
Optional<Value> get(const FlyString& property_name) const;
+
+ void put_by_index(i32 property_index, Value);
void put(const FlyString& property_name, Value);
virtual Optional<Value> get_own_property(const Object& this_object, const FlyString& property_name) const;
@@ -81,11 +84,15 @@ public:
Value get_direct(size_t index) const { return m_storage[index]; }
+ const Vector<Value>& elements() const { return m_elements; }
+ Vector<Value>& elements() { return m_elements; }
+
private:
void set_shape(Shape&);
Shape* m_shape { nullptr };
Vector<Value> m_storage;
+ Vector<Value> m_elements;
};
}
diff --git a/Libraries/LibJS/Runtime/ObjectConstructor.cpp b/Libraries/LibJS/Runtime/ObjectConstructor.cpp
index 41376b5cbc..f56ae2f161 100644
--- a/Libraries/LibJS/Runtime/ObjectConstructor.cpp
+++ b/Libraries/LibJS/Runtime/ObjectConstructor.cpp
@@ -64,11 +64,9 @@ Value ObjectConstructor::get_own_property_names(Interpreter& interpreter)
if (interpreter.exception())
return {};
auto* result = interpreter.heap().allocate<Array>();
- if (object->is_array()) {
- auto* array = static_cast<const Array*>(object);
- for (i32 i = 0; i < array->length(); ++i)
- result->push(js_string(interpreter, String::number(i)));
- }
+ for (size_t i = 0; i < object->elements().size(); ++i)
+ result->push(js_string(interpreter, String::number(i)));
+
for (auto& it : object->shape().property_table())
result->push(js_string(interpreter, it.key));
return result;
diff --git a/Userland/js.cpp b/Userland/js.cpp
index ea21e8314a..5d7d0be95e 100644
--- a/Userland/js.cpp
+++ b/Userland/js.cpp
@@ -117,11 +117,22 @@ static void print_array(const JS::Array& array, HashTable<JS::Object*>& seen_obj
static void print_object(const JS::Object& object, HashTable<JS::Object*>& seen_objects)
{
fputs("{ ", stdout);
+
+ for (size_t i = 0; i < object.elements().size(); ++i) {
+ printf("\"\033[33;1m%zu\033[0m\": ", i);
+ print_value(object.elements()[i], seen_objects);
+ if (i != object.elements().size() - 1)
+ fputs(", ", stdout);
+ }
+
+ if (!object.elements().is_empty() && object.shape().property_count())
+ fputs(", ", stdout);
+
size_t index = 0;
for (auto& it : object.shape().property_table()) {
printf("\"\033[33;1m%s\033[0m\": ", it.key.characters());
print_value(object.get_direct(it.value.offset), seen_objects);
- if (index != object.shape().property_table().size() - 1)
+ if (index != object.shape().property_count() - 1)
fputs(", ", stdout);
++index;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 04:59:12 +0000