Skip to content

Commit fc4168f

Browse files
authored
Fix numeric literal with leading decimal point in accessor property name (#4832)
JerryScript-DCO-1.0-Signed-off-by: Daniel Batiz [email protected]
1 parent 3737a28 commit fc4168f

File tree

2 files changed

+21
-19
lines changed

2 files changed

+21
-19
lines changed

jerry-core/parser/js/js-lexer.c

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3186,21 +3186,6 @@ lexer_expect_object_literal_id (parser_context_t *context_p, /**< context */
31863186
lexer_consume_next_character (context_p);
31873187
return;
31883188
}
3189-
case LIT_CHAR_DOT:
3190-
{
3191-
if ((ident_opts & ((uint32_t) ~(LEXER_OBJ_IDENT_OBJECT_PATTERN | LEXER_OBJ_IDENT_SET_FUNCTION_START)))
3192-
|| context_p->source_p + 2 >= context_p->source_end_p || context_p->source_p[1] != LIT_CHAR_DOT
3193-
|| context_p->source_p[2] != LIT_CHAR_DOT)
3194-
{
3195-
break;
3196-
}
3197-
3198-
context_p->token.type = LEXER_THREE_DOTS;
3199-
context_p->token.flags &= (uint8_t) ~LEXER_NO_SKIP_SPACES;
3200-
PARSER_PLUS_EQUAL_LC (context_p->column, 3);
3201-
context_p->source_p += 3;
3202-
return;
3203-
}
32043189
#endif /* JERRY_ESNEXT */
32053190
case LIT_CHAR_RIGHT_BRACE:
32063191
{
@@ -3213,6 +3198,27 @@ lexer_expect_object_literal_id (parser_context_t *context_p, /**< context */
32133198
lexer_consume_next_character (context_p);
32143199
return;
32153200
}
3201+
#if JERRY_ESNEXT
3202+
case LIT_CHAR_DOT:
3203+
{
3204+
if (!(context_p->source_p + 1 >= context_p->source_end_p || lit_char_is_decimal_digit (context_p->source_p[1])))
3205+
{
3206+
if ((ident_opts & ((uint32_t) ~(LEXER_OBJ_IDENT_OBJECT_PATTERN | LEXER_OBJ_IDENT_SET_FUNCTION_START)))
3207+
|| context_p->source_p + 2 >= context_p->source_end_p || context_p->source_p[1] != LIT_CHAR_DOT
3208+
|| context_p->source_p[2] != LIT_CHAR_DOT)
3209+
{
3210+
break;
3211+
}
3212+
3213+
context_p->token.type = LEXER_THREE_DOTS;
3214+
context_p->token.flags &= (uint8_t) ~LEXER_NO_SKIP_SPACES;
3215+
PARSER_PLUS_EQUAL_LC (context_p->column, 3);
3216+
context_p->source_p += 3;
3217+
return;
3218+
}
3219+
/* FALLTHRU */
3220+
}
3221+
#endif /* JERRY_ESNEXT */
32163222
default:
32173223
{
32183224
const uint8_t *char_p = context_p->source_p;

tests/test262-esnext-excludelist.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,6 @@
100100
<test id="language/expressions/call/eval-spread-empty-leading.js"><reason></reason></test>
101101
<test id="language/expressions/call/eval-spread-empty-trailing.js"><reason></reason></test>
102102
<test id="language/expressions/call/eval-spread.js"><reason></reason></test>
103-
<test id="language/expressions/class/accessor-name-inst/literal-numeric-leading-decimal.js"><reason></reason></test>
104-
<test id="language/expressions/class/accessor-name-static/literal-numeric-leading-decimal.js"><reason></reason></test>
105103
<test id="language/expressions/class/class-name-ident-let-escaped.js"><reason></reason></test>
106104
<test id="language/expressions/class/class-name-ident-let.js"><reason></reason></test>
107105
<test id="language/expressions/class/class-name-ident-static-escaped.js"><reason></reason></test>
@@ -307,8 +305,6 @@
307305
<test id="language/module-code/parse-err-hoist-lex-fun.js"><reason></reason></test>
308306
<test id="language/module-code/parse-err-hoist-lex-gen.js"><reason></reason></test>
309307
<test id="language/statements/async-function/let-newline-await-in-async-function.js"><reason></reason></test>
310-
<test id="language/statements/class/accessor-name-inst/literal-numeric-leading-decimal.js"><reason></reason></test>
311-
<test id="language/statements/class/accessor-name-static/literal-numeric-leading-decimal.js"><reason></reason></test>
312308
<test id="language/statements/class/class-name-ident-let-escaped.js"><reason></reason></test>
313309
<test id="language/statements/class/class-name-ident-let.js"><reason></reason></test>
314310
<test id="language/statements/class/class-name-ident-static-escaped.js"><reason></reason></test>

0 commit comments

Comments
 (0)