RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 06:27:45 +00:00
Code Issues Activity Actions

LibJS: Make Array.prototype.indexOf() generic

Browse source
This commit is contained in:
Linus Groh 2020-05-22 17:42:20 +01:00 • committed by Andreas Kling
parent 174ac5d348
commit 9b9b6a4cff
2 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Libraries/LibJS/Runtime/ArrayPrototype.cpp
View file

@ -357,35 +357,32 @@ Value ArrayPrototype::slice(Interpreter& interpreter)
Value ArrayPrototype::index_of(Interpreter& interpreter) Value ArrayPrototype::index_of(Interpreter& interpreter)
{ {
auto* array = array_from(interpreter); auto* this_object = interpreter.this_value().to_object(interpreter);
if (!array) if (!this_object)
return {}; return {};
i32 length = get_length(interpreter, *this_object);
i32 array_size = static_cast<i32>(array->elements().size()); if (interpreter.exception())
if (array_size == 0) return {};
if (length == 0)
return Value(-1); return Value(-1);
i32 from_index = 0; i32 from_index = 0;
if (interpreter.argument_count() >= 2) { if (interpreter.argument_count() >= 2) {
from_index = interpreter.argument(1).to_i32(interpreter); from_index = interpreter.argument(1).to_i32(interpreter);
if (interpreter.exception()) if (interpreter.exception())
return {}; return {};
if (from_index >= array_size) if (from_index >= length)
return Value(-1); return Value(-1);
auto negative_min_index = ((array_size - 1) * -1); if (from_index < 0)
if (from_index < negative_min_index) from_index = max(length + from_index, 0);
from_index = 0;
else if (from_index < 0)
from_index = array_size + from_index;
} }
auto search_element = interpreter.argument(0); auto search_element = interpreter.argument(0);
for (i32 i = from_index; i < array_size; ++i) { for (i32 i = from_index; i < length; ++i) {
auto& element = array->elements().at(i); auto element = this_object->get_by_index(i);
if (interpreter.exception())
return {};
if (strict_eq(interpreter, element, search_element)) if (strict_eq(interpreter, element, search_element))
return Value(i); return Value(i);
} }
return Value(-1); return Value(-1);
} }

9
Libraries/LibJS/Tests/Array.prototype-generic-functions.js
View file

@ -43,6 +43,15 @@ try {
assert(Array.prototype.toString.call({ join: () => "foo" }) === "foo"); assert(Array.prototype.toString.call({ join: () => "foo" }) === "foo");
} }
{
assert(Array.prototype.indexOf.call({}) === -1);
assert(Array.prototype.indexOf.call({ 0: undefined }) === -1);
assert(Array.prototype.indexOf.call({ length: 1, 0: undefined }) === 0);
assert(Array.prototype.indexOf.call({ length: 1, 2: "foo" }, "foo") === -1);
assert(Array.prototype.indexOf.call({ length: 5, 2: "foo" }, "foo") === 2);
assert(Array.prototype.indexOf.call({ length: 5, 2: "foo", 4: "foo" }, "foo", 3) === 4);
}
const o = { length: 5, 0: "foo", 1: "bar", 3: "baz" }; const o = { length: 5, 0: "foo", 1: "bar", 3: "baz" };
{ {