wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset 79466a3087b1 (bug 1167845)

Browse Source
This commit is contained in:
Wes Kocher 2015-06-01 18:23:48 -07:00
parent 7e8fa96db9
commit ac82bda464
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/frontend/FullParseHandler.h
View File

@ -776,7 +776,7 @@ class FullParseHandler
bool isConstant(ParseNode* pn) {
return pn->isConstant();
}
PropertyName* maybeName(ParseNode* pn) {
PropertyName* isName(ParseNode* pn) {
return pn->isKind(PNK_NAME) ? pn->pn_atom->asPropertyName() : nullptr;
}
bool isCall(ParseNode* pn) {

16
js/src/frontend/Parser.cpp
View File

@ -5107,7 +5107,7 @@ Parser<SyntaxParseHandler>::forStatement(YieldHandling yieldHandling)
/* Check that the left side of the 'in' or 'of' is valid. */
if (!isForDecl &&
!handler.maybeName(lhsNode) &&
!handler.isName(lhsNode) &&
!handler.isPropertyAccess(lhsNode))
{
JS_ALWAYS_FALSE(abortIfSyntaxParser());
@ -6414,7 +6414,7 @@ Parser<ParseHandler>::checkAndMarkAsAssignmentLhs(Node target, AssignmentFlavor
if (handler.isPropertyAccess(target))
return true;
if (handler.maybeName(target)) {
if (handler.isName(target)) {
// The arguments/eval identifiers are simple in non-strict mode code,
// but warn to discourage use nonetheless.
if (!reportIfArgumentsEvalTarget(target))
@ -6565,7 +6565,7 @@ template <typename ParseHandler>
bool
Parser<ParseHandler>::isValidSimpleAssignmentTarget(Node node)
{
if (PropertyName* name = handler.maybeName(node)) {
if (PropertyName* name = handler.isName(node)) {
// Note that we implement *exactly* the ES6 semantics here. Warning
// for arguments/eval when extraWarnings is set isn't handled here.
if (!pc->sc->strict())
@ -6583,7 +6583,7 @@ template <typename ParseHandler>
bool
Parser<ParseHandler>::reportIfArgumentsEvalTarget(Node target)
{
PropertyName* name = handler.maybeName(target);
PropertyName* name = handler.isName(target);
if (!name)
return true;
@ -6656,7 +6656,7 @@ Parser<ParseHandler>::checkAndMarkAsIncOperand(Node target, AssignmentFlavor fla
return false;
// Mark.
if (handler.maybeName(target)) {
if (handler.isName(target)) {
handler.markAsAssigned(target);
} else if (handler.isFunctionCall(target)) {
if (!makeSetCall(target, JSMSG_BAD_INCOP_OPERAND))
@ -6742,7 +6742,7 @@ Parser<ParseHandler>::unaryExpr(YieldHandling yieldHandling, InvokedPrediction i
// Per spec, deleting any unary expression is valid -- it simply
// returns true -- except for one case that is illegal in strict mode.
if (handler.maybeName(expr)) {
if (handler.isName(expr)) {
if (!report(ParseStrictError, pc->sc->strict(), expr, JSMSG_DEPRECATED_DELETE_OPERAND))
return null();
pc->sc->setBindingsAccessedDynamically();
@ -7983,8 +7983,8 @@ Parser<ParseHandler>::memberExpr(YieldHandling yieldHandling, TokenKind tt, bool
return null();
JSOp op = JSOP_CALL;
if (PropertyName* name = handler.maybeName(lhs)) {
if (tt == TOK_LP && name == context->names().eval) {
if (JSAtom* atom = handler.isName(lhs)) {
if (tt == TOK_LP && atom == context->names().eval) {
/* Select JSOP_EVAL and flag pc as heavyweight. */
op = pc->sc->strict() ? JSOP_STRICTEVAL : JSOP_EVAL;
pc->sc->setBindingsAccessedDynamically();

2
js/src/frontend/SyntaxParseHandler.h
View File

@ -421,7 +421,7 @@ class SyntaxParseHandler
void setPrologue(Node pn) {}
bool isConstant(Node pn) { return false; }
PropertyName* maybeName(Node pn) {
PropertyName* isName(Node pn) {
if (pn == NodeName || pn == NodeArgumentsName || pn == NodeEvalName)
return lastAtom->asPropertyName();
return nullptr;