RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 09:07:35 +00:00
Code Issues Activity Actions

LibJS: Make Array.prototype.includes() generic

Browse source
This commit is contained in:
Linus Groh 2020-05-23 11:40:20 +01:00 • committed by Andreas Kling
parent e78bc2f6fd
commit 92fd140cb2
2 changed files with 21 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -557,35 +557,32 @@ Value ArrayPrototype::last_index_of(Interpreter& interpreter)
Value ArrayPrototype::includes(Interpreter& interpreter) Value ArrayPrototype::includes(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 = array->elements().size(); if (interpreter.exception())
if (array_size == 0) return {};
if (length == 0)
return Value(false); return Value(false);
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(false); return Value(false);
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 value_to_find = interpreter.argument(0); auto value_to_find = 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).value_or(js_undefined());
if (interpreter.exception())
return {};
if (same_value_zero(interpreter, element, value_to_find)) if (same_value_zero(interpreter, element, value_to_find))
return Value(true); return Value(true);
} }
return Value(false); return Value(false);
} }

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

@ -62,6 +62,14 @@ try {
assert(Array.prototype.lastIndexOf.call({ length: 5, 2: "foo", 4: "foo" }, "foo", -2) === 2); assert(Array.prototype.lastIndexOf.call({ length: 5, 2: "foo", 4: "foo" }, "foo", -2) === 2);
} }
{
assert(Array.prototype.includes.call({}) === false);
assert(Array.prototype.includes.call({ 0: undefined }) === false);
assert(Array.prototype.includes.call({ length: 1, 0: undefined }) === true);
assert(Array.prototype.includes.call({ length: 1, 2: "foo" }, "foo") === false);
assert(Array.prototype.includes.call({ length: 5, 2: "foo" }, "foo") === true);
}
const o = { length: 5, 0: "foo", 1: "bar", 3: "baz" }; const o = { length: 5, 0: "foo", 1: "bar", 3: "baz" };
{ {