summaryrefslogtreecommitdiffstats
path: root/js
diff options
context:
space:
mode:
authorGaming4JC <g4jc@hyperbola.info>2019-06-08 15:37:06 -0400
committerGaming4JC <g4jc@hyperbola.info>2019-07-18 22:38:16 -0400
commitf6193fd0f4689643f47c6ac9aa5aac3b8cc10213 (patch)
tree2dbce005d5e57b4f9f8bd40cefc813492eadf4fd /js
parentc3e3a917d634ee1e550b2a19096ee99dc2024139 (diff)
downloadUXP-f6193fd0f4689643f47c6ac9aa5aac3b8cc10213.tar
UXP-f6193fd0f4689643f47c6ac9aa5aac3b8cc10213.tar.gz
UXP-f6193fd0f4689643f47c6ac9aa5aac3b8cc10213.tar.lz
UXP-f6193fd0f4689643f47c6ac9aa5aac3b8cc10213.tar.xz
UXP-f6193fd0f4689643f47c6ac9aa5aac3b8cc10213.zip
1326454 - Introduce TokenStream::error that reports an error at the current offset.
Diffstat (limited to 'js')
-rw-r--r--js/src/frontend/TokenStream.cpp37
-rw-r--r--js/src/frontend/TokenStream.h3
2 files changed, 30 insertions, 10 deletions
diff --git a/js/src/frontend/TokenStream.cpp b/js/src/frontend/TokenStream.cpp
index 8438ff7c5..9becaf55e 100644
--- a/js/src/frontend/TokenStream.cpp
+++ b/js/src/frontend/TokenStream.cpp
@@ -554,8 +554,10 @@ TokenStream::advance(size_t position)
MOZ_MAKE_MEM_UNDEFINED(&cur->type, sizeof(cur->type));
lookahead = 0;
- if (flags.hitOOM)
- return reportError(JSMSG_OUT_OF_MEMORY);
+ if (flags.hitOOM) {
+ error(JSMSG_OUT_OF_MEMORY);
+ return false;
+ }
return true;
}
@@ -806,6 +808,19 @@ TokenStream::reportAsmJSError(uint32_t offset, unsigned errorNumber, ...)
va_end(args);
}
+void
+TokenStream::error(unsigned errorNumber, ...)
+{
+ va_list args;
+ va_start(args, errorNumber);
+#ifdef DEBUG
+ bool result =
+#endif
+ reportCompileErrorNumberVA(currentToken().pos.begin, JSREPORT_ERROR, errorNumber, args);
+ MOZ_ASSERT(!result, "reporting an error returned true?");
+ va_end(args);
+}
+
// We have encountered a '\': check for a Unicode escape sequence after it.
// Return the length of the escape sequence and the character code point (by
// value) if we found a Unicode escape sequence. Otherwise, return 0. In both
@@ -1119,8 +1134,10 @@ TokenStream::checkForKeyword(const KeywordInfo* kw, TokenKind* ttp)
return true;
}
- if (kw->tokentype == TOK_RESERVED)
- return reportError(JSMSG_RESERVED_ID, kw->chars);
+ if (kw->tokentype == TOK_RESERVED) {
+ error(JSMSG_RESERVED_ID, kw->chars);
+ return false;
+ }
if (kw->tokentype == TOK_STRICT_RESERVED)
return reportStrictModeError(JSMSG_RESERVED_ID, kw->chars);
@@ -1897,7 +1914,7 @@ TokenStream::getStringOrTemplateToken(int untilChar, Token** tp)
while ((c = getCharIgnoreEOL()) != untilChar) {
if (c == EOF) {
ungetCharIgnoreEOL(c);
- reportError(JSMSG_UNTERMINATED_STRING);
+ error(JSMSG_UNTERMINATED_STRING);
return false;
}
@@ -1920,7 +1937,7 @@ TokenStream::getStringOrTemplateToken(int untilChar, Token** tp)
if (peekChar() == '{') {
uint32_t code;
if (!getBracedUnicode(&code)) {
- reportError(JSMSG_MALFORMED_ESCAPE, "Unicode");
+ error(JSMSG_MALFORMED_ESCAPE, "Unicode");
return false;
}
@@ -1945,7 +1962,7 @@ TokenStream::getStringOrTemplateToken(int untilChar, Token** tp)
c = (c << 4) + JS7_UNHEX(cp[3]);
skipChars(4);
} else {
- reportError(JSMSG_MALFORMED_ESCAPE, "Unicode");
+ error(JSMSG_MALFORMED_ESCAPE, "Unicode");
return false;
}
break;
@@ -1958,7 +1975,7 @@ TokenStream::getStringOrTemplateToken(int untilChar, Token** tp)
c = (JS7_UNHEX(cp[0]) << 4) + JS7_UNHEX(cp[1]);
skipChars(2);
} else {
- reportError(JSMSG_MALFORMED_ESCAPE, "hexadecimal");
+ error(JSMSG_MALFORMED_ESCAPE, "hexadecimal");
return false;
}
break;
@@ -1974,7 +1991,7 @@ TokenStream::getStringOrTemplateToken(int untilChar, Token** tp)
// Strict mode code allows only \0, then a non-digit.
if (val != 0 || JS7_ISDEC(c)) {
if (parsingTemplate) {
- reportError(JSMSG_DEPRECATED_OCTAL);
+ error(JSMSG_DEPRECATED_OCTAL);
return false;
}
if (!reportStrictModeError(JSMSG_DEPRECATED_OCTAL))
@@ -2003,7 +2020,7 @@ TokenStream::getStringOrTemplateToken(int untilChar, Token** tp)
} else if (TokenBuf::isRawEOLChar(c)) {
if (!parsingTemplate) {
ungetCharIgnoreEOL(c);
- reportError(JSMSG_UNTERMINATED_STRING);
+ error(JSMSG_UNTERMINATED_STRING);
return false;
}
if (c == '\r') {
diff --git a/js/src/frontend/TokenStream.h b/js/src/frontend/TokenStream.h
index 6ba9fba5a..f08d317ba 100644
--- a/js/src/frontend/TokenStream.h
+++ b/js/src/frontend/TokenStream.h
@@ -366,6 +366,9 @@ class MOZ_STACK_CLASS TokenStream
bool reportErrorNoOffset(unsigned errorNumber, ...);
bool reportWarning(unsigned errorNumber, ...);
+ // Report the given error at the current offset.
+ void error(unsigned errorNumber, ...);
+
static const uint32_t NoOffset = UINT32_MAX;
// General-purpose error reporters. You should avoid calling these