Merge Promise Guard with ESNEXT

JerryScript-DCO-1.0-Signed-off-by: Bela Toth [email protected]

Author: Bela Toth

docs/02.API-REFERENCE.md

@@ -2681,7 +2681,7 @@ jerry_value_is_object (const jerry_value_t value)
 Returns whether the given `jerry_value_t` is a promise value.
 
 *Notes*:
-- This API depends on a build option (`JERRY_BUILTIN_PROMISE`) and can be checked
+- This API depends on a build option (`JERRY_ESNEXT`) and can be checked
   in runtime with the `JERRY_FEATURE_PROMISE` feature enum value,
   see: [jerry_is_feature_enabled](#jerry_is_feature_enabled).
 - The es.next profile enables this by default.
@@ -5391,7 +5391,7 @@ The function returns the result of a Promise object.
 *Notes*:
 - Returned value must be freed with [jerry_release_value](#jerry_release_value) when it
   is no longer needed.
-- This API depends on a build option (`JERRY_BUILTIN_PROMISE`) and can be checked
+- This API depends on a build option (`JERRY_ESNEXT`) and can be checked
   in runtime with the `JERRY_FEATURE_PROMISE` feature enum value,
   see: [jerry_is_feature_enabled](#jerry_is_feature_enabled).
 - The es.next profile enables this by default.
@@ -5458,7 +5458,7 @@ example (void)
 *Notes*:
 - Returned value must be freed with [jerry_release_value](#jerry_release_value) when it
   is no longer needed.
-- This API depends on a build option (`JERRY_BUILTIN_PROMISE`) and can be checked
+- This API depends on a build option (`JERRY_ESNEXT`) and can be checked
   in runtime with the `JERRY_FEATURE_PROMISE` feature enum value,
   see: [jerry_is_feature_enabled](#jerry_is_feature_enabled).
 - The es.next profile enables this by default.
@@ -5708,7 +5708,7 @@ Resolve or reject the promise with an argument.
 *Note*:
 - Returned value must be freed with [jerry_release_value](#jerry_release_value) when it
   is no longer needed.
-- This API depends on a build option (`JERRY_BUILTIN_PROMISE`) and can be checked
+- This API depends on a build option (`JERRY_ESNEXT`) and can be checked
   in runtime with the `JERRY_FEATURE_PROMISE` feature enum value,
   see: [jerry_is_feature_enabled](#jerry_is_feature_enabled).
 - The es.next profile enables this by default.

jerry-core/api/jerry.c

@@ -66,12 +66,12 @@ JERRY_STATIC_ASSERT ((int) RE_FLAG_GLOBAL == (int) JERRY_REGEXP_FLAG_GLOBAL
                      re_flags_t_must_be_equal_to_jerry_regexp_flags_t);
 #endif /* JERRY_BUILTIN_REGEXP */
 
-#if JERRY_BUILTIN_PROMISE
+#if JERRY_ESNEXT
 /* The internal ECMA_PROMISE_STATE_* values are "one byte away" from the API values */
 JERRY_STATIC_ASSERT ((int) ECMA_PROMISE_IS_PENDING == (int) JERRY_PROMISE_STATE_PENDING
                      && (int) ECMA_PROMISE_IS_FULFILLED == (int) JERRY_PROMISE_STATE_FULFILLED,
                      promise_internal_state_matches_external);
-#endif /* JERRY_BUILTIN_PROMISE */
+#endif /* JERRY_ESNEXT */
 
 /**
  * Offset between internal and external arithmetic operator types
@@ -210,9 +210,9 @@ jerry_cleanup (void)
     }
   }
 
-#if JERRY_BUILTIN_PROMISE
+#if JERRY_ESNEXT
   ecma_free_all_enqueued_jobs ();
-#endif /* JERRY_BUILTIN_PROMISE */
+#endif /* JERRY_ESNEXT */
   ecma_finalize ();
   jerry_make_api_unavailable ();
 
@@ -1115,11 +1115,11 @@ jerry_run_all_enqueued_jobs (void)
 {
   jerry_assert_api_available ();
 
-#if JERRY_BUILTIN_PROMISE
+#if JERRY_ESNEXT
   return ecma_process_all_enqueued_jobs ();
-#else /* !JERRY_BUILTIN_PROMISE */
+#else /* !JERRY_ESNEXT */
   return ECMA_VALUE_UNDEFINED;
-#endif /* JERRY_BUILTIN_PROMISE */
+#endif /* JERRY_ESNEXT */
 } /* jerry_run_all_enqueued_jobs */
 
 /**
@@ -1346,13 +1346,13 @@ bool
 jerry_value_is_promise (const jerry_value_t value) /**< api value */
 {
   jerry_assert_api_available ();
-#if JERRY_BUILTIN_PROMISE
+#if JERRY_ESNEXT
   return (ecma_is_value_object (value)
           && ecma_is_promise (ecma_get_object_from_value (value)));
-#else /* !JERRY_BUILTIN_PROMISE */
+#else /* !JERRY_ESNEXT */
   JERRY_UNUSED (value);
   return false;
-#endif /* JERRY_BUILTIN_PROMISE */
+#endif /* JERRY_ESNEXT */
 } /* jerry_value_is_promise */
 
 /**
@@ -1534,10 +1534,10 @@ static const uint8_t jerry_class_object_type[] =
 #if JERRY_MODULE_SYSTEM
   JERRY_OBJECT_TYPE_MODULE, /**< type of ECMA_OBJECT_CLASS_MODULE */
 #endif
-#if JERRY_BUILTIN_PROMISE
+#if JERRY_ESNEXT
   JERRY_OBJECT_TYPE_PROMISE, /**< type of ECMA_OBJECT_CLASS_PROMISE */
   JERRY_OBJECT_TYPE_GENERIC, /**< type of ECMA_OBJECT_CLASS_PROMISE_CAPABILITY */
-#endif /* JERRY_BUILTIN_PROMISE */
+#endif /* JERRY_ESNEXT */
 #if JERRY_BUILTIN_DATAVIEW
   JERRY_OBJECT_TYPE_DATAVIEW, /**< type of ECMA_OBJECT_CLASS_DATAVIEW */
 #endif /* JERRY_BUILTIN_DATAVIEW */
@@ -1795,10 +1795,8 @@ jerry_is_feature_enabled (const jerry_feature_t feature) /**< feature to check *
 #if JERRY_BUILTIN_JSON
           || feature == JERRY_FEATURE_JSON
 #endif /* JERRY_BUILTIN_JSON */
-#if JERRY_BUILTIN_PROMISE
-          || feature == JERRY_FEATURE_PROMISE
-#endif /* JERRY_BUILTIN_PROMISE */
 #if JERRY_ESNEXT
+          || feature == JERRY_FEATURE_PROMISE
           || feature == JERRY_FEATURE_SYMBOL
 #endif /* JERRY_ESNEXT */
 #if JERRY_BUILTIN_TYPEDARRAY
@@ -2552,13 +2550,13 @@ jerry_create_promise (void)
 {
   jerry_assert_api_available ();
 
-#if JERRY_BUILTIN_PROMISE
+#if JERRY_ESNEXT
   ecma_value_t promise_value = ecma_op_create_promise_object (ECMA_VALUE_EMPTY, ECMA_VALUE_UNDEFINED, NULL);
 
   return promise_value;
-#else /* !JERRY_BUILTIN_PROMISE */
+#else /* !JERRY_ESNEXT */
   return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_promise_not_supported_p)));
-#endif /* JERRY_BUILTIN_PROMISE */
+#endif /* JERRY_ESNEXT */
 } /* jerry_create_promise */
 
 /**
@@ -4754,7 +4752,7 @@ jerry_resolve_or_reject_promise (jerry_value_t promise, /**< the promise value *
 {
   jerry_assert_api_available ();
 
-#if JERRY_BUILTIN_PROMISE
+#if JERRY_ESNEXT
   if (!ecma_is_value_object (promise) || !ecma_is_promise (ecma_get_object_from_value (promise)))
   {
     return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_wrong_args_msg_p)));
@@ -4771,13 +4769,13 @@ jerry_resolve_or_reject_promise (jerry_value_t promise, /**< the promise value *
   }
 
   return ecma_reject_promise_with_checks (promise, argument);
-#else /* !JERRY_BUILTIN_PROMISE */
+#else /* !JERRY_ESNEXT */
   JERRY_UNUSED (promise);
   JERRY_UNUSED (argument);
   JERRY_UNUSED (is_resolve);
 
   return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_promise_not_supported_p)));
-#endif /* JERRY_BUILTIN_PROMISE */
+#endif /* JERRY_ESNEXT */
 } /* jerry_resolve_or_reject_promise */
 
 /**
@@ -4791,17 +4789,17 @@ jerry_get_promise_result (const jerry_value_t promise) /**< promise object to ge
 {
   jerry_assert_api_available ();
 
-#if JERRY_BUILTIN_PROMISE
+#if JERRY_ESNEXT
   if (!jerry_value_is_promise (promise))
   {
     return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_wrong_args_msg_p)));
   }
 
   return ecma_promise_get_result (ecma_get_object_from_value (promise));
-#else /* !JERRY_BUILTIN_PROMISE */
+#else /* !JERRY_ESNEXT */
   JERRY_UNUSED (promise);
   return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_promise_not_supported_p)));
