Support methods for object initializers. (#2567)

MethodDefinition in ES-2015 12.2.6.

JerryScript-DCO-1.0-Signed-off-by: Zoltan Herczeg zherczeg.u-szeged@partner.samsung.com

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

@@ -636,6 +636,30 @@ parser_parse_class (parser_context_t *context_p, /**< context */
 } /* parser_parse_class */
 #endif /* !CONFIG_DISABLE_ES2015_CLASS */
 
+#ifndef CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER
+/**
+ * Parse object initializer method definition.
+ *
+ * See also: ES2015 14.3
+ */
+static void
+parser_parse_object_method (parser_context_t *context_p) /**< context */
+{
+  parser_flush_cbc (context_p);
+
+  context_p->source_p--;
+  context_p->column--;
+  uint16_t function_literal_index = lexer_construct_function_object (context_p,
+                                                                     PARSER_IS_FUNCTION | PARSER_IS_CLOSURE);
+
+  parser_emit_cbc_literal (context_p,
+                           CBC_PUSH_LITERAL,
+                           function_literal_index);
+
+  lexer_next_token (context_p);
+} /* parser_parse_object_method */
+#endif /* !CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER */
+
 /**
  * Parse object literal.
  */
@@ -654,122 +678,151 @@ parser_parse_object_literal (parser_context_t *context_p) /**< context */
   {
     lexer_expect_object_literal_id (context_p, LEXER_OBJ_IDENT_NO_OPTS);
 
-    if (context_p->token.type == LEXER_RIGHT_BRACE)
+    switch (context_p->token.type)
     {
-      break;
+      case LEXER_RIGHT_BRACE:
-    }
-
-    if (context_p->token.type == LEXER_PROPERTY_GETTER
-        || context_p->token.type == LEXER_PROPERTY_SETTER)
-    {
-      uint32_t status_flags;
-      cbc_ext_opcode_t opcode;
-      uint16_t literal_index, function_literal_index;
-#ifdef CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER
-      parser_object_literal_item_types_t item_type;
-#endif /* CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER */
-
-      if (context_p->token.type == LEXER_PROPERTY_GETTER)
       {
-        status_flags = PARSER_IS_FUNCTION | PARSER_IS_CLOSURE | PARSER_IS_PROPERTY_GETTER;
+        break;
-        opcode = CBC_EXT_SET_GETTER;
-#ifdef CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER
-        item_type = PARSER_OBJECT_PROPERTY_GETTER;
-#endif /* CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER */
       }
-      else
+      case LEXER_PROPERTY_GETTER:
+      case LEXER_PROPERTY_SETTER:
       {
-        status_flags = PARSER_IS_FUNCTION | PARSER_IS_CLOSURE | PARSER_IS_PROPERTY_SETTER;
+        uint32_t status_flags;
-        opcode = CBC_EXT_SET_SETTER;
+        cbc_ext_opcode_t opcode;
+        uint16_t literal_index, function_literal_index;
 #ifdef CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER
-        item_type = PARSER_OBJECT_PROPERTY_SETTER;
+        parser_object_literal_item_types_t item_type;
 #endif /* CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER */
-      }
 
-      lexer_expect_object_literal_id (context_p, LEXER_OBJ_IDENT_ONLY_IDENTIFIERS);
+        if (context_p->token.type == LEXER_PROPERTY_GETTER)
+        {
+          status_flags = PARSER_IS_FUNCTION | PARSER_IS_CLOSURE | PARSER_IS_PROPERTY_GETTER;
+          opcode = CBC_EXT_SET_GETTER;
+#ifdef CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER
+          item_type = PARSER_OBJECT_PROPERTY_GETTER;
+#endif /* CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER */
+        }
+        else
+        {
+          status_flags = PARSER_IS_FUNCTION | PARSER_IS_CLOSURE | PARSER_IS_PROPERTY_SETTER;
+          opcode = CBC_EXT_SET_SETTER;
+#ifdef CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER
+          item_type = PARSER_OBJECT_PROPERTY_SETTER;
+#endif /* CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER */
+        }
 
-      /* This assignment is a nop for computed getters/setters. */
+        lexer_expect_object_literal_id (context_p, LEXER_OBJ_IDENT_ONLY_IDENTIFIERS);
-      literal_index = context_p->lit_object.index;
+
+        /* This assignment is a nop for computed getters/setters. */
+        literal_index = context_p->lit_object.index;
 
 #ifndef CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER
-      if (context_p->token.type == LEXER_RIGHT_SQUARE)
+        if (context_p->token.type == LEXER_RIGHT_SQUARE)
-      {
+        {
-        opcode = ((opcode == CBC_EXT_SET_GETTER) ? CBC_EXT_SET_COMPUTED_GETTER
+          opcode = ((opcode == CBC_EXT_SET_GETTER) ? CBC_EXT_SET_COMPUTED_GETTER
-                                                 : CBC_EXT_SET_COMPUTED_SETTER);
+                                                   : CBC_EXT_SET_COMPUTED_SETTER);
-      }
+        }
 #else /* CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER */
-      parser_append_object_literal_item (context_p, literal_index, item_type);
+        parser_append_object_literal_item (context_p, literal_index, item_type);
 #endif /* !CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER */
 
-      parser_flush_cbc (context_p);
+        parser_flush_cbc (context_p);
-      function_literal_index = lexer_construct_function_object (context_p, status_flags);
+        function_literal_index = lexer_construct_function_object (context_p, status_flags);
 
 #ifndef CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER
-      if (opcode >= CBC_EXT_SET_COMPUTED_GETTER)
+        if (opcode >= CBC_EXT_SET_COMPUTED_GETTER)
-      {
+        {
-        literal_index = function_literal_index;
+          literal_index = function_literal_index;
-      }
+        }
 #endif /* !CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER */
 
-      parser_emit_cbc_literal (context_p,
+        parser_emit_cbc_literal (context_p,
-                               CBC_PUSH_LITERAL,
+                                 CBC_PUSH_LITERAL,
-                               literal_index);
+                                 literal_index);
 
-      JERRY_ASSERT (context_p->last_cbc_opcode == CBC_PUSH_LITERAL);
+        JERRY_ASSERT (context_p->last_cbc_opcode == CBC_PUSH_LITERAL);
-      context_p->last_cbc_opcode = PARSER_TO_EXT_OPCODE (opcode);
+        context_p->last_cbc_opcode = PARSER_TO_EXT_OPCODE (opcode);
-      context_p->last_cbc.value = function_literal_index;
+        context_p->last_cbc.value = function_literal_index;
 
-      lexer_next_token (context_p);
+        lexer_next_token (context_p);
-    }
+        break;
+      }
 #ifndef CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER
-    else if (context_p->token.type == LEXER_RIGHT_SQUARE)
+      case LEXER_RIGHT_SQUARE:
-    {
-      lexer_next_token (context_p);
-      if (context_p->token.type != LEXER_COLON)
       {
-        parser_raise_error (context_p, PARSER_ERR_COLON_EXPECTED);
+        lexer_next_token (context_p);
-      }
 
-      lexer_next_token (context_p);
+        if (context_p->token.type == LEXER_LEFT_PAREN)
-      parser_parse_expression (context_p, PARSE_EXPR_NO_COMMA);
+        {
+          parser_parse_object_method (context_p);
 
-      if (context_p->last_cbc_opcode == CBC_PUSH_LITERAL)
+          JERRY_ASSERT (context_p->last_cbc_opcode == CBC_PUSH_LITERAL);
-      {
+          context_p->last_cbc_opcode = PARSER_TO_EXT_OPCODE (CBC_EXT_SET_COMPUTED_PROPERTY_LITERAL);
-        context_p->last_cbc_opcode = PARSER_TO_EXT_OPCODE (CBC_EXT_SET_COMPUTED_PROPERTY_LITERAL);
+          break;
+        }
+
+        if (context_p->token.type != LEXER_COLON)
+        {
+          parser_raise_error (context_p, PARSER_ERR_COLON_EXPECTED);
+        }
+
+        lexer_next_token (context_p);
+        parser_parse_expression (context_p, PARSE_EXPR_NO_COMMA);
+
+        if (context_p->last_cbc_opcode == CBC_PUSH_LITERAL)
+        {
+          context_p->last_cbc_opcode = PARSER_TO_EXT_OPCODE (CBC_EXT_SET_COMPUTED_PROPERTY_LITERAL);
+        }
+        else
+        {
+          parser_emit_cbc_ext (context_p, CBC_EXT_SET_COMPUTED_PROPERTY);
+        }
+        break;
       }
-      else
-      {
-        parser_emit_cbc_ext (context_p, CBC_EXT_SET_COMPUTED_PROPERTY);
-      }
-    }
 #endif /* !CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER */
-    else
+      default:
-    {
+      {
-      uint16_t literal_index = context_p->lit_object.index;
+        uint16_t literal_index = context_p->lit_object.index;
 
 #ifdef CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER
-      parser_append_object_literal_item (context_p,
+        parser_append_object_literal_item (context_p,
-                                         literal_index,
+                                           literal_index,
-                                         PARSER_OBJECT_PROPERTY_VALUE);
+                                           PARSER_OBJECT_PROPERTY_VALUE);
 #endif /* CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER */
 
-      lexer_next_token (context_p);
+        lexer_next_token (context_p);
-      if (context_p->token.type != LEXER_COLON)
-      {
-        parser_raise_error (context_p, PARSER_ERR_COLON_EXPECTED);
-      }
 
-      lexer_next_token (context_p);
+#ifndef CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER
-      parser_parse_expression (context_p, PARSE_EXPR_NO_COMMA);
+        if (context_p->token.type == LEXER_LEFT_PAREN)
+        {
+          parser_parse_object_method (context_p);
 
-      if (context_p->last_cbc_opcode == CBC_PUSH_LITERAL)
+          JERRY_ASSERT (context_p->last_cbc_opcode == CBC_PUSH_LITERAL);
-      {
+          context_p->last_cbc_opcode = CBC_SET_LITERAL_PROPERTY;
-        context_p->last_cbc_opcode = CBC_SET_LITERAL_PROPERTY;
+          context_p->last_cbc.value = literal_index;
-        context_p->last_cbc.value = literal_index;
+          break;
-      }
+        }
-      else
+#endif /* !CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER */
-      {
+
-        parser_emit_cbc_literal (context_p, CBC_SET_PROPERTY, literal_index);
+        if (context_p->token.type != LEXER_COLON)
+        {
+          parser_raise_error (context_p, PARSER_ERR_COLON_EXPECTED);
+        }
+
+        lexer_next_token (context_p);
+        parser_parse_expression (context_p, PARSE_EXPR_NO_COMMA);
+
+        if (context_p->last_cbc_opcode == CBC_PUSH_LITERAL)
+        {
+          context_p->last_cbc_opcode = CBC_SET_LITERAL_PROPERTY;
+          context_p->last_cbc.value = literal_index;
+        }
+        else
+        {
+          parser_emit_cbc_literal (context_p, CBC_SET_PROPERTY, literal_index);
+        }
+
+        break;
       }
     }
 

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

@@ -403,6 +403,13 @@ parser_scan_primary_expression_end (parser_context_t *context_p, /**< context */
 
     JERRY_ASSERT (stack_top == SCAN_STACK_OBJECT_LITERAL);
 
+    if (context_p->token.type == LEXER_LEFT_PAREN)
+    {
+      parser_stack_push_uint8 (context_p, SCAN_STACK_BLOCK_PROPERTY);
+      *mode = SCAN_MODE_FUNCTION_ARGUMENTS;
+      return true;
+    }
+
     if (context_p->token.type != LEXER_COLON)
     {
       parser_raise_error (context_p, PARSER_ERR_COLON_EXPECTED);
@@ -916,6 +923,16 @@ parser_scan_until (parser_context_t *context_p, /**< context */
         }
 
         lexer_next_token (context_p);
+
+#ifndef CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER
+        if (context_p->token.type == LEXER_LEFT_PAREN)
+        {
+          parser_stack_push_uint8 (context_p, SCAN_STACK_BLOCK_PROPERTY);
+          mode = SCAN_MODE_FUNCTION_ARGUMENTS;
+          continue;
+        }
+#endif /* !CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER */
+
         if (context_p->token.type != LEXER_COLON)
         {
           parser_raise_error (context_p, PARSER_ERR_COLON_EXPECTED);

tests/jerry/es2015/object-initializer.js

@@ -0,0 +1,29 @@
+// 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.
+
+switch (1) {
+default:
+  var o = {
+    value: 10,
+    func() {
+      return 234 + this.value;
+    },
+    ["a" + "b"]() {
+      return 456 - this.value;
+    }
+  }
+}
+
+assert(o.func() === 244);
+assert(o.ab() === 446);