Skip to content

Commit 367f83c

Browse files
lygstatelygstate
committed
gen-strings.py update
JerryScript-DCO-1.0-Signed-off-by: Yonggang Luo luoyonggang@gmail.com
1 parent 53700f9 commit 367f83c

File tree

5 files changed

+45
-87
lines changed

5 files changed

+45
-87
lines changed

‎jerry-core/ecma/base/ecma-error-messages.inc.h‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ ECMA_ERROR_DEF (ECMA_ERR_INVALID_ESCAPE, "Invalid escape")
2222
#endif /* JERRY_BUILTIN_REGEXP */
2323
#if JERRY_BUILTIN_ATOMICS || JERRY_BUILTIN_TYPEDARRAY
2424
ECMA_ERROR_DEF (ECMA_ERR_INVALID_LENGTH, "Invalid length")
25-
#endif /* JERRY_BUILTIN_ATOMICS \
26-
|| JERRY_BUILTIN_TYPEDARRAY */
25+
#endif /* JERRY_BUILTIN_ATOMICS || JERRY_BUILTIN_TYPEDARRAY */
2726
#if JERRY_BUILTIN_TYPEDARRAY
2827
ECMA_ERROR_DEF (ECMA_ERR_INVALID_OFFSET, "Invalid offset")
2928
#endif /* JERRY_BUILTIN_TYPEDARRAY */
@@ -268,8 +267,7 @@ ECMA_ERROR_DEF (ECMA_ERR_PASSED_ARGUMENT_IS_NOT_A_REALM, "Passed argument is not
268267
ECMA_ERROR_DEF (ECMA_ERR_PRIVATE_METHOD_IS_NOT_WRITABLE, "Private method is not writable")
269268
#if JERRY_BUILTIN_BIGINT || JERRY_BUILTIN_NUMBER
270269
ECMA_ERROR_DEF (ECMA_ERR_RADIX_IS_OUT_OF_RANGE, "Radix must be between 2 and 36")
271-
#endif /* JERRY_BUILTIN_BIGINT \
272-
|| JERRY_BUILTIN_NUMBER */
270+
#endif /* JERRY_BUILTIN_BIGINT || JERRY_BUILTIN_NUMBER */
273271
#if !(JERRY_SNAPSHOT_EXEC)
274272
ECMA_ERROR_DEF (ECMA_ERR_SNAPSHOT_EXEC_DISABLED, "Snapshot execution is disabled")
275273
#endif /* !(JERRY_SNAPSHOT_EXEC) */
@@ -335,9 +333,7 @@ ECMA_ERROR_DEF (ECMA_ERR_ARGUMENT_NOT_SHARED_ARRAY_BUFFER, "Argument is not Shar
335333
#endif /* JERRY_BUILTIN_ATOMICS */
336334
#if JERRY_BUILTIN_ARRAY || JERRY_BUILTIN_CONTAINER || JERRY_BUILTIN_TYPEDARRAY
337335
ECMA_ERROR_DEF (ECMA_ERR_CALLBACK_IS_NOT_CALLABLE, "Callback function is not callable")
338-
#endif /* JERRY_BUILTIN_ARRAY \
339-
|| JERRY_BUILTIN_CONTAINER \
340-
|| JERRY_BUILTIN_TYPEDARRAY */
336+
#endif /* JERRY_BUILTIN_ARRAY || JERRY_BUILTIN_CONTAINER || JERRY_BUILTIN_TYPEDARRAY */
341337
#if JERRY_BUILTIN_TYPEDARRAY
342338
ECMA_ERROR_DEF (ECMA_ERR_INITIAL_VALUE_CANNOT_BE_UNDEFINED, "Initial value cannot be undefined")
343339
#endif /* JERRY_BUILTIN_TYPEDARRAY */
@@ -375,8 +371,7 @@ ECMA_ERROR_DEF (ECMA_ERR_THE_GIVEN_ARGUMENT_IS_NOT_A_SYMBOL, "The given argument
375371
ECMA_ERROR_DEF (ECMA_ERR_PARAMETER_REJECT_MUST_BE_CALLABLE, "'reject' parameter must be callable")
376372
#if JERRY_BUILTIN_ATOMICS || JERRY_BUILTIN_TYPEDARRAY
377373
ECMA_ERROR_DEF (ECMA_ERR_ARGUMENT_THIS_NOT_TYPED_ARRAY, "Argument 'this' is not a TypedArray")
378-
#endif /* JERRY_BUILTIN_ATOMICS \
379-
|| JERRY_BUILTIN_TYPEDARRAY */
374+
#endif /* JERRY_BUILTIN_ATOMICS || JERRY_BUILTIN_TYPEDARRAY */
380375
#if JERRY_SNAPSHOT_SAVE
381376
ECMA_ERROR_DEF (ECMA_ERR_CANNOT_ALLOCATE_MEMORY_LITERALS, "Cannot allocate memory for literals")
382377
#endif /* JERRY_SNAPSHOT_SAVE */

‎jerry-core/lit/lit-magic-strings.inc.h‎

Lines changed: 30 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ASTERIX_CHAR, "*")
2323
#endif /* JERRY_MODULE_SYSTEM */
2424
#if JERRY_BUILTIN_ARRAY || JERRY_BUILTIN_TYPEDARRAY
2525
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_COMMA_CHAR, ",")
26-
#endif /* JERRY_BUILTIN_ARRAY \
27-
|| JERRY_BUILTIN_TYPEDARRAY */
26+
#endif /* JERRY_BUILTIN_ARRAY || JERRY_BUILTIN_TYPEDARRAY */
2827
#if JERRY_BUILTIN_MATH
2928
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_E_U, "E")
3029
#endif /* JERRY_BUILTIN_MATH */
@@ -37,8 +36,7 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_AT, "at")
3736
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_IS, "is")
3837
#if JERRY_BUILTIN_ARRAY || JERRY_BUILTIN_TYPEDARRAY
3938
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_OF, "of")
40-
#endif /* JERRY_BUILTIN_ARRAY \
41-
|| JERRY_BUILTIN_TYPEDARRAY */
39+
#endif /* JERRY_BUILTIN_ARRAY || JERRY_BUILTIN_TYPEDARRAY */
4240
#if JERRY_BUILTIN_ATOMICS
4341
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ATOMICS_OR, "or")
4442
#endif /* JERRY_BUILTIN_ATOMICS */
@@ -56,8 +54,7 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ABS, "abs")
5654
#endif /* JERRY_BUILTIN_MATH */
5755
#if JERRY_BUILTIN_ATOMICS || JERRY_BUILTIN_CONTAINER
5856
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ADD, "add")
59-
#endif /* JERRY_BUILTIN_ATOMICS \
60-
|| JERRY_BUILTIN_CONTAINER */
57+
#endif /* JERRY_BUILTIN_ATOMICS || JERRY_BUILTIN_CONTAINER */
6158
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ALL, "all")
6259
#if JERRY_BUILTIN_ATOMICS
6360
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ATOMICS_AND, "and")
@@ -71,16 +68,13 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FOR, "for")
7168
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET, "get")
7269
#if JERRY_BUILTIN_CONTAINER || JERRY_BUILTIN_PROXY || JERRY_BUILTIN_REFLECT
7370
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_HAS, "has")
74-
#endif /* JERRY_BUILTIN_CONTAINER \
75-
|| JERRY_BUILTIN_PROXY \
76-
|| JERRY_BUILTIN_REFLECT */
71+
#endif /* JERRY_BUILTIN_CONTAINER || JERRY_BUILTIN_PROXY || JERRY_BUILTIN_REFLECT */
7772
#if JERRY_BUILTIN_MATH
7873
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_LOG, "log")
7974
#endif /* JERRY_BUILTIN_MATH */
8075
#if JERRY_BUILTIN_ARRAY || JERRY_BUILTIN_TYPEDARRAY
8176
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_MAP, "map")
82-
#endif /* JERRY_BUILTIN_ARRAY \
83-
|| JERRY_BUILTIN_TYPEDARRAY */
77+
#endif /* JERRY_BUILTIN_ARRAY || JERRY_BUILTIN_TYPEDARRAY */
8478
#if JERRY_BUILTIN_MATH
8579
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_MAX, "max")
8680
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_MIN, "min")
@@ -142,8 +136,7 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FIND, "find")
142136
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FLAT, "flat")
143137
#if JERRY_BUILTIN_ARRAY || JERRY_BUILTIN_TYPEDARRAY
144138
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FROM, "from")
145-
#endif /* JERRY_BUILTIN_ARRAY \
146-
|| JERRY_BUILTIN_TYPEDARRAY */
139+
#endif /* JERRY_BUILTIN_ARRAY || JERRY_BUILTIN_TYPEDARRAY */
147140
#if JERRY_BUILTIN_MATH
148141
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_IMUL, "imul")
149142
#endif /* JERRY_BUILTIN_MATH */
@@ -173,8 +166,7 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SIZE, "size")
173166
#if JERRY_BUILTIN_ARRAY || JERRY_BUILTIN_TYPEDARRAY
174167
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SOME, "some")
175168
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SORT, "sort")
176-
#endif /* JERRY_BUILTIN_ARRAY \
177-
|| JERRY_BUILTIN_TYPEDARRAY */
169+
#endif /* JERRY_BUILTIN_ARRAY || JERRY_BUILTIN_TYPEDARRAY */
178170
#if JERRY_BUILTIN_MATH
179171
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SQRT, "sqrt")
180172
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TANH, "tanh")
@@ -220,8 +212,7 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_DEREF, "deref")
220212
#endif /* JERRY_BUILTIN_WEAKREF */
221213
#if JERRY_BUILTIN_ARRAY || JERRY_BUILTIN_TYPEDARRAY
222214
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_EVERY, "every")
223-
#endif /* JERRY_BUILTIN_ARRAY \
224-
|| JERRY_BUILTIN_TYPEDARRAY */
215+
#endif /* JERRY_BUILTIN_ARRAY || JERRY_BUILTIN_TYPEDARRAY */
225216
#if JERRY_BUILTIN_MATH
226217
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_EXPM1, "expm1")
227218
#endif /* JERRY_BUILTIN_MATH */
@@ -245,8 +236,7 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_LOG1P, "log1p")
245236
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_MATCH, "match")
246237
#if JERRY_BUILTIN_DATE || JERRY_BUILTIN_JSON
247238
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_PARSE, "parse")
248-
#endif /* JERRY_BUILTIN_DATE \
249-
|| JERRY_BUILTIN_JSON */
239+
#endif /* JERRY_BUILTIN_DATE || JERRY_BUILTIN_JSON */
250240
#if JERRY_BUILTIN_PROXY
251241
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_PROXY, "proxy")
252242
#endif /* JERRY_BUILTIN_PROXY */
@@ -258,10 +248,8 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SHIFT, "shift")
258248
#endif /* JERRY_BUILTIN_ARRAY */
259249
#if JERRY_BUILTIN_ARRAY || JERRY_BUILTIN_SHAREDARRAYBUFFER || JERRY_BUILTIN_STRING || JERRY_BUILTIN_TYPEDARRAY
260250
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SLICE, "slice")
261-
#endif /* JERRY_BUILTIN_ARRAY \
262-
|| JERRY_BUILTIN_SHAREDARRAYBUFFER \
263-
|| JERRY_BUILTIN_STRING \
264-
|| JERRY_BUILTIN_TYPEDARRAY */
251+
#endif /* JERRY_BUILTIN_ARRAY || JERRY_BUILTIN_SHAREDARRAYBUFFER || JERRY_BUILTIN_STRING || JERRY_BUILTIN_TYPEDARRAY \
252+
*/
265253
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SPLIT, "split")
266254
#if JERRY_LINE_INFO
267255
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_STACK, "stack")
@@ -303,17 +291,15 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_BIGINT, "bigint")
303291
#endif /* JERRY_BUILTIN_BIGINT */
304292
#if JERRY_BUILTIN_DATAVIEW || JERRY_BUILTIN_TYPEDARRAY
305293
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_BUFFER, "buffer")
306-
#endif /* JERRY_BUILTIN_DATAVIEW \
307-
|| JERRY_BUILTIN_TYPEDARRAY */
294+
#endif /* JERRY_BUILTIN_DATAVIEW || JERRY_BUILTIN_TYPEDARRAY */
308295
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CALLEE, "callee")
309296
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CALLER, "caller")
310297
#if JERRY_BUILTIN_STRING
311298
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CHAR_AT_UL, "charAt")
312299
#endif /* JERRY_BUILTIN_STRING */
313300
#if JERRY_BUILTIN_ARRAY || JERRY_BUILTIN_STRING
314301
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CONCAT, "concat")
315-
#endif /* JERRY_BUILTIN_ARRAY \
316-
|| JERRY_BUILTIN_STRING */
302+
#endif /* JERRY_BUILTIN_ARRAY || JERRY_BUILTIN_STRING */
317303
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CREATE, "create")
318304
#if JERRY_BUILTIN_CONTAINER
319305
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_DELETE, "delete")
@@ -327,8 +313,7 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ESCAPE, "escape")
327313
#endif /* JERRY_BUILTIN_ANNEXB */
328314
#if JERRY_BUILTIN_ARRAY || JERRY_BUILTIN_TYPEDARRAY
329315
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FILTER, "filter")
330-
#endif /* JERRY_BUILTIN_ARRAY \
331-
|| JERRY_BUILTIN_TYPEDARRAY */
316+
#endif /* JERRY_BUILTIN_ARRAY || JERRY_BUILTIN_TYPEDARRAY */
332317
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FREEZE, "freeze")
333318
#if JERRY_BUILTIN_MATH
334319
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FROUND, "fround")
@@ -359,8 +344,7 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_RANDOM, "random")
359344
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_REASON, "reason")
360345
#if JERRY_BUILTIN_ARRAY || JERRY_BUILTIN_TYPEDARRAY
361346
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_REDUCE, "reduce")
362-
#endif /* JERRY_BUILTIN_ARRAY \
363-
|| JERRY_BUILTIN_TYPEDARRAY */
347+
#endif /* JERRY_BUILTIN_ARRAY || JERRY_BUILTIN_TYPEDARRAY */
364348
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_REJECT, "reject")
365349
#if JERRY_BUILTIN_STRING
366350
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_REPEAT, "repeat")
@@ -387,8 +371,7 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SUBSTR, "substr")
387371
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SYMBOL, "symbol")
388372
#if JERRY_BUILTIN_DATE || JERRY_BUILTIN_JSON
389373
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TO_JSON_UL, "toJSON")
390-
#endif /* JERRY_BUILTIN_DATE \
391-
|| JERRY_BUILTIN_JSON */
374+
#endif /* JERRY_BUILTIN_DATE || JERRY_BUILTIN_JSON */
392375
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_VALUES, "values")
393376
#if JERRY_BUILTIN_ATOMICS
394377
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ATOMICS_U, "Atomics")
@@ -427,9 +410,7 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FINALLY, "finally")
427410
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FLATMAP, "flatMap")
428411
#if JERRY_BUILTIN_ARRAY || JERRY_BUILTIN_CONTAINER || JERRY_BUILTIN_TYPEDARRAY
429412
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FOR_EACH_UL, "forEach")
430-
#endif /* JERRY_BUILTIN_ARRAY \
431-
|| JERRY_BUILTIN_CONTAINER \
432-
|| JERRY_BUILTIN_TYPEDARRAY */
413+
#endif /* JERRY_BUILTIN_ARRAY || JERRY_BUILTIN_CONTAINER || JERRY_BUILTIN_TYPEDARRAY */
433414
#if JERRY_BUILTIN_DATE
434415
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_DATE_UL, "getDate")
435416
#endif /* JERRY_BUILTIN_DATE */
@@ -444,23 +425,19 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_YEAR_UL, "getYear")
444425
#endif /* JERRY_BUILTIN_ANNEXB && JERRY_BUILTIN_DATE */
445426
#if JERRY_BUILTIN_ARRAY || JERRY_BUILTIN_STRING || JERRY_BUILTIN_TYPEDARRAY
446427
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_INDEX_OF_UL, "indexOf")
447-
#endif /* JERRY_BUILTIN_ARRAY \
448-
|| JERRY_BUILTIN_STRING \
449-
|| JERRY_BUILTIN_TYPEDARRAY */
428+
#endif /* JERRY_BUILTIN_ARRAY || JERRY_BUILTIN_STRING || JERRY_BUILTIN_TYPEDARRAY */
450429
#if JERRY_BUILTIN_ARRAY
451430
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_IS_ARRAY_UL, "isArray")
452431
#endif /* JERRY_BUILTIN_ARRAY */
453432
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_MESSAGE, "message")
454433
#if JERRY_BUILTIN_PROXY || JERRY_BUILTIN_REFLECT
455434
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_OWN_KEYS_UL, "ownKeys")
456-
#endif /* JERRY_BUILTIN_PROXY \
457-
|| JERRY_BUILTIN_REFLECT */
435+
#endif /* JERRY_BUILTIN_PROXY || JERRY_BUILTIN_REFLECT */
458436
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_REPLACE, "replace")
459437
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_RESOLVE, "resolve")
460438
#if JERRY_BUILTIN_ARRAY || JERRY_BUILTIN_TYPEDARRAY
461439
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_REVERSE, "reverse")
462-
#endif /* JERRY_BUILTIN_ARRAY \
463-
|| JERRY_BUILTIN_TYPEDARRAY */
440+
#endif /* JERRY_BUILTIN_ARRAY || JERRY_BUILTIN_TYPEDARRAY */
464441
#if JERRY_BUILTIN_DATE
465442
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_DATE_UL, "setDate")
466443
#endif /* JERRY_BUILTIN_DATE */
@@ -571,8 +548,7 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ANONYMOUS, "anonymous")
571548
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ARGUMENTS, "arguments")
572549
#if JERRY_BUILTIN_PROXY || JERRY_BUILTIN_REFLECT
573550
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CONSTRUCT, "construct")
574-
#endif /* JERRY_BUILTIN_PROXY \
575-
|| JERRY_BUILTIN_REFLECT */
551+
#endif /* JERRY_BUILTIN_PROXY || JERRY_BUILTIN_REFLECT */
576552
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_DECODE_URI, "decodeURI")
577553
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ENCODE_URI, "encodeURI")
578554
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FIND_INDEX, "findIndex")
@@ -620,13 +596,10 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_UINT8_ARRAY_UL, "Uint8Array")
620596
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ALLSETTLED, "allSettled")
621597
#if JERRY_BUILTIN_DATAVIEW || JERRY_BUILTIN_SHAREDARRAYBUFFER || JERRY_BUILTIN_TYPEDARRAY
622598
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_BYTE_LENGTH_UL, "byteLength")
623-
#endif /* JERRY_BUILTIN_DATAVIEW \
624-
|| JERRY_BUILTIN_SHAREDARRAYBUFFER \
625-
|| JERRY_BUILTIN_TYPEDARRAY */
599+
#endif /* JERRY_BUILTIN_DATAVIEW || JERRY_BUILTIN_SHAREDARRAYBUFFER || JERRY_BUILTIN_TYPEDARRAY */
626600
#if JERRY_BUILTIN_DATAVIEW || JERRY_BUILTIN_TYPEDARRAY
627601
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_BYTE_OFFSET_UL, "byteOffset")
628-
#endif /* JERRY_BUILTIN_DATAVIEW \
629-
|| JERRY_BUILTIN_TYPEDARRAY */
602+
#endif /* JERRY_BUILTIN_DATAVIEW || JERRY_BUILTIN_TYPEDARRAY */
630603
#if JERRY_BUILTIN_STRING
631604
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CHAR_CODE_AT_UL, "charCodeAt")
632605
#endif /* JERRY_BUILTIN_STRING */
@@ -698,13 +671,10 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_UTC_MONTH_UL, "getUTCMonth")
698671
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_HAS_INSTANCE, "hasInstance")
699672
#if JERRY_BUILTIN_ARRAY || JERRY_BUILTIN_STRING || JERRY_BUILTIN_TYPEDARRAY
700673
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_LAST_INDEX_OF_UL, "lastIndexOf")
701-
#endif /* JERRY_BUILTIN_ARRAY \
702-
|| JERRY_BUILTIN_STRING \
703-
|| JERRY_BUILTIN_TYPEDARRAY */
674+
#endif /* JERRY_BUILTIN_ARRAY || JERRY_BUILTIN_STRING || JERRY_BUILTIN_TYPEDARRAY */
704675
#if JERRY_BUILTIN_ARRAY || JERRY_BUILTIN_TYPEDARRAY
705676
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_REDUCE_RIGHT_UL, "reduceRight")
706-
#endif /* JERRY_BUILTIN_ARRAY \
707-
|| JERRY_BUILTIN_TYPEDARRAY */
677+
#endif /* JERRY_BUILTIN_ARRAY || JERRY_BUILTIN_TYPEDARRAY */
708678
#if JERRY_BUILTIN_BIGINT && JERRY_BUILTIN_DATAVIEW
709679
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_BIGINT64, "setBigInt64")
710680
#endif /* JERRY_BUILTIN_BIGINT && JERRY_BUILTIN_DATAVIEW */
@@ -794,8 +764,7 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_REFERENCE_ERROR_UL, "ReferenceError")
794764
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_DEFINE_PROPERTY_UL, "defineProperty")
795765
#if JERRY_BUILTIN_PROXY || JERRY_BUILTIN_REFLECT
796766
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_DELETE_PROPERTY_UL, "deleteProperty")
797-
#endif /* JERRY_BUILTIN_PROXY \
798-
|| JERRY_BUILTIN_REFLECT */
767+
#endif /* JERRY_BUILTIN_PROXY || JERRY_BUILTIN_REFLECT */
799768
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_PROTOTYPE_OF_UL, "getPrototypeOf")
800769
#if JERRY_BUILTIN_DATE
801770
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_UTC_FULL_YEAR_UL, "getUTCFullYear")
@@ -880,8 +849,7 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FUNCTION_TO_STRING_ANON_ASYNC_GENERATOR,
880849
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FUNCTION_TO_STRING_NATIVE, "function () { [native code] }")
881850
#if JERRY_SNAPSHOT_EXEC || !(JERRY_FUNCTION_TO_STRING)
882851
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FUNCTION_TO_STRING_ECMA, "function () { /* ecmascript */ }")
883-
#endif /* JERRY_SNAPSHOT_EXEC \
884-
|| !(JERRY_FUNCTION_TO_STRING) */
852+
#endif /* JERRY_SNAPSHOT_EXEC || !(JERRY_FUNCTION_TO_STRING) */
885853

