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

Merge Map and Set Guards with Container (#4709)

Browse Source 
Remove JERRY_BUILTIN_MAP/SET/WEAKMAP/WEAKSET
and replace them with JERRY_BUILTIN_CONTAINER.

JerryScript-DCO-1.0-Signed-off-by: Bela Toth tbela@inf.u-szeged.hu
This commit is contained in:
Tóth Béla
2021-07-12 11:20:38 +02:00
committed by GitHub
parent 7f6a699700
commit 305741a608
33 changed files with 106 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/lit/lit-magic-strings.inc.h
+14 -41
View File
@@ -48,13 +48,11 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_OF, "of")
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_LN2_U, "LN2")
#endif
#if JERRY_BUILTIN_CONTAINER \
|| JERRY_BUILTIN_MAP \
|| JERRY_ESNEXT
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_MAP_UL, "Map")
#endif
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_NAN, "NaN")
#if JERRY_BUILTIN_CONTAINER \
|| JERRY_BUILTIN_SET \
|| JERRY_ESNEXT
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_UL, "Set")
#endif
@@ -64,9 +62,7 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_UTC_U, "UTC")
#if JERRY_BUILTIN_MATH
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ABS, "abs")
#endif
#if JERRY_BUILTIN_CONTAINER && JERRY_ESNEXT \
|| JERRY_BUILTIN_SET \
|| JERRY_BUILTIN_WEAKSET
#if JERRY_BUILTIN_CONTAINER
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ADD, "add")
#endif
#if JERRY_BUILTIN_PROMISE
@@ -81,12 +77,9 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_EXP, "exp")
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FOR, "for")
#endif
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET, "get")
#if JERRY_BUILTIN_MAP \
#if JERRY_BUILTIN_CONTAINER \
|| JERRY_BUILTIN_PROXY \
|| JERRY_BUILTIN_REFLECT \
|| JERRY_BUILTIN_SET \
|| JERRY_BUILTIN_WEAKMAP \
|| JERRY_BUILTIN_WEAKSET
|| JERRY_BUILTIN_REFLECT
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_HAS, "has")
#endif
#if JERRY_BUILTIN_MATH
@@ -176,8 +169,7 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_KEYS, "keys")
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_LOG2, "log2")
#endif
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_NAME, "name")
#if JERRY_BUILTIN_MAP \
|| JERRY_BUILTIN_SET \
#if JERRY_BUILTIN_CONTAINER \
|| JERRY_ESNEXT
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_NEXT, "next")
#endif
@@ -193,8 +185,7 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SEAL, "seal")
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SIGN, "sign")
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SINH, "sinh")
#endif
#if JERRY_BUILTIN_MAP \
|| JERRY_BUILTIN_SET
#if JERRY_BUILTIN_CONTAINER
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SIZE, "size")
#endif
#if JERRY_BUILTIN_ARRAY \
@@ -245,8 +236,7 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ATANH, "atanh")
#if JERRY_BUILTIN_PROMISE
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CATCH, "catch")
#endif
#if JERRY_BUILTIN_MAP \
|| JERRY_BUILTIN_SET
#if JERRY_BUILTIN_CONTAINER
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CLEAR, "clear")
#endif
#if JERRY_BUILTIN_MATH && JERRY_ESNEXT
@@ -360,10 +350,7 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CHAR_AT_UL, "charAt")
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CONCAT, "concat")
#endif
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CREATE, "create")
#if JERRY_BUILTIN_MAP \
|| JERRY_BUILTIN_SET \
|| JERRY_BUILTIN_WEAKMAP \
|| JERRY_BUILTIN_WEAKSET
#if JERRY_BUILTIN_CONTAINER
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_DELETE, "delete")
#endif
#if JERRY_BUILTIN_REGEXP && JERRY_ESNEXT
@@ -452,8 +439,7 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SYMBOL, "symbol")
|| JERRY_BUILTIN_JSON
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TO_JSON_UL, "toJSON")
#endif
#if JERRY_BUILTIN_MAP \
|| JERRY_BUILTIN_SET \
#if JERRY_BUILTIN_CONTAINER \
|| JERRY_BUILTIN_TYPEDARRAY \
|| JERRY_ESNEXT
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_VALUES, "values")
@@ -474,15 +460,13 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SQRT1_2_U, "SQRT1_2")
#if JERRY_ESNEXT
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SYMBOL_DOT_UL, "Symbol.")
#endif
#if JERRY_BUILTIN_CONTAINER \
|| JERRY_BUILTIN_WEAKMAP
#if JERRY_BUILTIN_CONTAINER
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_WEAKMAP_UL, "WeakMap")
#endif
#if JERRY_BUILTIN_WEAKREF
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_WEAKREF_UL, "WeakRef")
#endif
#if JERRY_BUILTIN_CONTAINER \
|| JERRY_BUILTIN_WEAKSET
#if JERRY_BUILTIN_CONTAINER
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_WEAKSET_UL, "WeakSet")
#endif
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_BOOLEAN, "boolean")
@@ -493,8 +477,7 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_COMPILE, "compile")
|| JERRY_MODULE_SYSTEM
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_DEFAULT, "default")
#endif
#if JERRY_BUILTIN_MAP \
|| JERRY_BUILTIN_SET \
#if JERRY_BUILTIN_CONTAINER \
|| JERRY_BUILTIN_TYPEDARRAY \
|| JERRY_ESNEXT
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ENTRIES, "entries")
@@ -506,8 +489,7 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FINALLY, "finally")
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FLATMAP, "flatMap")
#endif
#if JERRY_BUILTIN_ARRAY \
|| JERRY_BUILTIN_MAP \
|| JERRY_BUILTIN_SET \
|| JERRY_BUILTIN_CONTAINER \
|| JERRY_BUILTIN_TYPEDARRAY
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FOR_EACH_UL, "forEach")
#endif
@@ -874,12 +856,9 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FLOAT64_ARRAY_UL, "Float64Array")
|| JERRY_ESNEXT
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_INVALID_DATE_UL, "Invalid Date")
#endif
#if JERRY_BUILTIN_MAP \
#if JERRY_BUILTIN_CONTAINER \
|| JERRY_ESNEXT
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_MAP_ITERATOR_UL, "Map Iterator")
#endif
#if JERRY_BUILTIN_SET \
|| JERRY_ESNEXT
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_ITERATOR_UL, "Set Iterator")
#endif
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CONFIGURABLE, "configurable")
@@ -1046,7 +1025,6 @@ LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (1, LIT_MAGIC_STRING_OF)
#elif JERRY_BUILTIN_MATH
LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (1, LIT_MAGIC_STRING_LN2_U)
#elif JERRY_BUILTIN_CONTAINER \
|| JERRY_BUILTIN_MAP \
|| JERRY_ESNEXT
LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (1, LIT_MAGIC_STRING_MAP_UL)
#else
@@ -1062,7 +1040,6 @@ LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (2, LIT_MAGIC_STRING_OF)
#elif JERRY_BUILTIN_MATH
LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (2, LIT_MAGIC_STRING_LN2_U)
#elif JERRY_BUILTIN_CONTAINER \
|| JERRY_BUILTIN_MAP \
|| JERRY_ESNEXT
LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (2, LIT_MAGIC_STRING_MAP_UL)
#else
@@ -1071,7 +1048,6 @@ LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (2, LIT_MAGIC_STRING_NAN)
#if JERRY_BUILTIN_MATH
LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (3, LIT_MAGIC_STRING_LN2_U)
#elif JERRY_BUILTIN_CONTAINER \
|| JERRY_BUILTIN_MAP \
|| JERRY_ESNEXT
LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (3, LIT_MAGIC_STRING_MAP_UL)
#else
@@ -1135,12 +1111,9 @@ LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (12, LIT_MAGIC_STRING_FLOAT64_ARRAY_UL)
#elif JERRY_BUILTIN_DATE \
|| JERRY_ESNEXT
LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (12, LIT_MAGIC_STRING_INVALID_DATE_UL)
#elif JERRY_BUILTIN_MAP \
#elif JERRY_BUILTIN_CONTAINER \
|| JERRY_ESNEXT
LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (12, LIT_MAGIC_STRING_MAP_ITERATOR_UL)
#elif JERRY_BUILTIN_SET \
|| JERRY_ESNEXT
LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (12, LIT_MAGIC_STRING_SET_ITERATOR_UL)
#else
LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (12, LIT_MAGIC_STRING_CONFIGURABLE)
#endif