-#endif /* JERRY_BUILTIN_PROMISE */
+#endif /* JERRY_ESNEXT */
 } /* jerry_get_promise_result */
 
 /**
@@ -4816,7 +4814,7 @@ jerry_get_promise_state (const jerry_value_t promise) /**< promise object to get
 {
   jerry_assert_api_available ();
 
-#if JERRY_BUILTIN_PROMISE
+#if JERRY_ESNEXT
   if (!jerry_value_is_promise (promise))
   {
     return JERRY_PROMISE_STATE_NONE;
@@ -4826,10 +4824,10 @@ jerry_get_promise_state (const jerry_value_t promise) /**< promise object to get
   flags &= (ECMA_PROMISE_IS_PENDING | ECMA_PROMISE_IS_FULFILLED);
 
   return (flags ? flags : JERRY_PROMISE_STATE_REJECTED);
-#else /* !JERRY_BUILTIN_PROMISE */
+#else /* !JERRY_ESNEXT */
   JERRY_UNUSED (promise);
   return JERRY_PROMISE_STATE_NONE;
-#endif /* JERRY_BUILTIN_PROMISE */
+#endif /* JERRY_ESNEXT */
 } /* jerry_get_promise_state */
 
 /**
@@ -4844,7 +4842,7 @@ void jerry_promise_set_callback (jerry_promise_event_filter_t filters, /**< comb
 {
   jerry_assert_api_available ();
 
-#if JERRY_BUILTIN_PROMISE && JERRY_PROMISE_CALLBACK
+#if JERRY_ESNEXT && JERRY_PROMISE_CALLBACK
   if (filters == JERRY_PROMISE_EVENT_FILTER_DISABLE || callback == NULL)
   {
     JERRY_CONTEXT (promise_callback_filters) = JERRY_PROMISE_EVENT_FILTER_DISABLE;
@@ -4854,11 +4852,11 @@ void jerry_promise_set_callback (jerry_promise_event_filter_t filters, /**< comb
   JERRY_CONTEXT (promise_callback_filters) = (uint32_t) filters;
   JERRY_CONTEXT (promise_callback) = callback;
   JERRY_CONTEXT (promise_callback_user_p) = user_p;
-#else /* !JERRY_BUILTIN_PROMISE && !JERRY_PROMISE_CALLBACK */
+#else /* !JERRY_ESNEXT && !JERRY_PROMISE_CALLBACK */
   JERRY_UNUSED (filters);
   JERRY_UNUSED (callback);
   JERRY_UNUSED (user_p);
