[WIP] Support for shorthand object literal notation. #2432
+293
−36
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -260,7 +260,6 @@ parser_parse_array_literal (parser_context_t *context_p) /**< context */ | |
| } | ||
| } /* parser_parse_array_literal */ | ||
|
|
||
|
There was a problem hiding this comment. @zherczeg I noticed that everything in this macro were needed for my code so I removed the ifdefs here. I'm guessing this change in your computed properties PR was to save binary size? |
||
| /** | ||
| * Object literal item types. | ||
| */ | ||
|
|
@@ -357,7 +356,6 @@ parser_append_object_literal_item (parser_context_t *context_p, /**< context */ | |
| context_p->stack_top_uint8 = PARSER_OBJECT_PROPERTY_BOTH_ACCESSORS; | ||
| } | ||
| } /* parser_append_object_literal_item */ | ||
|
|
||
| #ifndef CONFIG_DISABLE_ES2015_CLASS | ||
|
|
||
|
|
@@ -649,41 +647,58 @@ parser_parse_object_literal (parser_context_t *context_p) /**< context */ | |
|
|
||
| while (true) | ||
| { | ||
| #ifndef CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER | ||
| lexer_expect_object_literal_id (context_p, LEXER_OBJ_IDENT_OBJ_METHOD); | ||
| #else /* CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER */ | ||
| lexer_expect_object_literal_id (context_p, LEXER_OBJ_IDENT_NO_OPTS); | ||
| #endif /* !CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER */ | ||
|
|
||
| if (context_p->token.type == LEXER_RIGHT_BRACE) | ||
| { | ||
| break; | ||
| } | ||
|
|
||
| bool token_type_is_method = (context_p->token.type == LEXER_PROPERTY_GETTER | ||
| || context_p->token.type == LEXER_PROPERTY_SETTER); | ||
|
|
||
| #ifndef CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER | ||
| token_type_is_method = token_type_is_method || context_p->token.type == LEXER_PROPERTY_METHOD; | ||
| #endif /* !CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER */ | ||
|
|
||
| if (token_type_is_method) | ||
| { | ||
| uint32_t status_flags; | ||
| uint16_t opcode; | ||
| uint16_t literal_index, function_literal_index; | ||
| parser_object_literal_item_types_t item_type; | ||
| lexer_token_type_t token_type = context_p->token.type; | ||
|
|
||
| if (token_type == LEXER_PROPERTY_GETTER) | ||
| { | ||
| status_flags = PARSER_IS_FUNCTION | PARSER_IS_CLOSURE | PARSER_IS_PROPERTY_GETTER; | ||
| opcode = PARSER_TO_EXT_OPCODE (CBC_EXT_SET_GETTER); | ||
| item_type = PARSER_OBJECT_PROPERTY_GETTER; | ||
| } | ||
| #ifndef CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER | ||
| else if (token_type == LEXER_PROPERTY_METHOD) | ||
| { | ||
| status_flags = PARSER_IS_FUNCTION | PARSER_IS_CLOSURE | PARSER_IS_FUNC_EXPRESSION; | ||
| opcode = CBC_SET_LITERAL_PROPERTY; | ||
| item_type = PARSER_OBJECT_PROPERTY_VALUE; | ||
| } | ||
| #endif /* !CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER */ | ||
| else /* token_type == LEXER_PROPERTY_SETTER */ | ||
| { | ||
| status_flags = PARSER_IS_FUNCTION | PARSER_IS_CLOSURE | PARSER_IS_PROPERTY_SETTER; | ||
| opcode = PARSER_TO_EXT_OPCODE (CBC_EXT_SET_SETTER); | ||
| item_type = PARSER_OBJECT_PROPERTY_SETTER; | ||
| } | ||
|
|
||
| #ifndef CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER | ||
| lexer_expect_object_literal_id (context_p, LEXER_OBJ_IDENT_ONLY_IDENTIFIERS | LEXER_OBJ_IDENT_OBJ_METHOD); | ||
| #else /* CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER */ | ||
| lexer_expect_object_literal_id (context_p, LEXER_OBJ_IDENT_ONLY_IDENTIFIERS); | ||
| #endif /* !CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER */ | ||
|
|
||
| /* This assignment is a nop for computed getters/setters. */ | ||
| literal_index = context_p->lit_object.index; | ||
|
|
@@ -694,6 +709,11 @@ parser_parse_object_literal (parser_context_t *context_p) /**< context */ | |
| opcode = ((opcode == CBC_EXT_SET_GETTER) ? CBC_EXT_SET_COMPUTED_GETTER | ||
| : CBC_EXT_SET_COMPUTED_SETTER); | ||
| } | ||
|
|
||
| if (opcode == CBC_SET_LITERAL_PROPERTY) | ||
| { | ||
| parser_append_object_literal_item (context_p, literal_index, item_type); | ||
| } | ||
| #else /* CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER */ | ||
| parser_append_object_literal_item (context_p, literal_index, item_type); | ||
| #endif /* !CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER */ | ||
|
|
@@ -706,14 +726,21 @@ parser_parse_object_literal (parser_context_t *context_p) /**< context */ | |
| { | ||
| literal_index = function_literal_index; | ||
| } | ||
| /* Property methods aren't extended opcodes, so swap the values here. */ | ||
| else if (opcode == CBC_SET_LITERAL_PROPERTY) | ||
| { | ||
| literal_index ^= function_literal_index; | ||
| function_literal_index ^= literal_index; | ||
| literal_index ^= function_literal_index; | ||
| } | ||
| #endif /* !CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER */ | ||
|
|
||
| parser_emit_cbc_literal (context_p, | ||
| CBC_PUSH_LITERAL, | ||
| literal_index); | ||
|
|
||
| JERRY_ASSERT (context_p->last_cbc_opcode == CBC_PUSH_LITERAL); | ||
| context_p->last_cbc_opcode = opcode; | ||
| context_p->last_cbc.value = function_literal_index; | ||
|
|
||
| lexer_next_token (context_p); | ||
|
|
@@ -751,13 +778,35 @@ parser_parse_object_literal (parser_context_t *context_p) /**< context */ | |
| #endif /* CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER */ | ||
|
|
||
| lexer_next_token (context_p); | ||
|
|
||
| if (context_p->token.type == LEXER_COLON) | ||
| { | ||
| lexer_next_token (context_p); | ||
| parser_parse_expression (context_p, PARSE_EXPR_NO_COMMA); | ||
| } | ||
| #ifndef CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER | ||
| else if (context_p->token.type == LEXER_COMMA | ||
| || context_p->token.type == LEXER_RIGHT_BRACE) | ||
| { | ||
| // TODO somehow clean this up -- is it possible to parse and check for keywords by this step? | ||
| lexer_lit_location_t prop_name_literal = context_p->token.lit_location; | ||
|
|
||
| if (prop_name_literal.type != LEXER_IDENT_LITERAL || lexer_is_identifier_keyword (context_p)) | ||
| { | ||
| parser_raise_error (context_p, PARSER_ERR_COLON_EXPECTED); | ||
| } | ||
|
|
||
| lexer_construct_literal_object (context_p, | ||
| &context_p->token.lit_location, | ||
| context_p->token.lit_location.type); | ||
| parser_emit_cbc_literal_from_token (context_p, CBC_PUSH_LITERAL); | ||
| JERRY_ASSERT (context_p->last_cbc_opcode == CBC_PUSH_LITERAL); | ||
| } | ||
| #endif /* !CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER */ | ||
| else | ||
| { | ||
| parser_raise_error (context_p, PARSER_ERR_COLON_EXPECTED); | ||
| } | ||
|
|
||
| if (context_p->last_cbc_opcode == CBC_PUSH_LITERAL) | ||
| { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is a similar code for this. It would be good to not duplicate that.
You need to be smart here, invent a way which can be effectively optimized by tail merging or just "reparse" the string or whatever.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My updated patch doesn't yet address this; still thinking on it.