diff options
| author | Gaming4JC <g4jc@hyperbola.info> | 2019-06-08 15:48:25 -0400 |
|---|---|---|
| committer | Gaming4JC <g4jc@hyperbola.info> | 2019-07-18 22:38:17 -0400 |
| commit | b41de8683d8d28d08a6e2b79511610a268342a0e (patch) | |
| tree | 82fa4225aaad95443ba9d82599d4d28582bfcdb6 /js/src/irregexp | |
| parent | 068916b59a847bede7c6c788e803442c1833fe67 (diff) | |
| download | UXP-b41de8683d8d28d08a6e2b79511610a268342a0e.tar UXP-b41de8683d8d28d08a6e2b79511610a268342a0e.tar.gz UXP-b41de8683d8d28d08a6e2b79511610a268342a0e.tar.lz UXP-b41de8683d8d28d08a6e2b79511610a268342a0e.tar.xz UXP-b41de8683d8d28d08a6e2b79511610a268342a0e.zip | |
1326454 - Rename TokenStream::getBracedUnicode to TokenStream::matchBracedUnicode and make its signature fallible.
Diffstat (limited to 'js/src/irregexp')
| -rw-r--r-- | js/src/irregexp/RegExpParser.cpp | 6 | ||||
| -rw-r--r-- | js/src/irregexp/RegExpParser.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/js/src/irregexp/RegExpParser.cpp b/js/src/irregexp/RegExpParser.cpp index ccc6ae3eb..8bd88047a 100644 --- a/js/src/irregexp/RegExpParser.cpp +++ b/js/src/irregexp/RegExpParser.cpp @@ -243,10 +243,10 @@ RegExpParser<CharT>::RegExpParser(frontend::TokenStream& ts, LifoAlloc* alloc, template <typename CharT> RegExpTree* -RegExpParser<CharT>::ReportError(unsigned errorNumber) +RegExpParser<CharT>::ReportError(unsigned errorNumber, const char* param /* = nullptr */) { gc::AutoSuppressGC suppressGC(ts.context()); - ts.reportError(errorNumber); + ts.reportError(errorNumber, param); return nullptr; } @@ -350,7 +350,7 @@ RegExpParser<CharT>::ParseBracedHexEscape(widechar* value) } code = (code << 4) | d; if (code > unicode::NonBMPMax) { - ReportError(JSMSG_UNICODE_OVERFLOW); + ReportError(JSMSG_UNICODE_OVERFLOW, "regular expression"); return false; } Advance(); diff --git a/js/src/irregexp/RegExpParser.h b/js/src/irregexp/RegExpParser.h index b5228a86f..0a7e61858 100644 --- a/js/src/irregexp/RegExpParser.h +++ b/js/src/irregexp/RegExpParser.h @@ -211,7 +211,7 @@ class RegExpParser bool ParseBackReferenceIndex(int* index_out); bool ParseClassAtom(char16_t* char_class, widechar *value); - RegExpTree* ReportError(unsigned errorNumber); + RegExpTree* ReportError(unsigned errorNumber, const char* param = nullptr); void Advance(); void Advance(int dist) { next_pos_ += dist - 1; |