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

Bug 1130785 - Fix JS_HAS_EXPR_CLOSURES macro conditions. r=shu

Browse Source
This commit is contained in:
Tooru Fujisawa 2015-02-10 17:06:07 +09:00
parent 76ba7c056a
commit 23cacd3c1d
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1040,7 +1040,6 @@ Parser<ParseHandler>::functionBody(FunctionSyntaxKind kind, FunctionBodyType typ
return null();
} else {
MOZ_ASSERT(type == ExpressionBody);
MOZ_ASSERT(JS_HAS_EXPR_CLOSURES);
Node kid = assignExpr();
if (!kid)
@ -2553,12 +2552,20 @@ Parser<ParseHandler>::functionArgsAndBodyGeneric(Node pn, HandleFunction fun, Fu
return false;
}
if (kind != Arrow)
if (kind != Arrow) {
#if JS_HAS_EXPR_CLOSURES
sawDeprecatedExpressionClosure = true;
#else
report(ParseError, false, null(), JSMSG_CURLY_BEFORE_BODY);
return false;
#endif
}
tokenStream.ungetToken();
bodyType = ExpressionBody;
#if JS_HAS_EXPR_CLOSURES
fun->setIsExprClosure();
#endif
}
Node body = functionBody(kind, bodyType);
@ -2568,9 +2575,7 @@ Parser<ParseHandler>::functionArgsAndBodyGeneric(Node pn, HandleFunction fun, Fu
if (fun->name() && !checkStrictBinding(fun->name(), pn))
return false;
#if JS_HAS_EXPR_CLOSURES
if (bodyType == StatementListBody) {
#endif
bool matched;
if (!tokenStream.matchToken(&matched, TOK_RC))
return false;
@ -2579,15 +2584,16 @@ Parser<ParseHandler>::functionArgsAndBodyGeneric(Node pn, HandleFunction fun, Fu
return false;
}
funbox->bufEnd = pos().begin + 1;
#if JS_HAS_EXPR_CLOSURES
} else {
#if not JS_HAS_EXPR_CLOSURES
MOZ_ASSERT(kind == Arrow);
#endif
if (tokenStream.hadError())
return false;
funbox->bufEnd = pos().end;
if (kind == Statement && !MatchOrInsertSemicolon(tokenStream))
return false;
}
#endif
return finishFunctionDefinition(pn, funbox, prelude, body);
}