YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve lexer_expect_object_literal_id option handling (#2436)

Browse Source 
This patch allows to add further options flags to `lexer_expect_object_literal_id` to handle unique behaviors more easily
also substitutes `PARSER_IS_CLASS` flag hence it is removed.

JerryScript-DCO-1.0-Signed-off-by: Robert Fancsik frobert@inf.u-szeged.hu
This commit is contained in:
Robert Fancsik
2018-07-30 15:12:35 +02:00
committed by László Langó
parent 8482fef41a
commit a6ace5efdf
4 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/parser/js/js-lexer.c
+5 -5
View File
@@ -2264,13 +2264,13 @@ lexer_expect_identifier (parser_context_t *context_p, /**< context */
*/ */
void void
lexer_expect_object_literal_id (parser_context_t *context_p, /**< context */ lexer_expect_object_literal_id (parser_context_t *context_p, /**< context */
bool must_be_identifier) /**< only identifiers are accepted */ uint32_t ident_opts) /**< lexer_obj_ident_opts_t option bits */
{ {
lexer_skip_spaces (context_p); lexer_skip_spaces (context_p);
#ifndef CONFIG_DISABLE_ES2015_CLASS #ifndef CONFIG_DISABLE_ES2015_CLASS
int is_class_method = ((context_p->status_flags & PARSER_IS_CLASS) int is_class_method = ((ident_opts & LEXER_OBJ_IDENT_CLASS_METHOD)
&& !must_be_identifier && !(ident_opts & LEXER_OBJ_IDENT_ONLY_IDENTIFIERS)
&& (context_p->token.type != LEXER_KEYW_STATIC)); && (context_p->token.type != LEXER_KEYW_STATIC));
#endif /* !CONFIG_DISABLE_ES2015_CLASS */ #endif /* !CONFIG_DISABLE_ES2015_CLASS */
@@ -2285,7 +2285,7 @@ lexer_expect_object_literal_id (parser_context_t *context_p, /**< context */
{ {
lexer_parse_identifier (context_p, false); lexer_parse_identifier (context_p, false);
if (!must_be_identifier if (!(ident_opts & LEXER_OBJ_IDENT_ONLY_IDENTIFIERS)
&& context_p->token.lit_location.length == 3) && context_p->token.lit_location.length == 3)
{ {
lexer_skip_spaces (context_p); lexer_skip_spaces (context_p);
@@ -2323,7 +2323,7 @@ lexer_expect_object_literal_id (parser_context_t *context_p, /**< context */
lexer_parse_string (context_p); lexer_parse_string (context_p);
create_literal_object = true; create_literal_object = true;
} }
else if (!must_be_identifier && context_p->source_p[0] == LIT_CHAR_RIGHT_BRACE) else if (!(ident_opts & LEXER_OBJ_IDENT_ONLY_IDENTIFIERS) && context_p->source_p[0] == LIT_CHAR_RIGHT_BRACE)
{ {
context_p->token.type = LEXER_RIGHT_BRACE; context_p->token.type = LEXER_RIGHT_BRACE;
context_p->source_p += 1; context_p->source_p += 1;
jerry-core/parser/js/js-lexer.h
+11
View File
@@ -208,6 +208,17 @@ typedef enum
LEXER_NO_SKIP_SPACES = (1u << 1) /**< ignore skip spaces */ LEXER_NO_SKIP_SPACES = (1u << 1) /**< ignore skip spaces */
} lexer_newline_flags_t; } lexer_newline_flags_t;
/**
* Lexer object identifier parse options.
*/
typedef enum
{
LEXER_OBJ_IDENT_NO_OPTS = (1u << 0), /**< no options */
LEXER_OBJ_IDENT_ONLY_IDENTIFIERS = (1u << 1), /**< only identifiers are accepted */
LEXER_OBJ_IDENT_CLASS_METHOD = (1u << 2), /**< expect identifier inside a class body */
} lexer_obj_ident_opts_t;
/** /**
* Lexer literal object types. * Lexer literal object types.
*/ */
jerry-core/parser/js/js-parser-expr.c
+5 -7
View File
@@ -379,7 +379,7 @@ parser_parse_class_literal (parser_context_t *context_p, /**< context */
lexer_skip_empty_statements (context_p); lexer_skip_empty_statements (context_p);
} }
lexer_expect_object_literal_id (context_p, false); lexer_expect_object_literal_id (context_p, LEXER_OBJ_IDENT_CLASS_METHOD);
if (context_p->token.type == LEXER_RIGHT_BRACE) if (context_p->token.type == LEXER_RIGHT_BRACE)
{ {
@@ -403,7 +403,7 @@ parser_parse_class_literal (parser_context_t *context_p, /**< context */
opcode = is_static ? CBC_EXT_SET_STATIC_SETTER : CBC_EXT_SET_SETTER; opcode = is_static ? CBC_EXT_SET_STATIC_SETTER : CBC_EXT_SET_SETTER;
} }
lexer_expect_object_literal_id (context_p, true); lexer_expect_object_literal_id (context_p, LEXER_OBJ_IDENT_CLASS_METHOD | LEXER_OBJ_IDENT_ONLY_IDENTIFIERS);
literal_index = context_p->lit_object.index; literal_index = context_p->lit_object.index;
if (!is_static && lexer_compare_raw_identifier_to_current (context_p, "constructor", 11)) if (!is_static && lexer_compare_raw_identifier_to_current (context_p, "constructor", 11))
@@ -556,7 +556,7 @@ parser_parse_class (parser_context_t *context_p, /**< context */
bool is_strict = context_p->status_flags & PARSER_IS_STRICT; bool is_strict = context_p->status_flags & PARSER_IS_STRICT;
/* 14.5. A ClassBody is always strict code. */ /* 14.5. A ClassBody is always strict code. */
context_p->status_flags |= PARSER_IS_STRICT | PARSER_IS_CLASS; context_p->status_flags |= PARSER_IS_STRICT;
/* ClassDeclaration is parsed. Continue with class body. */ /* ClassDeclaration is parsed. Continue with class body. */
parser_parse_class_literal (context_p, constructor_literal_p); parser_parse_class_literal (context_p, constructor_literal_p);
@@ -586,8 +586,6 @@ parser_parse_class (parser_context_t *context_p, /**< context */
parser_flush_cbc (context_p); parser_flush_cbc (context_p);
context_p->status_flags &= (uint32_t) ~PARSER_IS_CLASS;
if (!is_strict) if (!is_strict)
{ {
/* Restore flag */ /* Restore flag */
@@ -612,7 +610,7 @@ parser_parse_object_literal (parser_context_t *context_p) /**< context */
while (true) while (true)
{ {
lexer_expect_object_literal_id (context_p, false); lexer_expect_object_literal_id (context_p, LEXER_OBJ_IDENT_NO_OPTS);
if (context_p->token.type == LEXER_RIGHT_BRACE) if (context_p->token.type == LEXER_RIGHT_BRACE)
{ {
@@ -640,7 +638,7 @@ parser_parse_object_literal (parser_context_t *context_p) /**< context */
item_type = PARSER_OBJECT_PROPERTY_SETTER; item_type = PARSER_OBJECT_PROPERTY_SETTER;
} }
lexer_expect_object_literal_id (context_p, true); lexer_expect_object_literal_id (context_p, LEXER_OBJ_IDENT_ONLY_IDENTIFIERS);
literal_index = context_p->lit_object.index; literal_index = context_p->lit_object.index;
parser_append_object_literal_item (context_p, literal_index, item_type); parser_append_object_literal_item (context_p, literal_index, item_type);
jerry-core/parser/js/js-parser-internal.h
+2 -3
View File
@@ -68,8 +68,7 @@ typedef enum
PARSER_ARROW_PARSE_ARGS = (1u << 19), /**< parse the argument list of an arrow function */ PARSER_ARROW_PARSE_ARGS = (1u << 19), /**< parse the argument list of an arrow function */
#endif /* !CONFIG_DISABLE_ES2015_ARROW_FUNCTION */ #endif /* !CONFIG_DISABLE_ES2015_ARROW_FUNCTION */
#ifndef CONFIG_DISABLE_ES2015_CLASS #ifndef CONFIG_DISABLE_ES2015_CLASS
PARSER_IS_CLASS = (1u << 20), /**< statements parsed inside class body */ PARSER_CLASS_CONSTRUCTOR = (1u << 20), /**< a class constructor is parsed */
PARSER_CLASS_CONSTRUCTOR = (1u << 21), /**< a class constructor is parsed */
#endif /* !CONFIG_DISABLE_ES2015_CLASS */ #endif /* !CONFIG_DISABLE_ES2015_CLASS */
} parser_general_flags_t; } parser_general_flags_t;
@@ -447,7 +446,7 @@ void lexer_parse_string (parser_context_t *context_p);
void lexer_expect_identifier (parser_context_t *context_p, uint8_t literal_type); void lexer_expect_identifier (parser_context_t *context_p, uint8_t literal_type);
void lexer_scan_identifier (parser_context_t *context_p, bool propety_name); void lexer_scan_identifier (parser_context_t *context_p, bool propety_name);
ecma_char_t lexer_hex_to_character (parser_context_t *context_p, const uint8_t *source_p, int length); ecma_char_t lexer_hex_to_character (parser_context_t *context_p, const uint8_t *source_p, int length);
void lexer_expect_object_literal_id (parser_context_t *context_p, bool must_be_identifier); void lexer_expect_object_literal_id (parser_context_t *context_p, uint32_t ident_opts);
void lexer_construct_literal_object (parser_context_t *context_p, lexer_lit_location_t *literal_p, void lexer_construct_literal_object (parser_context_t *context_p, lexer_lit_location_t *literal_p,
uint8_t literal_type); uint8_t literal_type);
bool lexer_construct_number_object (parser_context_t *context_p, bool is_expr, bool is_negative_number); bool lexer_construct_number_object (parser_context_t *context_p, bool is_expr, bool is_negative_number);