Skip to content

Commit

Permalink
Asterisk should be ignored by object initializers. (#3872)
Browse files Browse the repository at this point in the history
Fixes #3869

JerryScript-DCO-1.0-Signed-off-by: Zoltan Herczeg [email protected]
  • Loading branch information
zherczeg authored Jun 8, 2020
1 parent ab2e821 commit 1230d45
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 7 deletions.
17 changes: 10 additions & 7 deletions jerry-core/parser/js/js-lexer.c
Original file line number Diff line number Diff line change
Expand Up @@ -3048,6 +3048,16 @@ lexer_expect_object_literal_id (parser_context_t *context_p, /**< context */
return;
}
case LIT_CHAR_ASTERISK:
{
if (ident_opts & (LEXER_OBJ_IDENT_ONLY_IDENTIFIERS | LEXER_OBJ_IDENT_OBJECT_PATTERN))
{
break;
}

context_p->token.type = LEXER_MULTIPLY;
lexer_consume_next_character (context_p);
return;
}
#endif /* ENABLED (JERRY_ES2015) */
case LIT_CHAR_RIGHT_BRACE:
{
Expand All @@ -3057,13 +3067,6 @@ lexer_expect_object_literal_id (parser_context_t *context_p, /**< context */
}

context_p->token.type = LEXER_RIGHT_BRACE;
#if ENABLED (JERRY_ES2015)
if (context_p->source_p[0] == LIT_CHAR_ASTERISK)
{
context_p->token.type = LEXER_MULTIPLY;
}
#endif /* ENABLED (JERRY_ES2015) */

lexer_consume_next_character (context_p);
return;
}
Expand Down
20 changes: 20 additions & 0 deletions tests/jerry/es2015/regresssion-test-issue-3869.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// Copyright JS Foundation and other contributors, http://js.foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

try {
eval('function a ({ *x:x }) {}')
assert(false)
} catch (e) {
assert(e instanceof SyntaxError)
}

0 comments on commit 1230d45

Please sign in to comment.