Implement ES2015 class feature (part II.)

This patch is the second milestone of the implementation of this new language element.

Partly supported:
 - Single inheritance

The following features are going to be implemeted in an other patch:
 - Implicit constructor in class heritage
 - Specific behaviour while extending with the built-in 'Array' object

JerryScript-DCO-1.0-Signed-off-by: Robert Fancsik [email protected]

Author: rerobika

jerry-core/config.h

@@ -37,8 +37,8 @@
  */
 #ifdef CONFIG_DISABLE_ES2015
 # define CONFIG_DISABLE_ES2015_ARROW_FUNCTION
-# define CONFIG_DISABLE_ES2015_CLASS
 # define CONFIG_DISABLE_ES2015_BUILTIN
+# define CONFIG_DISABLE_ES2015_CLASS
 # define CONFIG_DISABLE_ES2015_PROMISE_BUILTIN
 # define CONFIG_DISABLE_ES2015_TEMPLATE_STRINGS
 # define CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN

jerry-core/ecma/base/ecma-globals.h

@@ -88,7 +88,11 @@ typedef enum
 {
   ECMA_PARSE_NO_OPTS = 0, /**< no options passed */
   ECMA_PARSE_STRICT_MODE = (1 << 0), /**< enable strict mode */
-  ECMA_PARSE_DIRECT_EVAL = (1 << 1) /**< is eval called directly (ECMA-262 v5, 15.1.2.1.1) */
+  ECMA_PARSE_DIRECT_EVAL = (1 << 1), /**< is eval called directly (ECMA-262 v5, 15.1.2.1.1) */
+  ECMA_PARSE_EVAL_SUPER = (1 << 2), /**< the current context has super reference */
+  ECMA_PARSE_EVAL_CONSTRUCTOR_SUPER = (1 << 3), /**< the current context is a class constructor */
+  ECMA_PARSE_EVAL_SUPER_ARROW = (1 << 4), /**< the current context is an arrow function */
+  ECMA_PARSE_EVAL_STATIC_SUPER = (1 << 5) /**< the current context is a static class method */
 } ecma_parse_opts_t;
 
 /**
@@ -626,12 +630,27 @@ typedef enum
   ECMA_LEXICAL_ENVIRONMENT_DECLARATIVE = 13, /**< declarative lexical environment */
   ECMA_LEXICAL_ENVIRONMENT_THIS_OBJECT_BOUND = 14, /**< object-bound lexical environment
                                                     *   with provideThis flag */
+  ECMA_LEXICAL_ENVIRONMENT_SUPER_OBJECT_BOUND = 15, /**< object-bound lexical environment
+                                                     *   with provided super reference */
 
   ECMA_LEXICAL_ENVIRONMENT_TYPE_START = ECMA_LEXICAL_ENVIRONMENT_DECLARATIVE, /**< first lexical
                                                                                *    environment type */
-  ECMA_LEXICAL_ENVIRONMENT_TYPE__MAX = ECMA_LEXICAL_ENVIRONMENT_THIS_OBJECT_BOUND /**< maximum value */
+  ECMA_LEXICAL_ENVIRONMENT_TYPE__MAX = ECMA_LEXICAL_ENVIRONMENT_SUPER_OBJECT_BOUND /**< maximum value */
 } ecma_lexical_environment_type_t;
 
+/**
+ * Option flags for super call.
+ */
+typedef enum
+{
+  ECMA_SUPER_CALL_NO_OPTS = 0, /**< no speficied options are provided */
+  ECMA_SUPER_CALL_CONSTRUCTOR = (1 << 0), /**< the current call is a super constructor call */
+  ECMA_SUPER_CALL_INITIALIZED = (1 << 1), /**< 'this' and 'super' are accessible in the current context */
+  ECMA_SUPER_CALL_INSTANTIATED = (1 << 2), /**< set the this_binding value after resolving the
+                                            *   super property referece */
+  ECMA_SUPER_CALL_STATIC_SUPER = (1 << 3), /**< the current function is a static class method */
+} ecma_super_call_opts_t;
+
 /**
  * Ecma object type mask for getting the object type.
  */

jerry-core/ecma/base/ecma-helpers.c

