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

Rename TokenStream::reportStrictWarningErrorNumberVA to

Browse source 
TokenStream::reportExtraWarningErrorNumberVA for clarity.

Emit Extra Warnings instead of Strict Warnings from the BCE where
it makes sense.
This commit is contained in:
wolfbeast 2019-04-06 11:26:49 +02:00 • committed by Roy Tam
commit 0c3fb437a9
5 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
js/src/frontend/BytecodeEmitter.cpp
View file

@ -3608,13 +3608,13 @@ BytecodeEmitter::reportError(ParseNode* pn, unsigned errorNumber, ...)
} }
bool bool
BytecodeEmitter::reportStrictWarning(ParseNode* pn, unsigned errorNumber, ...) BytecodeEmitter::reportExtraWarning(ParseNode* pn, unsigned errorNumber, ...)
{ {
TokenPos pos = pn ? pn->pn_pos : tokenStream()->currentToken().pos; TokenPos pos = pn ? pn->pn_pos : tokenStream()->currentToken().pos;
va_list args; va_list args;
va_start(args, errorNumber); va_start(args, errorNumber);
bool result = tokenStream()->reportStrictWarningErrorNumberVA(pos.begin, errorNumber, args); bool result = tokenStream()->reportExtraWarningErrorNumberVA(pos.begin, errorNumber, args);
va_end(args); va_end(args);
return result; return result;
} }
@ -8707,13 +8707,13 @@ BytecodeEmitter::emitStatement(ParseNode* pn)
} }
if (directive) { if (directive) {
if (!reportStrictWarning(pn2, JSMSG_CONTRARY_NONDIRECTIVE, directive)) if (!reportExtraWarning(pn2, JSMSG_CONTRARY_NONDIRECTIVE, directive))
return false; return false;
} }
} else { } else {
current->currentLine = parser->tokenStream.srcCoords.lineNum(pn2->pn_pos.begin); current->currentLine = parser->tokenStream.srcCoords.lineNum(pn2->pn_pos.begin);
current->lastColumn = 0; current->lastColumn = 0;
if (!reportStrictWarning(pn2, JSMSG_USELESS_EXPR)) if (!reportExtraWarning(pn2, JSMSG_USELESS_EXPR))
return false; return false;
} }
} }

2
js/src/frontend/BytecodeEmitter.h
View file

@ -388,7 +388,7 @@ struct MOZ_STACK_CLASS BytecodeEmitter
} }
bool reportError(ParseNode* pn, unsigned errorNumber, ...); bool reportError(ParseNode* pn, unsigned errorNumber, ...);
bool reportStrictWarning(ParseNode* pn, unsigned errorNumber, ...); bool reportExtraWarning(ParseNode* pn, unsigned errorNumber, ...);
bool reportStrictModeError(ParseNode* pn, unsigned errorNumber, ...); bool reportStrictModeError(ParseNode* pn, unsigned errorNumber, ...);
// If pn contains a useful expression, return true with *answer set to true. // If pn contains a useful expression, return true with *answer set to true.

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

@ -628,7 +628,7 @@ Parser<ParseHandler>::extraWarning(unsigned errorNumber, ...)
{ {
va_list args; va_list args;
va_start(args, errorNumber); va_start(args, errorNumber);
bool result = tokenStream.reportStrictWarningErrorNumberVA(pos().begin, errorNumber, args); bool result = tokenStream.reportExtraWarningErrorNumberVA(pos().begin, errorNumber, args);
va_end(args); va_end(args);
return result; return result;
} }
@ -675,7 +675,7 @@ Parser<ParseHandler>::reportNoOffset(ParseReportKind kind, bool strict, unsigned
tokenStream.reportCompileErrorNumberVA(offset, JSREPORT_WARNING, errorNumber, args); tokenStream.reportCompileErrorNumberVA(offset, JSREPORT_WARNING, errorNumber, args);
break; break;
case ParseExtraWarning: case ParseExtraWarning:
result = tokenStream.reportStrictWarningErrorNumberVA(offset, errorNumber, args); result = tokenStream.reportExtraWarningErrorNumberVA(offset, errorNumber, args);
break; break;
case ParseStrictError: case ParseStrictError:
result = tokenStream.reportStrictModeErrorNumberVA(offset, strict, errorNumber, args); result = tokenStream.reportStrictModeErrorNumberVA(offset, strict, errorNumber, args);

2
js/src/frontend/TokenStream.cpp
View file

@ -786,7 +786,7 @@ TokenStream::reportWarning(unsigned errorNumber, ...)
} }
bool bool
TokenStream::reportStrictWarningErrorNumberVA(uint32_t offset, unsigned errorNumber, va_list args) TokenStream::reportExtraWarningErrorNumberVA(uint32_t offset, unsigned errorNumber, va_list args)
{ {
if (!options().extraWarningsOption) if (!options().extraWarningsOption)
return true; return true;

3
js/src/frontend/TokenStream.h
View file

@ -375,8 +375,7 @@ class MOZ_STACK_CLASS TokenStream
va_list args); va_list args);
bool reportStrictModeErrorNumberVA(uint32_t offset, bool strictMode, unsigned errorNumber, bool reportStrictModeErrorNumberVA(uint32_t offset, bool strictMode, unsigned errorNumber,
va_list args); va_list args);
bool reportStrictWarningErrorNumberVA(uint32_t offset, unsigned errorNumber, bool reportExtraWarningErrorNumberVA(uint32_t offset, unsigned errorNumber, va_list args);
va_list args);
// asm.js reporter // asm.js reporter
void reportAsmJSError(uint32_t offset, unsigned errorNumber, ...); void reportAsmJSError(uint32_t offset, unsigned errorNumber, ...);