886854
LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (0, LIT_MAGIC_STRING__EMPTY)
887855
LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (1, LIT_MAGIC_STRING_SPACE_CHAR)
@@ -987,13 +955,10 @@ LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (28, LIT_MAGIC_STRING_FUNCTION_TO_STRING
987955
LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (29, LIT_MAGIC_STRING_FUNCTION_TO_STRING_NATIVE)
988956
#if JERRY_SNAPSHOT_EXEC || !(JERRY_FUNCTION_TO_STRING)
989957
LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (30, LIT_MAGIC_STRING_FUNCTION_TO_STRING_ECMA)
990-
#endif /* JERRY_SNAPSHOT_EXEC \
991-
|| !(JERRY_FUNCTION_TO_STRING) */
958+
#endif /* JERRY_SNAPSHOT_EXEC || !(JERRY_FUNCTION_TO_STRING) */
992959
#if JERRY_SNAPSHOT_EXEC || !(JERRY_FUNCTION_TO_STRING)
993960
LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (31, LIT_MAGIC_STRING_FUNCTION_TO_STRING_ECMA)
994-
#endif /* JERRY_SNAPSHOT_EXEC \
995-
|| !(JERRY_FUNCTION_TO_STRING) */
961+
#endif /* JERRY_SNAPSHOT_EXEC || !(JERRY_FUNCTION_TO_STRING) */
996962
#if JERRY_SNAPSHOT_EXEC || !(JERRY_FUNCTION_TO_STRING)
997963
LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (32, LIT_MAGIC_STRING_FUNCTION_TO_STRING_ECMA)
998-
#endif /* JERRY_SNAPSHOT_EXEC \
999-
|| !(JERRY_FUNCTION_TO_STRING) */
964+
#endif /* JERRY_SNAPSHOT_EXEC || !(JERRY_FUNCTION_TO_STRING) */

‎jerry-core/parser/js/parser-error-messages.inc.h‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ PARSER_ERROR_DEF (PARSER_ERR_LEFT_BRACE_EXPECTED, "Expected '{' token")
2727
#endif /* JERRY_PARSER */
2828
#if JERRY_MODULE_SYSTEM || JERRY_PARSER
2929
PARSER_ERROR_DEF (PARSER_ERR_RIGHT_BRACE_EXPECTED, "Expected '}' token")
30-
#endif /* JERRY_MODULE_SYSTEM \
31-
|| JERRY_PARSER */
30+
#endif /* JERRY_MODULE_SYSTEM || JERRY_PARSER */
3231
#if JERRY_PARSER
3332
PARSER_ERROR_DEF (PARSER_ERR_NUMBER_TOO_LONG, "Number is too long")
3433
#endif /* JERRY_PARSER */
@@ -49,8 +48,7 @@ PARSER_ERROR_DEF (PARSER_ERR_EXPRESSION_EXPECTED, "Expression expected")
4948
#endif /* JERRY_PARSER */
5049
#if JERRY_MODULE_SYSTEM || JERRY_PARSER
5150
PARSER_ERROR_DEF (PARSER_ERR_IDENTIFIER_EXPECTED, "Identifier expected")
52-
#endif /* JERRY_MODULE_SYSTEM \
53-
|| JERRY_PARSER */
51+
#endif /* JERRY_MODULE_SYSTEM || JERRY_PARSER */
5452
#if JERRY_PARSER
5553
PARSER_ERROR_DEF (PARSER_ERR_INVALID_OCTAL_DIGIT, "Invalid octal digit")
5654
PARSER_ERROR_DEF (PARSER_ERR_INVALID_SWITCH, "Invalid switch body")
@@ -106,8 +104,7 @@ PARSER_ERROR_DEF (PARSER_ERR_EXPORT_NOT_DEFINED, "Export not defined in module")
106104
#endif /* JERRY_MODULE_SYSTEM */
107105
#if JERRY_MODULE_SYSTEM || JERRY_PARSER
108106
PARSER_ERROR_DEF (PARSER_ERR_VARIABLE_REDECLARED, "Local variable is redeclared")
109-
#endif /* JERRY_MODULE_SYSTEM \
110-
|| JERRY_PARSER */
107+
#endif /* JERRY_MODULE_SYSTEM || JERRY_PARSER */
111108
#if JERRY_BUILTIN_BIGINT && JERRY_PARSER
112109
PARSER_ERROR_DEF (PARSER_ERR_INVALID_BIGINT, "Number is not a valid BigInt")
113110
#endif /* JERRY_BUILTIN_BIGINT && JERRY_PARSER */

‎tools/check-format.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,13 @@
4343

4444

4545
def get_arguments():
46+
clang_fomat_default = f'clang-format-{CLANG_FORMAT_MIN_VERSION}'
47+
if sys.platform.startswith('win32'):
48+
clang_fomat_default = 'clang-format'
4649
parser = argparse.ArgumentParser()
4750
parser.add_argument('--fix', action='store_true', dest='fix',
4851
help='fix source code stlye')
49-
parser.add_argument('--clang-format', dest='clang_format', default=f'clang-format-{CLANG_FORMAT_MIN_VERSION}',
52+
parser.add_argument('--clang-format', dest='clang_format', default=clang_fomat_default,
5053
help='path to clang-format executable')
5154

5255
script_args = parser.parse_args()

‎tools/gen-strings.py‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
try:
18-
from configparser import ConfigParser
19-
except ImportError:
20-
from ConfigParser import ConfigParser
17+
from configparser import ConfigParser
2118

2219
import argparse
2320
import fileinput
@@ -29,6 +26,7 @@
2926

3027
from settings import FORMAT_SCRIPT, PROJECT_DIR
3128
from gen_c_source import LICENSE
29+
from runners import util
3230

3331
MAGIC_STRINGS_INI = os.path.join(PROJECT_DIR, 'jerry-core', 'lit', 'lit-magic-strings.ini')
3432
MAGIC_STRINGS_INC_H = os.path.join(PROJECT_DIR, 'jerry-core', 'lit', 'lit-magic-strings.inc.h')
@@ -211,7 +209,7 @@ def calculate_magic_string_guards(defs, uses, debug=False):
211209

212210

213211
def guards_to_str(guards):
214-
return ' \\\n|| '.join(' && '.join(g.strip() for g in sorted(guard))
212+
return ' || '.join(' && '.join(g.strip() for g in sorted(guard))
215213
for guard in sorted(guards))
216214

217215

@@ -309,7 +307,7 @@ def main():
309307
PARSER_ERRORS_INC_H,
310308
'PARSER_ERROR_DEF')
311309

312-
subprocess.call([FORMAT_SCRIPT, '--fix'])
310+
subprocess.call(util.get_python_cmd_prefix() + [FORMAT_SCRIPT, '--fix'])
313311

314312

315313
if __name__ == '__main__':

0 commit comments

Comments
 (0)