YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Promise Guard with ESNEXT (#4725)

Browse Source 
JerryScript-DCO-1.0-Signed-off-by: Bela Toth tbela@inf.u-szeged.hu
This commit is contained in:
Tóth Béla
2021-08-02 17:35:32 +02:00
committed by GitHub
parent 951044c036
commit f71a4a6975
29 changed files with 139 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/ecma/builtin-objects/ecma-builtin-aggregateerror-prototype.c
+2 -2
View File
@@ -24,7 +24,7 @@
#include "ecma-string-object.h"
#include "jrt.h"
#if JERRY_BUILTIN_PROMISE
#if JERRY_ESNEXT
#define ECMA_BUILTINS_INTERNAL
#include "ecma-builtins-internal.h"
@@ -33,4 +33,4 @@
#define BUILTIN_UNDERSCORED_ID aggregate_error_prototype
#include "ecma-builtin-internal-routines-template.inc.h"
#endif /* JERRY_BUILTIN_PROMISE */
#endif /* JERRY_ESNEXT */
jerry-core/ecma/builtin-objects/ecma-builtin-aggregateerror-prototype.inc.h
+2 -2
View File
@@ -19,7 +19,7 @@
#include "ecma-builtin-helpers-macro-defines.inc.h"
#if JERRY_BUILTIN_PROMISE
#if JERRY_ESNEXT
/* Object properties:
* (property name, object pointer getter) */
@@ -39,6 +39,6 @@ STRING_VALUE (LIT_MAGIC_STRING_MESSAGE,
LIT_MAGIC_STRING__EMPTY,
ECMA_PROPERTY_CONFIGURABLE_WRITABLE)
#endif /* JERRY_BUILTIN_PROMISE */
#endif /* JERRY_ESNEXT */
#include "ecma-builtin-helpers-macro-undefs.inc.h"
jerry-core/ecma/builtin-objects/ecma-builtin-aggregateerror.c
+2 -2
View File
@@ -28,7 +28,7 @@
#include "jrt.h"
#include "jcontext.h"
#if JERRY_BUILTIN_PROMISE
#if JERRY_ESNEXT
#define ECMA_BUILTINS_INTERNAL
#include "ecma-builtins-internal.h"
@@ -109,4 +109,4 @@ ecma_builtin_aggregate_error_dispatch_construct (const ecma_value_t *arguments_l
* @}
*/
#endif /* JERRY_BUILTIN_PROMISE */
#endif /* JERRY_ESNEXT */
jerry-core/ecma/builtin-objects/ecma-builtin-aggregateerror.inc.h
+2 -2
View File
@@ -19,7 +19,7 @@
#include "ecma-builtin-helpers-macro-defines.inc.h"
#if JERRY_BUILTIN_PROMISE
#if JERRY_ESNEXT
/* Number properties:
* (property name, number value, writable, enumerable, configurable) */
@@ -40,6 +40,6 @@ STRING_VALUE (LIT_MAGIC_STRING_NAME,
LIT_MAGIC_STRING_AGGREGATE_ERROR_UL,
ECMA_PROPERTY_FLAG_CONFIGURABLE)
#endif /* JERRY_BUILTIN_PROMISE */
#endif /* JERRY_ESNEXT */
#include "ecma-builtin-helpers-macro-undefs.inc.h"
jerry-core/ecma/builtin-objects/ecma-builtin-global.inc.h
+8 -12
View File
@@ -127,12 +127,6 @@ OBJECT_VALUE (LIT_MAGIC_STRING_TYPE_ERROR_UL,
ECMA_BUILTIN_ID_TYPE_ERROR,
ECMA_PROPERTY_CONFIGURABLE_WRITABLE)
#if JERRY_BUILTIN_PROMISE
OBJECT_VALUE (LIT_MAGIC_STRING_AGGREGATE_ERROR_UL,
ECMA_BUILTIN_ID_AGGREGATE_ERROR,
ECMA_PROPERTY_CONFIGURABLE_WRITABLE)
#endif /* JERRY_BUILTIN_PROMISE */
/* ECMA-262 v5, 15.1.4.15 */
OBJECT_VALUE (LIT_MAGIC_STRING_URI_ERROR_UL,
ECMA_BUILTIN_ID_URI_ERROR,
@@ -218,12 +212,6 @@ OBJECT_VALUE (LIT_MAGIC_STRING_UINT8_CLAMPED_ARRAY_UL,
#endif /* JERRY_BUILTIN_TYPEDARRAY */
#if JERRY_BUILTIN_PROMISE
OBJECT_VALUE (LIT_MAGIC_STRING_PROMISE_UL,
ECMA_BUILTIN_ID_PROMISE,
ECMA_PROPERTY_CONFIGURABLE_WRITABLE)
#endif /* JERRY_BUILTIN_PROMISE */
#if JERRY_BUILTIN_CONTAINER
/* ECMA-262 v6, 23.1.1.1 */
OBJECT_VALUE (LIT_MAGIC_STRING_WEAKSET_UL,
@@ -253,6 +241,14 @@ OBJECT_VALUE (LIT_MAGIC_STRING_WEAKREF_UL,
#endif /* JERRY_BUILTIN_WEAKREF */
#if JERRY_ESNEXT
OBJECT_VALUE (LIT_MAGIC_STRING_AGGREGATE_ERROR_UL,
ECMA_BUILTIN_ID_AGGREGATE_ERROR,
ECMA_PROPERTY_CONFIGURABLE_WRITABLE)
OBJECT_VALUE (LIT_MAGIC_STRING_PROMISE_UL,
ECMA_BUILTIN_ID_PROMISE,
ECMA_PROPERTY_CONFIGURABLE_WRITABLE)
/* ECMA-262 v6, 19.4.1.1 */
OBJECT_VALUE (LIT_MAGIC_STRING_SYMBOL_UL,
ECMA_BUILTIN_ID_SYMBOL,
jerry-core/ecma/builtin-objects/ecma-builtin-promise-prototype.c
+2 -2
View File
@@ -16,7 +16,7 @@
#include "ecma-globals.h"
#include "ecma-promise-object.h"
#if JERRY_BUILTIN_PROMISE
#if JERRY_ESNEXT
#define ECMA_BUILTINS_INTERNAL
#include "ecma-builtins-internal.h"
@@ -95,4 +95,4 @@ ecma_builtin_promise_prototype_dispatch_routine (uint8_t builtin_routine_id, /**
* @}
*/
#endif /* JERRY_BUILTIN_PROMISE */
#endif /* JERRY_ESNEXT */
jerry-core/ecma/builtin-objects/ecma-builtin-promise-prototype.inc.h
+2 -2
View File
@@ -15,7 +15,7 @@
#include "ecma-builtin-helpers-macro-defines.inc.h"
#if JERRY_BUILTIN_PROMISE
#if JERRY_ESNEXT
/* Object properties:
* (property name, object pointer getter) */
@@ -33,6 +33,6 @@ ROUTINE (LIT_MAGIC_STRING_THEN, ECMA_PROMISE_PROTOTYPE_ROUTINE_THEN, 2, 2)
ROUTINE (LIT_MAGIC_STRING_CATCH, ECMA_PROMISE_PROTOTYPE_ROUTINE_CATCH, 1, 1)
ROUTINE (LIT_MAGIC_STRING_FINALLY, ECMA_PROMISE_PROTOTYPE_ROUTINE_FINALLY, 1, 1)
#endif /* JERRY_BUILTIN_PROMISE */
#endif /* JERRY_ESNEXT */
#include "ecma-builtin-helpers-macro-undefs.inc.h"
jerry-core/ecma/builtin-objects/ecma-builtin-promise.c
+2 -2
View File
@@ -26,7 +26,7 @@
#include "ecma-promise-object.h"
#include "jcontext.h"
#if JERRY_BUILTIN_PROMISE
#if JERRY_ESNEXT
#define ECMA_BUILTINS_INTERNAL
#include "ecma-builtins-internal.h"
@@ -563,4 +563,4 @@ ecma_builtin_promise_dispatch_routine (uint8_t builtin_routine_id, /**< built-in
* @}
*/
#endif /* JERRY_BUILTIN_PROMISE */
#endif /* JERRY_ESNEXT */
jerry-core/ecma/builtin-objects/ecma-builtin-promise.inc.h
+2 -2
View File
@@ -19,7 +19,7 @@
#include "ecma-builtin-helpers-macro-defines.inc.h"
#if JERRY_BUILTIN_PROMISE
#if JERRY_ESNEXT
/* Number properties:
* (property name, number value, writable, enumerable, configurable) */
@@ -53,6 +53,6 @@ ACCESSOR_READ_ONLY (LIT_GLOBAL_SYMBOL_SPECIES,
ECMA_PROMISE_ROUTINE_SPECIES_GET,
ECMA_PROPERTY_FLAG_CONFIGURABLE)
#endif /* JERRY_BUILTIN_PROMISE */
#endif /* JERRY_ESNEXT */
#include "ecma-builtin-helpers-macro-undefs.inc.h"
jerry-core/ecma/builtin-objects/ecma-builtins.inc.h
+4 -4
View File
@@ -283,7 +283,7 @@ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_TYPE_ERROR,
true,
type_error)
#if JERRY_BUILTIN_PROMISE
#if JERRY_ESNEXT
/* The AggregateError.prototype object (15.11.6.5) */
BUILTIN (ECMA_BUILTIN_ID_AGGREGATE_ERROR_PROTOTYPE,
ECMA_OBJECT_TYPE_GENERAL,
@@ -297,7 +297,7 @@ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_AGGREGATE_ERROR,
ECMA_BUILTIN_NATIVE_ERROR_PROTOTYPE_ID,
true,
aggregate_error)
#endif /* JERRY_BUILTIN_PROMISE */
#endif /* JERRY_ESNEXT */
/* The URIError.prototype object (15.11.6.6) */
BUILTIN (ECMA_BUILTIN_ID_URI_ERROR_PROTOTYPE,
@@ -507,7 +507,7 @@ BUILTIN (ECMA_BUILTIN_ID_BIGUINT64ARRAY_PROTOTYPE,
#endif /* JERRY_BUILTIN_BIGINT */
#endif /* JERRY_BUILTIN_TYPEDARRAY */
#if JERRY_BUILTIN_PROMISE
#if JERRY_ESNEXT
BUILTIN (ECMA_BUILTIN_ID_PROMISE_PROTOTYPE,
ECMA_OBJECT_TYPE_GENERAL,
@@ -521,7 +521,7 @@ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_PROMISE,
true,
promise)
#endif /* JERRY_BUILTIN_PROMISE */
#endif /* JERRY_ESNEXT */
#if JERRY_BUILTIN_CONTAINER