Add Dispatcher for Promise Builtin (#4307)

JerryScript-DCO-1.0-Signed-off-by: Daniella Barsony bella@inf.u-szeged.hu

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

@@ -31,6 +31,24 @@
 #define ECMA_BUILTINS_INTERNAL
 #include "ecma-builtins-internal.h"
 
+/**
+ * This object has a custom dispatch function.
+ */
+#define BUILTIN_CUSTOM_DISPATCH
+
+/**
+ * List of built-in routine identifiers.
+ */
+enum
+{
+  ECMA_PROMISE_ROUTINE_START = ECMA_BUILTIN_ID__COUNT - 1,
+  ECMA_PROMISE_ROUTINE_REJECT,
+  ECMA_PROMISE_ROUTINE_RESOLVE,
+  ECMA_PROMISE_ROUTINE_RACE,
+  ECMA_PROMISE_ROUTINE_ALL,
+  ECMA_PROMISE_ROUTINE_SPECIES_GET
+};
+
 #define BUILTIN_INC_HEADER_NAME "ecma-builtin-promise.inc.h"
 #define BUILTIN_UNDERSCORED_ID promise
 #include "ecma-builtin-internal-routines-template.inc.h"
@@ -84,38 +102,6 @@ ecma_builtin_promise_reject_abrupt (ecma_value_t value, /**< value */
   return ecma_copy_value (capability_p->header.u.class_prop.u.promise);
 } /* ecma_builtin_promise_reject_abrupt */
 
-/**
- * The Promise.reject routine.
- *
- * See also:
- *         ES2015 25.4.4.4
- *
- * @return ecma value of the new promise.
- *         Returned value must be freed with ecma_free_value.
- */
-static ecma_value_t
-ecma_builtin_promise_reject (ecma_value_t this_arg, /**< 'this' argument */
-                             ecma_value_t reason) /**< the reason for reject */
-{
-  return ecma_promise_reject_or_resolve (this_arg, reason, false);
-} /* ecma_builtin_promise_reject */
-
-/**
- * The Promise.resolve routine.
- *
- * See also:
- *         ES2015 25.4.4.5
- *
- * @return ecma value of the new promise.
- *         Returned value must be freed with ecma_free_value.
- */
-static ecma_value_t
-ecma_builtin_promise_resolve (ecma_value_t this_arg, /**< 'this' argument */
-                              ecma_value_t argument) /**< the argument for resolve */
-{
-  return ecma_promise_reject_or_resolve (this_arg, argument, true);
-} /* ecma_builtin_promise_resolve */
-
 /**
  * Runtime Semantics: PerformPromiseRace.
  *
@@ -435,38 +421,6 @@ ecma_builtin_promise_race_or_all (ecma_value_t this_arg, /**< 'this' argument */
   return ret;
 } /* ecma_builtin_promise_race_or_all */
 
-/**
- * The Promise.race routine.
- *
- * See also:
- *         ES2015 25.4.4.3
- *
- * @return ecma value of the new promise.
- *         Returned value must be freed with ecma_free_value.
- */
-static ecma_value_t
-ecma_builtin_promise_race (ecma_value_t this_arg, /**< 'this' argument */
-                           ecma_value_t array) /**< the items to be resolved */
-{
-  return ecma_builtin_promise_race_or_all (this_arg, array, true);
-} /* ecma_builtin_promise_race */
-
-/**
- * The Promise.all routine.
- *
- * See also:
- *         ES2015 25.4.4.1
- *
- * @return ecma value of the new promise.
- *         Returned value must be freed with ecma_free_value.
- */
-static ecma_value_t
-ecma_builtin_promise_all (ecma_value_t this_arg, /**< 'this' argument */
-                           ecma_value_t array) /**< the items to be resolved */
-{
-  return ecma_builtin_promise_race_or_all (this_arg, array, false);
-} /* ecma_builtin_promise_all */
-
 /**
  * Handle calling [[Call]] of built-in Promise object.
  *
@@ -505,16 +459,45 @@ ecma_builtin_promise_dispatch_construct (const ecma_value_t *arguments_list_p, /
 } /* ecma_builtin_promise_dispatch_construct */
 
 /**
- * 25.4.4.6 get Promise [ @@species ] accessor
+ * Dispatcher of the built-in's routines
  *
- * @return ecma_value
+ * @return ecma value
- *         returned value must be freed with ecma_free_value
+ *         Returned value must be freed with ecma_free_value.
  */
 ecma_value_t
