Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ecmascript): FlattenIntoArray increment targetIndex #594

Merged
merged 3 commits into from
Mar 15, 2025
Merged

fix(ecmascript): FlattenIntoArray increment targetIndex #594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d65a7d2
chore(test262): Refresh FAIL/CRASH data
aapoalas Mar 15, 2025
2c58b9b
fix(ecmascript): FlattenIntoArray increment targetIndex
aapoalas Mar 15, 2025
954cd96
chore(test262): Update expectations
aapoalas Mar 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions nova_vm/src/ecmascript/builtins/indexed_collections/array_objects/array_prototype.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3991,9 +3991,8 @@ fn flatten_into_array(
// 2. Let targetIndex be start.
let mut target_index = start;
// 3. Let sourceIndex be +0𝔽.
let mut source_index = 0;
// 4. Repeat, while ℝ(sourceIndex) < sourceLen,
while source_index < source_len {
for source_index in 0..source_len {
// a. Let P be ! ToString(sourceIndex).
let source_index_number = Number::try_from(source_index).unwrap();
let p = PropertyKey::try_from(source_index).unwrap();
Expand All @@ -4002,7 +4001,6 @@ fn flatten_into_array(
// c. If exists is true, then
if !exists {
// d. Set sourceIndex to sourceIndex + 1𝔽.
source_index += 1;
continue;
}
// i. Let element be ? Get(source, P).
Expand Down Expand Up @@ -4037,7 +4035,7 @@ fn flatten_into_array(
}
// v. If shouldFlatten is true, then
if should_flatten {
// Note: Element is necessary an Array.
// Note: Element is necessarily an Array.
let element = Object::try_from(element)
.unwrap()
.bind(gc.nogc())
Expand Down Expand Up @@ -4077,9 +4075,9 @@ fn flatten_into_array(
gc.reborrow(),
)?;
// 3. Set targetIndex to targetIndex + 1.
target_index += 1;
}
// d. Set sourceIndex to sourceIndex + 1𝔽.
source_index += 1;
}
// 5. Return targetIndex.
Ok(target_index)
Expand Down
Loading