wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-21 14:47:31 +09:00
Code Issues Projects Releases Packages Wiki Activity

Inline Parser::reportHelper into its callers.

Browse source
This commit is contained in:
wolfbeast 2019-04-06 11:20:43 +02:00 • committed by Roy Tam
commit d8bcfdb867
1 changed files with 29 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

37
js/src/frontend/Parser.cpp
View file

@ -603,7 +603,7 @@ Parser<ParseHandler>::error(unsigned errorNumber, ...)
#ifdef DEBUG #ifdef DEBUG
bool result = bool result =
#endif #endif
reportHelper(ParseError, false, pos().begin, errorNumber, args); tokenStream.reportCompileErrorNumberVA(pos().begin, JSREPORT_ERROR, errorNumber, args);
MOZ_ASSERT(!result, "reporting an error returned true?"); MOZ_ASSERT(!result, "reporting an error returned true?");
va_end(args); va_end(args);
} }
@ -617,7 +617,7 @@ Parser<ParseHandler>::errorAt(uint32_t offset, unsigned errorNumber, ...)
#ifdef DEBUG #ifdef DEBUG
bool result = bool result =
#endif #endif
reportHelper(ParseError, false, offset, errorNumber, args); tokenStream.reportCompileErrorNumberVA(offset, JSREPORT_ERROR, errorNumber, args);
MOZ_ASSERT(!result, "reporting an error returned true?"); MOZ_ASSERT(!result, "reporting an error returned true?");
va_end(args); va_end(args);
} }
@ -628,7 +628,8 @@ Parser<ParseHandler>::warning(unsigned errorNumber, ...)
{ {
va_list args; va_list args;
va_start(args, errorNumber); va_start(args, errorNumber);
bool result = reportHelper(ParseWarning, false, pos().begin, errorNumber, args); bool result =
tokenStream.reportCompileErrorNumberVA(pos().begin, JSREPORT_WARNING, errorNumber, args);
va_end(args); va_end(args);
return result; return result;
} }
@ -639,7 +640,8 @@ Parser<ParseHandler>::warningAt(uint32_t offset, unsigned errorNumber, ...)
{ {
va_list args; va_list args;
va_start(args, errorNumber); va_start(args, errorNumber);
bool result = reportHelper(ParseWarning, false, offset, errorNumber, args); bool result =
tokenStream.reportCompileErrorNumberVA(offset, JSREPORT_WARNING, errorNumber, args);
va_end(args); va_end(args);
return result; return result;
} }
@ -650,7 +652,7 @@ Parser<ParseHandler>::extraWarning(unsigned errorNumber, ...)
{ {
va_list args; va_list args;
va_start(args, errorNumber); va_start(args, errorNumber);
bool result = reportHelper(ParseExtraWarning, false, pos().begin, errorNumber, args); bool result = tokenStream.reportStrictWarningErrorNumberVA(pos().begin, errorNumber, args);
va_end(args); va_end(args);
return result; return result;
} }
@ -661,7 +663,9 @@ Parser<ParseHandler>::strictModeError(unsigned errorNumber, ...)
{ {
va_list args; va_list args;
va_start(args, errorNumber); va_start(args, errorNumber);
bool res = reportHelper(ParseStrictError, pc->sc()->strict(), pos().begin, errorNumber, args); bool res =
tokenStream.reportStrictModeErrorNumberVA(pos().begin, pc->sc()->strict(),
errorNumber, args);
va_end(args); va_end(args);
return res; return res;
} }
@ -672,7 +676,8 @@ Parser<ParseHandler>::strictModeErrorAt(uint32_t offset, unsigned errorNumber, .
{ {
va_list args; va_list args;
va_start(args, errorNumber); va_start(args, errorNumber);
bool res = reportHelper(ParseStrictError, pc->sc()->strict(), offset, errorNumber, args); bool res =
tokenStream.reportStrictModeErrorNumberVA(offset, pc->sc()->strict(), errorNumber, args);
va_end(args); va_end(args);
return res; return res;
} }
@ -683,7 +688,23 @@ Parser<ParseHandler>::reportNoOffset(ParseReportKind kind, bool strict, unsigned
{ {
va_list args; va_list args;
va_start(args, errorNumber); va_start(args, errorNumber);
bool result = reportHelper(kind, strict, TokenStream::NoOffset, errorNumber, args); bool result = false;
uint32_t offset = TokenStream::NoOffset;
switch (kind) {
case ParseError:
result = tokenStream.reportCompileErrorNumberVA(offset, JSREPORT_ERROR, errorNumber, args);
break;
case ParseWarning:
result =
tokenStream.reportCompileErrorNumberVA(offset, JSREPORT_WARNING, errorNumber, args);
break;
case ParseExtraWarning:
result = tokenStream.reportStrictWarningErrorNumberVA(offset, errorNumber, args);
break;
case ParseStrictError:
result = tokenStream.reportStrictModeErrorNumberVA(offset, strict, errorNumber, args);
break;
}
va_end(args); va_end(args);
return result; return result;
} }