From 7d355b0f8e8c85bc1a560dc723106850c10b8d2b Mon Sep 17 00:00:00 2001 From: Zoltan Herczeg Date: Fri, 1 Oct 2021 12:24:20 +0200 Subject: [PATCH] Change error message description (#4785) JerryScript-DCO-1.0-Signed-off-by: Zoltan Herczeg zherczeg.u-szeged@partner.samsung.com --- jerry-core/parser/js/js-parser-expr.c | 2 +- jerry-core/parser/js/js-parser-util.c | 4 ++-- jerry-core/parser/js/js-parser.h | 2 +- tests/unit-core/test-api.c | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/jerry-core/parser/js/js-parser-expr.c b/jerry-core/parser/js/js-parser-expr.c index dcb84f92d..87d53ca76 100644 --- a/jerry-core/parser/js/js-parser-expr.c +++ b/jerry-core/parser/js/js-parser-expr.c @@ -2369,7 +2369,7 @@ parser_parse_unary_expression (parser_context_t *context_p, /**< context */ { bool is_left_hand_side = (*grouping_level_p == PARSE_EXPR_LEFT_HAND_SIDE); parser_raise_error (context_p, (is_left_hand_side ? PARSER_ERR_LEFT_HAND_SIDE_EXP_EXPECTED - : PARSER_ERR_PRIMARY_EXP_EXPECTED)); + : PARSER_ERR_UNEXPECTED_END)); break; } } diff --git a/jerry-core/parser/js/js-parser-util.c b/jerry-core/parser/js/js-parser-util.c index ff0773313..a019e0462 100644 --- a/jerry-core/parser/js/js-parser-util.c +++ b/jerry-core/parser/js/js-parser-util.c @@ -1174,9 +1174,9 @@ parser_error_to_string (parser_error_t error) /**< error code */ { return "Expression expected"; } - case PARSER_ERR_PRIMARY_EXP_EXPECTED: + case PARSER_ERR_UNEXPECTED_END: { - return "Primary expression expected"; + return "Unexpected end of input"; } case PARSER_ERR_LEFT_HAND_SIDE_EXP_EXPECTED: { diff --git a/jerry-core/parser/js/js-parser.h b/jerry-core/parser/js/js-parser.h index b85da7107..0972b841a 100644 --- a/jerry-core/parser/js/js-parser.h +++ b/jerry-core/parser/js/js-parser.h @@ -110,6 +110,7 @@ typedef enum PARSER_ERR_RIGHT_PAREN_EXPECTED, /**< right paren expected */ PARSER_ERR_RIGHT_SQUARE_EXPECTED, /**< right square expected */ + PARSER_ERR_UNEXPECTED_END, /**< unexpected end of input */ PARSER_ERR_COLON_EXPECTED, /**< colon expected */ PARSER_ERR_COLON_FOR_CONDITIONAL_EXPECTED, /**< colon expected for conditional expression */ PARSER_ERR_SEMICOLON_EXPECTED, /**< semicolon expected */ @@ -120,7 +121,6 @@ typedef enum PARSER_ERR_OBJECT_ITEM_SEPARATOR_EXPECTED, /**< object item separator expected */ PARSER_ERR_IDENTIFIER_EXPECTED, /**< identifier expected */ PARSER_ERR_EXPRESSION_EXPECTED, /**< expression expected */ - PARSER_ERR_PRIMARY_EXP_EXPECTED, /**< primary expression expected */ PARSER_ERR_LEFT_HAND_SIDE_EXP_EXPECTED, /**< left-hand-side expression expected */ PARSER_ERR_STATEMENT_EXPECTED, /**< statement expected */ PARSER_ERR_PROPERTY_IDENTIFIER_EXPECTED, /**< property identifier expected */ diff --git a/tests/unit-core/test-api.c b/tests/unit-core/test-api.c index ca26cdfee..d3dff7c3e 100644 --- a/tests/unit-core/test-api.c +++ b/tests/unit-core/test-api.c @@ -1065,7 +1065,7 @@ main (void) test_syntax_error ("b = 'hello';\nvar a = (;", NULL, - "SyntaxError: Primary expression expected [:2:10]", + "SyntaxError: Unexpected end of input [:2:10]", false); parse_options.options = JERRY_PARSE_HAS_RESOURCE; @@ -1073,12 +1073,12 @@ main (void) test_syntax_error ("b = 'hello';\nvar a = (;", &parse_options, - "SyntaxError: Primary expression expected [filename.js:2:10]", + "SyntaxError: Unexpected end of input [filename.js:2:10]", false); test_syntax_error ("eval(\"var b;\\nfor (,); \");", &parse_options, - "SyntaxError: Primary expression expected [:2:6]", + "SyntaxError: Unexpected end of input [:2:6]", true); parse_options.options |= JERRY_PARSE_HAS_START;