@@ -140,16 +140,15 @@ ecma_create_decl_lex_env (ecma_object_t *outer_lexical_environment_p) /**< outer
  */
 ecma_object_t *
 ecma_create_object_lex_env (ecma_object_t *outer_lexical_environment_p, /**< outer lexical environment */
-                            ecma_object_t *binding_obj_p) /**< binding object */
+                            ecma_object_t *binding_obj_p, /**< binding object */
+                            ecma_lexical_environment_type_t type) /**< type of the new lexical environment */
 {
   JERRY_ASSERT (binding_obj_p != NULL
                 && !ecma_is_lexical_environment (binding_obj_p));
 
   ecma_object_t *new_lexical_environment_p = ecma_alloc_object ();
 
-  uint16_t type = ECMA_OBJECT_FLAG_BUILT_IN_OR_LEXICAL_ENV | ECMA_LEXICAL_ENVIRONMENT_THIS_OBJECT_BOUND;
-
-  new_lexical_environment_p->type_flags_refs = type;
+  new_lexical_environment_p->type_flags_refs = (uint16_t) (ECMA_OBJECT_FLAG_BUILT_IN_OR_LEXICAL_ENV | type);
 
   ecma_init_gc_info (new_lexical_environment_p);
 
@@ -358,7 +357,7 @@ ecma_get_lex_env_binding_object (const ecma_object_t *object_p) /**< object-boun
 {
   JERRY_ASSERT (object_p != NULL);
   JERRY_ASSERT (ecma_is_lexical_environment (object_p));
-  JERRY_ASSERT (ecma_get_lex_env_type (object_p) == ECMA_LEXICAL_ENVIRONMENT_THIS_OBJECT_BOUND);
+  JERRY_ASSERT (ecma_get_lex_env_type (object_p) != ECMA_LEXICAL_ENVIRONMENT_DECLARATIVE);
 
   return ECMA_GET_NON_NULL_POINTER (ecma_object_t,
                                     object_p->property_list_or_bound_object_cp);

jerry-core/ecma/base/ecma-helpers.h

@@ -297,7 +297,9 @@ ecma_collection_iterator_next (ecma_value_t *iterator_p);
 /* ecma-helpers.c */
 ecma_object_t *ecma_create_object (ecma_object_t *prototype_object_p, size_t ext_object_size, ecma_object_type_t type);
 ecma_object_t *ecma_create_decl_lex_env (ecma_object_t *outer_lexical_environment_p);
-ecma_object_t *ecma_create_object_lex_env (ecma_object_t *outer_lexical_environment_p, ecma_object_t *binding_obj_p);
+ecma_object_t *ecma_create_object_lex_env (ecma_object_t *outer_lexical_environment_p,
+                                           ecma_object_t *binding_obj_p,
+                                           ecma_lexical_environment_type_t type);
 bool JERRY_ATTR_PURE ecma_is_lexical_environment (const ecma_object_t *object_p);
 bool JERRY_ATTR_PURE ecma_get_object_extensible (const ecma_object_t *object_p);
 void ecma_set_object_extensible (ecma_object_t *object_p, bool is_extensible);

jerry-core/ecma/builtin-objects/ecma-builtin-global.c

@@ -29,6 +29,9 @@
 #include "vm.h"
 #include "jrt-libc-includes.h"
 #include "jrt-bit-fields.h"
+#ifndef CONFIG_DISABLE_ES2015_CLASS
+#include "jcontext.h"
+#endif /* !CONFIG_DISABLE_ES2015_CLASS */
 
 #define ECMA_BUILTINS_INTERNAL
 #include "ecma-builtins-internal.h"
@@ -72,6 +75,27 @@ ecma_builtin_global_object_eval (ecma_value_t this_arg, /**< this argument */
     parse_opts |= ECMA_PARSE_STRICT_MODE;
   }
 
+#ifndef CONFIG_DISABLE_ES2015_CLASS
+  uint32_t super_call_opts = JERRY_CONTEXT (vm_top_context_p)->super_call_opts;
+
+  if (super_call_opts & ECMA_PARSE_EVAL_CONSTRUCTOR_SUPER)
+  {
+    parse_opts |= ECMA_PARSE_EVAL_CONSTRUCTOR_SUPER;
+  }
+  if (super_call_opts & ECMA_PARSE_EVAL_SUPER)
+  {
+    parse_opts |= ECMA_PARSE_EVAL_SUPER;
+  }
+  if (super_call_opts & ECMA_PARSE_EVAL_SUPER_ARROW)
+  {
+    parse_opts |= ECMA_PARSE_EVAL_SUPER_ARROW;
+  }
+  if (super_call_opts & ECMA_PARSE_EVAL_STATIC_SUPER)
+  {
+    parse_opts |= ECMA_PARSE_EVAL_STATIC_SUPER;
+  }
+#endif /* !CONFIG_DISABLE_ES2015_CLASS */
+
   if (!ecma_is_value_string (x))
   {
     /* step 1 */

jerry-core/ecma/operations/ecma-array-object.h

@@ -43,6 +43,10 @@ ecma_value_t
 ecma_op_create_array_object (const ecma_value_t *arguments_list_p, ecma_length_t arguments_list_len,
                              bool is_treat_single_arg_as_length);
 
+ecma_value_t
+ecma_op_create_array_object_by_constructor (const ecma_value_t *arguments_list_p, ecma_length_t arguments_list_len,
+                                            bool is_treat_single_arg_as_length, ecma_object_t *object_p);
+
 ecma_value_t
 ecma_op_array_object_set_length (ecma_object_t *object_p, ecma_value_t new_value, uint32_t flags);
 

jerry-core/ecma/operations/ecma-function-object.c

@@ -403,19 +403,12 @@ ecma_op_function_has_instance (ecma_object_t *func_obj_p, /**< Function object *
 } /* ecma_op_function_has_instance */
 
 
-#ifndef CONFIG_DISABLE_ES2015_CLASS
-/**
- * Indicates whether the class has been invoked with 'new'.
- */
-#define ECMA_CLASS_CONSTRUCT_FLAG ((uintptr_t) 0x01u)
-#endif /* !CONFIG_DISABLE_ES2015_CLASS */
-
 /**
  * Sets the construct flag in the arguments list pointer.
  *
  * @return arguments list pointer with the construct flag
  */
-static inline const ecma_value_t * JERRY_ATTR_ALWAYS_INLINE
+inline const ecma_value_t * JERRY_ATTR_ALWAYS_INLINE
 ecma_op_function_set_construct_flag (const ecma_value_t *arguments_list_p) /**< original arguments list pointer */
 {
   /* Any ecma value list must be aligned to 4 byte. */
@@ -433,7 +426,7 @@ ecma_op_function_set_construct_flag (const ecma_value_t *arguments_list_p) /**<
  *
  * @return arguments list pointer without the construct flag
  */
-static inline const ecma_value_t * JERRY_ATTR_ALWAYS_INLINE
+inline const ecma_value_t * JERRY_ATTR_ALWAYS_INLINE
 ecma_op_function_clear_construct_flag (const ecma_value_t *arguments_list_p) /**< modified arguments list pointer */
 {
 #ifndef CONFIG_DISABLE_ES2015_CLASS

jerry-core/ecma/operations/ecma-function-object.h

@@ -19,6 +19,13 @@
 #include "ecma-globals.h"
 #include "vm.h"
 
+#ifndef CONFIG_DISABLE_ES2015_CLASS
+/**
+ * Indicates whether the class has been invoked with 'new'.
+ */
+#define ECMA_CLASS_CONSTRUCT_FLAG ((uintptr_t) 0x01u)
+#endif /* !CONFIG_DISABLE_ES2015_CLASS */
+
 /** \addtogroup ecma ECMA
  * @{
  *
@@ -51,6 +58,12 @@ const ecma_compiled_code_t *
 ecma_op_arrow_function_get_compiled_code (ecma_arrow_function_t *arrow_function_p);
 #endif /* !CONFIG_DISABLE_ES2015_ARROW_FUNCTION */
 
+const ecma_value_t *
+ecma_op_function_set_construct_flag (const ecma_value_t *arguments_list_p);
+
+const ecma_value_t *
+ecma_op_function_clear_construct_flag (const ecma_value_t *arguments_list_p);
+
 ecma_value_t
 ecma_op_function_has_instance (ecma_object_t *func_obj_p, ecma_value_t value);
 

jerry-core/ecma/operations/ecma-lex-env.c

@@ -41,7 +41,9 @@ ecma_init_global_lex_env (void)
 {
   ecma_object_t *glob_obj_p = ecma_builtin_get (ECMA_BUILTIN_ID_GLOBAL);
 
-  JERRY_CONTEXT (ecma_global_lex_env_p) = ecma_create_object_lex_env (NULL, glob_obj_p);
+  JERRY_CONTEXT (ecma_global_lex_env_p) = ecma_create_object_lex_env (NULL,
+                                                                      glob_obj_p,
+                                                                      ECMA_LEXICAL_ENVIRONMENT_THIS_OBJECT_BOUND);
 
   ecma_deref_object (glob_obj_p);
 } /* ecma_init_global_lex_env */
@@ -86,15 +88,21 @@ ecma_op_has_binding (ecma_object_t *lex_env_p, /**< lexical environment */
   JERRY_ASSERT (lex_env_p != NULL
                 && ecma_is_lexical_environment (lex_env_p));
 
-  if (ecma_get_lex_env_type (lex_env_p) == ECMA_LEXICAL_ENVIRONMENT_DECLARATIVE)
+  ecma_lexical_environment_type_t lex_env_type = ecma_get_lex_env_type (lex_env_p);
+
+  if (lex_env_type == ECMA_LEXICAL_ENVIRONMENT_DECLARATIVE)
   {
     ecma_property_t *property_p = ecma_find_named_property (lex_env_p, name_p);
 
     return (property_p != NULL);
   }
   else
   {
-    JERRY_ASSERT (ecma_get_lex_env_type (lex_env_p) == ECMA_LEXICAL_ENVIRONMENT_THIS_OBJECT_BOUND);
+#ifndef CONFIG_DISABLE_ES2015_CLASS
+    JERRY_ASSERT (lex_env_type != ECMA_LEXICAL_ENVIRONMENT_DECLARATIVE);
+#else /* CONFIG_DISABLE_ES2015_CLASS */
+    JERRY_ASSERT (lex_env_type == ECMA_LEXICAL_ENVIRONMENT_THIS_OBJECT_BOUND);
+#endif /* !CONFIG_DISABLE_ES2015_CLASS */
 
     ecma_object_t *binding_obj_p = ecma_get_lex_env_binding_object (lex_env_p);
 

jerry-core/ecma/operations/ecma-reference.c

@@ -59,6 +59,30 @@ ecma_op_resolve_reference_base (ecma_object_t *lex_env_p, /**< starting lexical
   return NULL;
 } /* ecma_op_resolve_reference_base */
 
+
+/**
+ * Resolve super reference.
+ *
+ * @return value of the reference
+ */
+ecma_value_t
+ecma_op_resolve_super_reference_value (ecma_object_t *lex_env_p) /**< starting lexical environment */
+{
+  JERRY_ASSERT (lex_env_p != NULL);
+
+  while (lex_env_p != NULL)
+  {
+    if (ecma_get_lex_env_type (lex_env_p) == ECMA_LEXICAL_ENVIRONMENT_SUPER_OBJECT_BOUND)
+    {
+      return ecma_make_object_value (ecma_get_lex_env_binding_object (lex_env_p));
+    }
+
+    lex_env_p = ecma_get_lex_env_outer_reference (lex_env_p);
+  }
+
+  return ECMA_VALUE_UNDEFINED;
+} /* ecma_op_resolve_super_reference_value */
+
 /**
  * Resolve value corresponding to reference.
  *
@@ -69,10 +93,11 @@ ecma_op_resolve_reference_value (ecma_object_t *lex_env_p, /**< starting lexical
                                  ecma_string_t *name_p) /**< identifier's name */
 {
   JERRY_ASSERT (lex_env_p != NULL);
-
   while (lex_env_p != NULL)
   {
-    if (ecma_get_lex_env_type (lex_env_p) == ECMA_LEXICAL_ENVIRONMENT_DECLARATIVE)
+    ecma_lexical_environment_type_t lex_env_type = ecma_get_lex_env_type (lex_env_p);
+
+    if (lex_env_type == ECMA_LEXICAL_ENVIRONMENT_DECLARATIVE)
     {
       ecma_property_t *property_p = ecma_find_named_property (lex_env_p, name_p);
 
@@ -81,9 +106,16 @@ ecma_op_resolve_reference_value (ecma_object_t *lex_env_p, /**< starting lexical
         return ecma_fast_copy_value (ECMA_PROPERTY_VALUE_PTR (property_p)->value);
       }
     }
+#ifndef CONFIG_DISABLE_ES2015_CLASS
+    else if (JERRY_UNLIKELY (lex_env_type == ECMA_LEXICAL_ENVIRONMENT_SUPER_OBJECT_BOUND))
+    {
+      lex_env_p = ecma_get_lex_env_outer_reference (lex_env_p);
+      continue;
+    }
+#endif /* !CONFIG_DISABLE_ES2015_CLASS */
     else
     {
-      JERRY_ASSERT (ecma_get_lex_env_type (lex_env_p) == ECMA_LEXICAL_ENVIRONMENT_THIS_OBJECT_BOUND);
+      JERRY_ASSERT (lex_env_type == ECMA_LEXICAL_ENVIRONMENT_THIS_OBJECT_BOUND);
 
       ecma_object_t *binding_obj_p = ecma_get_lex_env_binding_object (lex_env_p);