From a71c910d8262deae166bf1af5dac903c09cbdac1 Mon Sep 17 00:00:00 2001 From: roytam1 Date: Mon, 1 May 2023 08:07:44 +0800 Subject: [PATCH] import from UXP: Issue #1691 - Follow-up: use error message with no arguments for bad import statements (73a99c15) --- js/src/frontend/Parser.cpp | 2 +- js/src/js.msg | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/js/src/frontend/Parser.cpp b/js/src/frontend/Parser.cpp index 336c3a4e8..8f68325f3 100644 --- a/js/src/frontend/Parser.cpp +++ b/js/src/frontend/Parser.cpp @@ -10630,7 +10630,7 @@ Parser::importExpr(YieldHandling yieldHandling, bool allowCallSynt return handler.newCallImport(importHolder, arg); } else { - error(JSMSG_UNEXPECTED_TOKEN, TokenKindToDesc(next)); + error(JSMSG_UNEXPECTED_TOKEN_NO_EXPECT, TokenKindToDesc(next)); return null(); } } diff --git a/js/src/js.msg b/js/src/js.msg index 4b1249fa8..e0b6014e1 100644 --- a/js/src/js.msg +++ b/js/src/js.msg @@ -342,6 +342,7 @@ MSG_DEF(JSMSG_TOO_MANY_LOCALS, 0, JSEXN_SYNTAXERR, "too many local varia MSG_DEF(JSMSG_TOO_MANY_YIELDS, 0, JSEXN_SYNTAXERR, "too many yield expressions") MSG_DEF(JSMSG_TOUGH_BREAK, 0, JSEXN_SYNTAXERR, "unlabeled break must be inside loop or switch") MSG_DEF(JSMSG_UNEXPECTED_TOKEN, 2, JSEXN_SYNTAXERR, "expected {0}, got {1}") +MSG_DEF(JSMSG_UNEXPECTED_TOKEN_NO_EXPECT, 1, JSEXN_SYNTAXERR, "unexpected token: {0}") MSG_DEF(JSMSG_UNEXPECTED_PARAMLIST_END,0, JSEXN_SYNTAXERR, "unexpected end of function parameter list") MSG_DEF(JSMSG_UNNAMED_CLASS_STMT, 0, JSEXN_SYNTAXERR, "class statement requires a name") MSG_DEF(JSMSG_UNNAMED_FUNCTION_STMT, 0, JSEXN_SYNTAXERR, "function statement requires a name")