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

Simplify increment/decrement operand checking.

Browse source
This commit is contained in:
wolfbeast 2019-04-06 10:56:39 +02:00 • committed by Roy Tam
commit fd2042225e
3 changed files with 20 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7834,20 +7834,18 @@ Parser<ParseHandler>::reportIfNotValidSimpleAssignmentTarget(Node target, Assign
template <typename ParseHandler>
bool
Parser<ParseHandler>::checkAndMarkAsIncOperand(Node target, AssignmentFlavor flavor)
Parser<ParseHandler>::checkAndMarkAsIncOperand(Node target)
{
MOZ_ASSERT(flavor == IncrementAssignment || flavor == DecrementAssignment);
// Check.
if (!reportIfNotValidSimpleAssignmentTarget(target, flavor))
return false;
// Mark.
if (handler.isNameAnyParentheses(target)) {
// Assignment to arguments/eval is allowed outside strict mode code,
// but it's dodgy. Report a strict warning (error, if werror was set).
if (!reportIfArgumentsEvalTarget(target))
return false;
if (const char* chars = handler.nameIsArgumentsEvalAnyParentheses(target, context)) {
if (!reportWithNode(ParseStrictError, pc->sc()->strict(), target,
JSMSG_BAD_STRICT_ASSIGN, chars))
{
return false;
}
}
} else if (handler.isPropertyAccess(target)) {
// Permitted: no additional testing/fixup needed.
} else if (handler.isFunctionCall(target)) {
// Assignment to function calls is forbidden in ES6. We're still
// somewhat concerned about sites using this in dead code, so forbid it
@ -7855,7 +7853,13 @@ Parser<ParseHandler>::checkAndMarkAsIncOperand(Node target, AssignmentFlavor fla
// otherwise warn.
if (!reportWithNode(ParseStrictError, pc->sc()->strict(), target, JSMSG_BAD_INCOP_OPERAND))
return false;
} else {
reportWithNode(ParseError, pc->sc()->strict(), target, JSMSG_BAD_INCOP_OPERAND);
return false;
}
MOZ_ASSERT(isValidSimpleAssignmentTarget(target, PermitAssignmentToFunctionCalls),
"inconsistent increment/decrement operand validation");
return true;
}
@ -7922,8 +7926,7 @@ Parser<ParseHandler>::unaryExpr(YieldHandling yieldHandling, TripledotHandling t
Node pn2 = memberExpr(yieldHandling, TripledotProhibited, tt2);
if (!pn2)
return null();
AssignmentFlavor flavor = (tt == TOK_INC) ? IncrementAssignment : DecrementAssignment;
if (!checkAndMarkAsIncOperand(pn2, flavor))
if (!checkAndMarkAsIncOperand(pn2))
return null();
return handler.newUpdate((tt == TOK_INC) ? PNK_PREINCREMENT : PNK_PREDECREMENT,
begin,
@ -7977,8 +7980,7 @@ Parser<ParseHandler>::unaryExpr(YieldHandling yieldHandling, TripledotHandling t
return null();
if (tt == TOK_INC || tt == TOK_DEC) {
tokenStream.consumeKnownToken(tt);
AssignmentFlavor flavor = (tt == TOK_INC) ? IncrementAssignment : DecrementAssignment;
if (!checkAndMarkAsIncOperand(pn, flavor))
if (!checkAndMarkAsIncOperand(pn))
return null();
return handler.newUpdate((tt == TOK_INC) ? PNK_POSTINCREMENT : PNK_POSTDECREMENT,
begin,