Skip to content

Commit 65db835

Browse files
galpetergalpeter
authored
Implement rest parameter support for destructuring object patterns in for (#4338)
In case of `for (const {...rest} ...) ` there was an incorrectly handling of the destructuring pattern. JerryScript-DCO-1.0-Signed-off-by: Peter Gal [email protected]
1 parent fab35c3 commit 65db835

File tree

3 files changed

+37
-45
lines changed

3 files changed

+37
-45
lines changed

‎jerry-core/parser/js/js-parser-statm.c

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1350,15 +1350,26 @@ parser_parse_for_statement_start (parser_context_t *context_p) /**< context */
13501350
parser_emit_cbc_ext (context_p, is_for_in ? CBC_EXT_FOR_IN_GET_NEXT
13511351
: CBC_EXT_FOR_OF_GET_NEXT);
13521352

1353+
parser_pattern_flags_t flags = (PARSER_PATTERN_BINDING | PARSER_PATTERN_TARGET_ON_STACK);
1354+
13531355
if (context_p->next_scanner_info_p->source_p == (context_p->source_p + 1))
13541356
{
1355-
JERRY_ASSERT (context_p->next_scanner_info_p->type == SCANNER_TYPE_INITIALIZER);
1357+
if (context_p->next_scanner_info_p->type == SCANNER_TYPE_INITIALIZER)
1358+
{
1359+
scanner_release_next (context_p, sizeof (scanner_location_info_t));
1360+
}
1361+
else
1362+
{
1363+
JERRY_ASSERT (context_p->next_scanner_info_p->type == SCANNER_TYPE_LITERAL_FLAGS);
1364+
if (context_p->next_scanner_info_p->u8_arg & SCANNER_LITERAL_OBJECT_HAS_REST)
1365+
{
1366+
flags |= PARSER_PATTERN_HAS_REST_ELEMENT;
1367+
}
13561368

1357-
scanner_release_next (context_p, sizeof (scanner_location_info_t));
1369+
scanner_release_next (context_p, sizeof (scanner_info_t));
1370+
}
13581371
}
13591372

1360-
parser_pattern_flags_t flags = (PARSER_PATTERN_BINDING | PARSER_PATTERN_TARGET_ON_STACK);
1361-
13621373
if (token_type == LEXER_KEYW_LET)
13631374
{
13641375
flags |= PARSER_PATTERN_LET;

‎tests/jerry/es.next/object-pattern2.js

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,3 +135,25 @@ function f8() {
135135
rest_compare(b, ["0", "C", "1", "D"])
136136
}
137137
f8()
138+
139+
function f9() {
140+
var counter = 0;
141+
142+
for (const { ...rest} in { B: "AA", C: 6.25 }) {
143+
switch (counter) {
144+
case 0: {
145+
/* rest === { '0': 'B' } */
146+
assert(rest['0'] === 'B');
147+
break;
148+
}
149+
case 1: {
150+
/* rest === { '0': 'C' } */
151+
assert(rest['0'] == 'C');
152+
break;
153+
}
154+
}
155+
counter++;
156+
}
157+
assert(counter === 2);
158+
}
159+
f9()

‎tests/test262-esnext-excludelist.xml

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -7489,31 +7489,6 @@
74897489
<test id="language/statements/class/elements/async-gen-private-method/yield-spread-obj.js"><reason></reason></test>
74907490
<test id="language/statements/class/elements/gen-private-method-static/yield-spread-obj.js"><reason></reason></test>
74917491
<test id="language/statements/class/elements/gen-private-method/yield-spread-obj.js"><reason></reason></test>
7492-
<test id="language/statements/for-await-of/async-func-dstr-const-async-obj-ptrn-rest-skip-non-enumerable.js"><reason></reason></test>
7493-
<test id="language/statements/for-await-of/async-func-dstr-const-async-obj-ptrn-rest-val-obj.js"><reason></reason></test>
7494-
<test id="language/statements/for-await-of/async-func-dstr-let-async-obj-ptrn-rest-skip-non-enumerable.js"><reason></reason></test>
7495-
<test id="language/statements/for-await-of/async-func-dstr-let-async-obj-ptrn-rest-val-obj.js"><reason></reason></test>
7496-
<test id="language/statements/for-await-of/async-gen-dstr-const-async-obj-ptrn-rest-getter.js"><reason></reason></test>
7497-
<test id="language/statements/for-await-of/async-gen-dstr-const-async-obj-ptrn-rest-skip-non-enumerable.js"><reason></reason></test>
7498-
<test id="language/statements/for-await-of/async-gen-dstr-const-async-obj-ptrn-rest-val-obj.js"><reason></reason></test>
7499-
<test id="language/statements/for-await-of/async-gen-dstr-const-obj-ptrn-rest-getter.js"><reason></reason></test>
7500-
<test id="language/statements/for-await-of/async-gen-dstr-const-obj-ptrn-rest-skip-non-enumerable.js"><reason></reason></test>
7501-
<test id="language/statements/for-await-of/async-gen-dstr-const-obj-ptrn-rest-val-obj.js"><reason></reason></test>
7502-
<test id="language/statements/for-await-of/async-gen-dstr-let-async-obj-ptrn-rest-getter.js"><reason></reason></test>
7503-
<test id="language/statements/for-await-of/async-gen-dstr-let-async-obj-ptrn-rest-skip-non-enumerable.js"><reason></reason></test>
7504-
<test id="language/statements/for-await-of/async-gen-dstr-let-async-obj-ptrn-rest-val-obj.js"><reason></reason></test>
7505-
<test id="language/statements/for-await-of/async-gen-dstr-let-obj-ptrn-rest-getter.js"><reason></reason></test>
7506-
<test id="language/statements/for-await-of/async-gen-dstr-let-obj-ptrn-rest-skip-non-enumerable.js"><reason></reason></test>
7507-
<test id="language/statements/for-await-of/async-gen-dstr-let-obj-ptrn-rest-val-obj.js"><reason></reason></test>
7508-
<test id="language/statements/for-of/dstr/const-obj-ptrn-rest-getter.js"><reason></reason></test>
7509-
<test id="language/statements/for-of/dstr/const-obj-ptrn-rest-skip-non-enumerable.js"><reason></reason></test>
7510-
<test id="language/statements/for-of/dstr/const-obj-ptrn-rest-val-obj.js"><reason></reason></test>
7511-
<test id="language/statements/for-of/dstr/let-obj-ptrn-rest-getter.js"><reason></reason></test>
7512-
<test id="language/statements/for-of/dstr/let-obj-ptrn-rest-skip-non-enumerable.js"><reason></reason></test>
7513-
<test id="language/statements/for-of/dstr/let-obj-ptrn-rest-val-obj.js"><reason></reason></test>
7514-
<test id="language/statements/for-of/dstr/var-obj-ptrn-rest-getter.js"><reason></reason></test>
7515-
<test id="language/statements/for-of/dstr/var-obj-ptrn-rest-skip-non-enumerable.js"><reason></reason></test>
7516-
<test id="language/statements/for-of/dstr/var-obj-ptrn-rest-val-obj.js"><reason></reason></test>
75177492
<!-- END - ES2018: Rest/Spread Properties -->
75187493

75197494
<!-- ES2020: Dynamic Import
@@ -9242,8 +9217,6 @@
92429217
<test id="language/statements/for-await-of/async-func-dstr-const-async-ary-ptrn-rest-not-final-ary.js"><reason></reason></test>
92439218
<test id="language/statements/for-await-of/async-func-dstr-const-async-ary-ptrn-rest-not-final-id.js"><reason></reason></test>
92449219
<test id="language/statements/for-await-of/async-func-dstr-const-async-ary-ptrn-rest-not-final-obj.js"><reason></reason></test>
9245-
<test id="language/statements/for-await-of/async-func-dstr-const-async-obj-ptrn-rest-skip-non-enumerable.js"><reason></reason></test>
9246-
<test id="language/statements/for-await-of/async-func-dstr-const-async-obj-ptrn-rest-val-obj.js"><reason></reason></test>
92479220
<test id="language/statements/for-await-of/async-func-dstr-const-obj-ptrn-id-get-value-err.js"><reason></reason></test>
92489221
<test id="language/statements/for-await-of/async-func-dstr-const-obj-ptrn-id-init-throws.js"><reason></reason></test>
92499222
<test id="language/statements/for-await-of/async-func-dstr-const-obj-ptrn-id-init-unresolvable.js"><reason></reason></test>
@@ -9275,8 +9248,6 @@
92759248
<test id="language/statements/for-await-of/async-func-dstr-let-async-ary-ptrn-rest-not-final-ary.js"><reason></reason></test>
92769249
<test id="language/statements/for-await-of/async-func-dstr-let-async-ary-ptrn-rest-not-final-id.js"><reason></reason></test>
92779250
<test id="language/statements/for-await-of/async-func-dstr-let-async-ary-ptrn-rest-not-final-obj.js"><reason></reason></test>
9278-
<test id="language/statements/for-await-of/async-func-dstr-let-async-obj-ptrn-rest-skip-non-enumerable.js"><reason></reason></test>
9279-
<test id="language/statements/for-await-of/async-func-dstr-let-async-obj-ptrn-rest-val-obj.js"><reason></reason></test>
92809251
<test id="language/statements/for-await-of/async-func-dstr-let-obj-ptrn-id-get-value-err.js"><reason></reason></test>
92819252
<test id="language/statements/for-await-of/async-func-dstr-let-obj-ptrn-id-init-throws.js"><reason></reason></test>
92829253
<test id="language/statements/for-await-of/async-func-dstr-let-obj-ptrn-id-init-unresolvable.js"><reason></reason></test>
@@ -9368,9 +9339,6 @@
93689339
<test id="language/statements/for-await-of/async-gen-dstr-const-async-ary-ptrn-rest-not-final-ary.js"><reason></reason></test>
93699340
<test id="language/statements/for-await-of/async-gen-dstr-const-async-ary-ptrn-rest-not-final-id.js"><reason></reason></test>
93709341
<test id="language/statements/for-await-of/async-gen-dstr-const-async-ary-ptrn-rest-not-final-obj.js"><reason></reason></test>
9371-
<test id="language/statements/for-await-of/async-gen-dstr-const-async-obj-ptrn-rest-getter.js"><reason></reason></test>
9372-
<test id="language/statements/for-await-of/async-gen-dstr-const-async-obj-ptrn-rest-skip-non-enumerable.js"><reason></reason></test>
9373-
<test id="language/statements/for-await-of/async-gen-dstr-const-async-obj-ptrn-rest-val-obj.js"><reason></reason></test>
93749342
<test id="language/statements/for-await-of/async-gen-dstr-const-obj-ptrn-id-get-value-err.js"><reason></reason></test>
93759343
<test id="language/statements/for-await-of/async-gen-dstr-const-obj-ptrn-id-init-throws.js"><reason></reason></test>
93769344
<test id="language/statements/for-await-of/async-gen-dstr-const-obj-ptrn-id-init-unresolvable.js"><reason></reason></test>
@@ -9379,9 +9347,6 @@
93799347
<test id="language/statements/for-await-of/async-gen-dstr-const-obj-ptrn-prop-id-get-value-err.js"><reason></reason></test>
93809348
<test id="language/statements/for-await-of/async-gen-dstr-const-obj-ptrn-prop-id-init-throws.js"><reason></reason></test>
93819349
<test id="language/statements/for-await-of/async-gen-dstr-const-obj-ptrn-prop-id-init-unresolvable.js"><reason></reason></test>
9382-
<test id="language/statements/for-await-of/async-gen-dstr-const-obj-ptrn-rest-getter.js"><reason></reason></test>
9383-
<test id="language/statements/for-await-of/async-gen-dstr-const-obj-ptrn-rest-skip-non-enumerable.js"><reason></reason></test>
9384-
<test id="language/statements/for-await-of/async-gen-dstr-const-obj-ptrn-rest-val-obj.js"><reason></reason></test>
93859350
<test id="language/statements/for-await-of/async-gen-dstr-let-ary-init-iter-get-err.js"><reason></reason></test>
93869351
<test id="language/statements/for-await-of/async-gen-dstr-let-ary-ptrn-elem-id-init-throws.js"><reason></reason></test>
93879352
<test id="language/statements/for-await-of/async-gen-dstr-let-ary-ptrn-elem-id-init-unresolvable.js"><reason></reason></test>
@@ -9405,9 +9370,6 @@
94059370
<test id="language/statements/for-await-of/async-gen-dstr-let-async-ary-ptrn-rest-not-final-ary.js"><reason></reason></test>
94069371
<test id="language/statements/for-await-of/async-gen-dstr-let-async-ary-ptrn-rest-not-final-id.js"><reason></reason></test>
94079372
<test id="language/statements/for-await-of/async-gen-dstr-let-async-ary-ptrn-rest-not-final-obj.js"><reason></reason></test>
9408-
<test id="language/statements/for-await-of/async-gen-dstr-let-async-obj-ptrn-rest-getter.js"><reason></reason></test>
9409-
<test id="language/statements/for-await-of/async-gen-dstr-let-async-obj-ptrn-rest-skip-non-enumerable.js"><reason></reason></test>
9410-
<test id="language/statements/for-await-of/async-gen-dstr-let-async-obj-ptrn-rest-val-obj.js"><reason></reason></test>
94119373
<test id="language/statements/for-await-of/async-gen-dstr-let-obj-ptrn-id-get-value-err.js"><reason></reason></test>
94129374
<test id="language/statements/for-await-of/async-gen-dstr-let-obj-ptrn-id-init-throws.js"><reason></reason></test>
94139375
<test id="language/statements/for-await-of/async-gen-dstr-let-obj-ptrn-id-init-unresolvable.js"><reason></reason></test>
@@ -9416,9 +9378,6 @@
94169378
<test id="language/statements/for-await-of/async-gen-dstr-let-obj-ptrn-prop-id-get-value-err.js"><reason></reason></test>
94179379
<test id="language/statements/for-await-of/async-gen-dstr-let-obj-ptrn-prop-id-init-throws.js"><reason></reason></test>
94189380
<test id="language/statements/for-await-of/async-gen-dstr-let-obj-ptrn-prop-id-init-unresolvable.js"><reason></reason></test>
9419-
<test id="language/statements/for-await-of/async-gen-dstr-let-obj-ptrn-rest-getter.js"><reason></reason></test>
9420-
<test id="language/statements/for-await-of/async-gen-dstr-let-obj-ptrn-rest-skip-non-enumerable.js"><reason></reason></test>
9421-
<test id="language/statements/for-await-of/async-gen-dstr-let-obj-ptrn-rest-val-obj.js"><reason></reason></test>
94229381
<test id="language/statements/for-await-of/async-gen-dstr-var-ary-init-iter-get-err.js"><reason></reason></test>
94239382
<test id="language/statements/for-await-of/async-gen-dstr-var-ary-ptrn-elem-id-init-throws.js"><reason></reason></test>
94249383
<test id="language/statements/for-await-of/async-gen-dstr-var-ary-ptrn-elem-id-init-unresolvable.js"><reason></reason></test>

0 commit comments

Comments
 (0)