Skip to content

Commit 5f467a6

Browse files
authored
Fix check-string.sh to check every generated strings (#5179)
The original implementation only checked lit-magic-strings.inc.h. This patch adds checking for ecma-error-messages.inc.h and parser-error-messages.inc.h This patch fixes #5172 issue. JerryScript-DCO-1.0-Signed-off-by: Gergo Csizi [email protected]
1 parent ba89576 commit 5f467a6

File tree

2 files changed

+28
-8
lines changed

2 files changed

+28
-8
lines changed

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -506,11 +506,8 @@ ECMA_ERROR_DEF (ECMA_ERR_ARGUMENT_THIS_NOT_GENERATOR_OBJECT, "Argument 'this' is
506506
ECMA_ERROR_DEF (ECMA_ERR_ARGUMENT_CANNOT_CONVERT_TO_OBJECT, "Argument cannot be converted to an object")
507507
#if JERRY_BUILTIN_BIGINT
508508
ECMA_ERROR_DEF (ECMA_ERR_ALLOCATE_BIGINT_VALUE, "Cannot allocate memory for a BigInt value")
509-
#endif /* JERRY_BUILTIN_BIGINT */
510-
#if JERRY_BUILTIN_ATOMICS || JERRY_BUILTIN_BIGINT
511509
ECMA_ERROR_DEF (ECMA_ERR_CONVERT_BIGINT_TO_NUMBER, "Cannot convert a BigInt value to a number")
512-
#endif /* JERRY_BUILTIN_ATOMICS \
513-
|| JERRY_BUILTIN_BIGINT */
510+
#endif /* JERRY_BUILTIN_BIGINT */
514511
ECMA_ERROR_DEF (ECMA_ERR_CONVERT_SYMBOL_TO_NUMBER, "Cannot convert a Symbol value to a number")
515512
ECMA_ERROR_DEF (ECMA_ERR_CONVERT_SYMBOL_TO_STRING, "Cannot convert a Symbol value to a string")
516513
#if JERRY_BUILTIN_BIGINT && JERRY_BUILTIN_TYPEDARRAY

tools/check-strings.sh

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,44 @@
1616

1717
MAGIC_STRINGS_GEN="tools/gen-strings.py"
1818
MAGIC_STRINGS_INC_H="jerry-core/lit/lit-magic-strings.inc.h"
19-
MAGIC_STRINGS_TEMP=`mktemp lit-magic-strings.inc.h.XXXXXXXXXX`
19+
ECMA_ERROR_MESSAGES_INC_H="jerry-core/ecma/base/ecma-error-messages.inc.h"
20+
PARSER_ERROR_MESSAGES_INC_H="jerry-core/parser/js/parser-error-messages.inc.h"
21+
MAGIC_STRINGS_TEMP=$(mktemp lit-magic-strings.inc.h.XXXXXXXXXX)
22+
ECMA_ERROR_MESSAGES_TEMP=$(mktemp ecma-error-messages.inc.h.XXXXXXXXXX)
23+
PARSER_ERROR_MESSAGES_TEMP=$(mktemp parser-error-messages.inc.h.XXXXXXXXXX)
2024

21-
cp $MAGIC_STRINGS_INC_H $MAGIC_STRINGS_TEMP
25+
cp $MAGIC_STRINGS_INC_H "$MAGIC_STRINGS_TEMP"
26+
cp $ECMA_ERROR_MESSAGES_INC_H "$ECMA_ERROR_MESSAGES_TEMP"
27+
cp $PARSER_ERROR_MESSAGES_INC_H "$PARSER_ERROR_MESSAGES_TEMP"
2228
$MAGIC_STRINGS_GEN
2329
DIFF_RESULT=$?
2430

2531
if [ $DIFF_RESULT -eq 0 ]
2632
then
27-
diff -q $MAGIC_STRINGS_INC_H $MAGIC_STRINGS_TEMP
33+
diff -q $MAGIC_STRINGS_INC_H "$MAGIC_STRINGS_TEMP"
2834
DIFF_RESULT=$?
2935
if [ $DIFF_RESULT -ne 0 ]
3036
then
3137
echo -e "\e[1;33m$MAGIC_STRINGS_INC_H must be re-generated. Run $MAGIC_STRINGS_GEN\e[0m"
38+
exit $DIFF_RESULT
39+
fi
40+
diff -q $ECMA_ERROR_MESSAGES_INC_H "$ECMA_ERROR_MESSAGES_TEMP"
41+
DIFF_RESULT=$?
42+
if [ $DIFF_RESULT -ne 0 ]
43+
then
44+
echo -e "\e[1;33m$ECMA_ERROR_MESSAGES_INC_H must be re-generated. Run $MAGIC_STRINGS_GEN\e[0m"
45+
exit $DIFF_RESULT
46+
fi
47+
diff -q $PARSER_ERROR_MESSAGES_INC_H "$PARSER_ERROR_MESSAGES_TEMP"
48+
DIFF_RESULT=$?
49+
if [ $DIFF_RESULT -ne 0 ]
50+
then
51+
echo -e "\e[1;33m$PARSER_ERROR_MESSAGES_INC_H must be re-generated. Run $MAGIC_STRINGS_GEN\e[0m"
52+
exit $DIFF_RESULT
3253
fi
3354
fi
34-
mv $MAGIC_STRINGS_TEMP $MAGIC_STRINGS_INC_H
55+
mv "$MAGIC_STRINGS_TEMP" $MAGIC_STRINGS_INC_H
56+
mv "$ECMA_ERROR_MESSAGES_TEMP" $ECMA_ERROR_MESSAGES_INC_H
57+
mv "$PARSER_ERROR_MESSAGES_TEMP" $PARSER_ERROR_MESSAGES_INC_H
3558

3659
exit $DIFF_RESULT

0 commit comments

Comments
 (0)