-#endif /* JERRY_BUILTIN_PROMISE && JERRY_PROMISE_CALLBACK */
+#endif /* JERRY_ESNEXT && JERRY_PROMISE_CALLBACK */
 } /* jerry_promise_set_callback */
 
 /**

jerry-core/config.h

@@ -95,10 +95,6 @@
 # define JERRY_BUILTIN_GLOBAL_THIS JERRY_ESNEXT
 #endif /* !defined (JERRY_BUILTIN_GLOBAL_THIS) */
 
-#ifndef JERRY_BUILTIN_PROMISE
-# define JERRY_BUILTIN_PROMISE JERRY_ESNEXT
-#endif /* !defined (JERRY_BUILTIN_PROMISE) */
-
 #ifndef JERRY_BUILTIN_PROXY
 # define JERRY_BUILTIN_PROXY JERRY_ESNEXT
 #endif /* !defined (JERRY_BUILTIN_PROXY) */
@@ -552,12 +548,8 @@
 || ((JERRY_BUILTIN_WEAKREF != 0) && (JERRY_BUILTIN_WEAKREF != 1))
 # error "Invalid value for JERRY_BUILTIN_WEAKREF macro."
 #endif
-#if !defined (JERRY_BUILTIN_PROMISE) \
-|| ((JERRY_BUILTIN_PROMISE != 0) && (JERRY_BUILTIN_PROMISE != 1))
-# error "Invalid value for JERRY_BUILTIN_PROMISE macro."
-#endif
 #if !defined (JERRY_BUILTIN_PROXY) \