-ecma_builtin_promise_species_get (ecma_value_t this_value) /**< This Value */
+ecma_builtin_promise_dispatch_routine (uint16_t builtin_routine_id, /**< built-in wide routine
+                                                                     *   identifier */
+                                         ecma_value_t this_arg, /**< 'this' argument value */
+                                         const ecma_value_t arguments_list_p[], /**< list of arguments
+                                                                                 *   passed to routine */
+                                         uint32_t arguments_number) /**< length of arguments' list */
 {
-  return ecma_copy_value (this_value);
+  ecma_value_t argument = (arguments_number > 0) ? arguments_list_p[0] : ECMA_VALUE_UNDEFINED;
-} /* ecma_builtin_promise_species_get */
+
+  switch (builtin_routine_id)
+  {
+    case ECMA_PROMISE_ROUTINE_REJECT:
+    case ECMA_PROMISE_ROUTINE_RESOLVE:
+    {
+      bool is_resolve = (builtin_routine_id == ECMA_PROMISE_ROUTINE_RESOLVE);
+      return ecma_promise_reject_or_resolve (this_arg, argument, is_resolve);
+    }
+    case ECMA_PROMISE_ROUTINE_RACE:
+    case ECMA_PROMISE_ROUTINE_ALL:
+    {
+      bool is_race = (builtin_routine_id == ECMA_PROMISE_ROUTINE_RACE);
+      return ecma_builtin_promise_race_or_all (this_arg, argument, is_race);
+    }
+    case ECMA_PROMISE_ROUTINE_SPECIES_GET:
+    {
+      return ecma_copy_value (this_arg);
+    }
+    default:
+    {
+      JERRY_UNREACHABLE ();
+    }
+  }
+} /* ecma_builtin_promise_dispatch_routine */
 
 /**
  * @}

jerry-core/ecma/builtin-objects/ecma-builtin-promise.inc.h

@@ -41,14 +41,14 @@ STRING_VALUE (LIT_MAGIC_STRING_NAME,
 
 /* Routine properties:
  *  (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */
-ROUTINE (LIT_MAGIC_STRING_REJECT, ecma_builtin_promise_reject, 1, 1)
+ROUTINE (LIT_MAGIC_STRING_REJECT, ECMA_PROMISE_ROUTINE_REJECT, 1, 1)
-ROUTINE (LIT_MAGIC_STRING_RESOLVE, ecma_builtin_promise_resolve, 1, 1)
+ROUTINE (LIT_MAGIC_STRING_RESOLVE, ECMA_PROMISE_ROUTINE_RESOLVE, 1, 1)
-ROUTINE (LIT_MAGIC_STRING_RACE, ecma_builtin_promise_race, 1, 1)
+ROUTINE (LIT_MAGIC_STRING_RACE, ECMA_PROMISE_ROUTINE_RACE, 1, 1)
-ROUTINE (LIT_MAGIC_STRING_ALL, ecma_builtin_promise_all, 1, 1)
+ROUTINE (LIT_MAGIC_STRING_ALL, ECMA_PROMISE_ROUTINE_ALL, 1, 1)
 
 /* ES2015 25.4.4.6 */
 ACCESSOR_READ_ONLY (LIT_GLOBAL_SYMBOL_SPECIES,
-                    ecma_builtin_promise_species_get,
+                    ECMA_PROMISE_ROUTINE_SPECIES_GET,
                     ECMA_PROPERTY_FLAG_CONFIGURABLE)
 
 #endif /* ENABLED (JERRY_BUILTIN_PROMISE) */