-|| ((JERRY_BUILTIN_PROXY != 0) && (JERRY_BUILTIN_PROXY != 1))
+|| ((JERRY_ESNEXT != 0) && (JERRY_BUILTIN_PROXY != 1))
 # error "Invalid value for JERRY_BUILTIN_PROXY macro."
 #endif
 #if !defined (JERRY_BUILTIN_TYPEDARRAY) \
@@ -575,10 +567,8 @@
 #if (JERRY_ESNEXT == 0) \
 && ((JERRY_BUILTIN_DATAVIEW == 1) \
 || (JERRY_BUILTIN_CONTAINER == 1) \
-|| (JERRY_BUILTIN_PROMISE == 1) \
 || (JERRY_BUILTIN_PROXY == 1) \
 || (JERRY_BUILTIN_REFLECT == 1) \
-|| (JERRY_BUILTIN_PROMISE == 1) \
 || (JERRY_BUILTIN_TYPEDARRAY == 1) \
 || (JERRY_BUILTIN_WEAKREF == 1))
 # error "JERRY_ESNEXT should be enabled too to enable JERRY_BUILTIN_xxxxx macro."
@@ -705,9 +695,9 @@
 /**
  * Promise support must be enabled if Promise callback support is enabled.
  */
-#if JERRY_PROMISE_CALLBACK && !JERRY_BUILTIN_PROMISE
-#  error "Promise callback support depends on Promise support"
-#endif /* JERRY_PROMISE_CALLBACK && !JERRY_BUILTIN_PROMISE */
+#if JERRY_PROMISE_CALLBACK && !JERRY_ESNEXT
+#  error "Promise callback support depends on ESNext support"
+#endif /* JERRY_PROMISE_CALLBACK && !JERRY_ESNEXT */
 
 /**
  * Resource name related types into a single guard

jerry-core/debugger/debugger.c

@@ -1457,13 +1457,13 @@ jerry_debugger_exception_object_to_string (ecma_value_t exception_obj_value) /**
       string_id = LIT_MAGIC_STRING_TYPE_ERROR_UL;
       break;
     }
-  #if JERRY_BUILTIN_PROMISE
+  #if JERRY_ESNEXT
     case ECMA_BUILTIN_ID_AGGREGATE_ERROR_PROTOTYPE:
     {
       string_id = LIT_MAGIC_STRING_AGGREGATE_ERROR_UL;
       break;
     }
-  #endif /* JERRY_BUILTIN_PROMISE */
+  #endif /* JERRY_ESNEXT */
     case ECMA_BUILTIN_ID_URI_ERROR_PROTOTYPE:
     {
       string_id = LIT_MAGIC_STRING_URI_ERROR_UL;

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

@@ -46,14 +46,11 @@ const char * const ecma_error_json_not_supported_p = "JSON support is disabled";
  * Error message, if Symbol support is disabled
  */
 const char * const ecma_error_symbol_not_supported_p = "Symbol support is disabled";
-#endif /* !JERRY_ESNEXT  */
-
-#if !JERRY_BUILTIN_PROMISE
 /**
  * Error message, if Promise support is disabled
  */
 const char * const ecma_error_promise_not_supported_p = "Promise support is disabled";
-#endif /* !JERRY_BUILTIN_PROMISE  */
+#endif /* !JERRY_ESNEXT  */
 
 #if !JERRY_BUILTIN_TYPEDARRAY
 /**

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

@@ -33,11 +33,9 @@ extern const char * const ecma_error_json_not_supported_p;
 
 #if !JERRY_ESNEXT
 extern const char * const ecma_error_symbol_not_supported_p;
-#endif /* !JERRY_ESNEXT */
 
-#if !JERRY_BUILTIN_PROMISE
 extern const char * const ecma_error_promise_not_supported_p;
-#endif /* !JERRY_BUILTIN_PROMISE */
+#endif /* !JERRY_ESNEXT */
 
 #if !JERRY_BUILTIN_TYPEDARRAY
 extern const char * const ecma_error_typed_array_not_supported_p;