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 616294 - Adjust terminology concerning tree contexts from 'top level' to 'body level'. The meaning was at the top level of a Program *or* at top level of a FunctionBody, but this meaning arguably conflicted with the expected one, so we have renamed it to something roughly as clear without potential for misunderstanding. r=brendan

Browse Source 
--HG--
extra : rebase_source : ff240f3e1ef8fa61963dea2f0be34b7d35b96b28
This commit is contained in:
Jeff Walden 2010-12-10 16:31:40 -08:00
parent ade082778d
commit aec6dde41e
2 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/src/jsemit.h
View File

@ -365,7 +365,15 @@ struct JSTreeContext { /* tree context for semantic checks */
return blockChainBox ? blockChainBox->object : NULL; return blockChainBox ? blockChainBox->object : NULL;
} }
bool atTopLevel() { return !topStmt || (topStmt->flags & SIF_BODY_BLOCK); } /*
* True if we are at the topmost level of a entire script or function body.
* For example, while parsing this code we would encounter f1 and f2 at
* body level, but we would not encounter f3 or f4 at body level:
*
* function f1() { function f2() { } }
* if (cond) { function f3() { if (cond) { function f4() { } } } }
*/
bool atBodyLevel() { return !topStmt || (topStmt->flags & SIF_BODY_BLOCK); }
/* Test whether we're in a statement of given type. */ /* Test whether we're in a statement of given type. */
bool inStatement(JSStmtType type); bool inStatement(JSStmtType type);

42
js/src/jsparse.cpp
View File

@ -2866,12 +2866,12 @@ Parser::functionDef(JSAtom *funAtom, FunctionType type, uintN lambda)
* If a lambda, give up on JSOP_{GET,CALL}UPVAR usage unless this function * If a lambda, give up on JSOP_{GET,CALL}UPVAR usage unless this function
* is immediately applied (we clear PND_FUNARG if so -- see memberExpr). * is immediately applied (we clear PND_FUNARG if so -- see memberExpr).
* *
* Also treat function sub-statements (non-lambda, non-top-level functions) * Treat function sub-statements (non-lambda, non-body-level functions) as
* as escaping funargs, since we can't statically analyze their definitions * escaping funargs, since we can't statically analyze their definitions
* and uses. * and uses.
*/ */
bool topLevel = tc->atTopLevel(); bool bodyLevel = tc->atBodyLevel();
pn->pn_dflags = (lambda || !topLevel) ? PND_FUNARG : 0; pn->pn_dflags = (lambda || !bodyLevel) ? PND_FUNARG : 0;
/* /*
* Record names for function statements in tc->decls so we know when to * Record names for function statements in tc->decls so we know when to
@ -2899,7 +2899,7 @@ Parser::functionDef(JSAtom *funAtom, FunctionType type, uintN lambda)
} }
} }
if (topLevel) { if (bodyLevel) {
ALE_SET_DEFN(ale, pn); ALE_SET_DEFN(ale, pn);
pn->pn_defn = true; pn->pn_defn = true;
pn->dn_uses = dn; /* dn->dn_uses is now pn_link */ pn->dn_uses = dn; /* dn->dn_uses is now pn_link */
@ -2907,7 +2907,7 @@ Parser::functionDef(JSAtom *funAtom, FunctionType type, uintN lambda)
if (!MakeDefIntoUse(dn, pn, funAtom, tc)) if (!MakeDefIntoUse(dn, pn, funAtom, tc))
return NULL; return NULL;
} }
} else if (topLevel) { } else if (bodyLevel) {
/* /*
* If this function was used before it was defined, claim the * If this function was used before it was defined, claim the
* pre-created definition node for this function that primaryExpr * pre-created definition node for this function that primaryExpr
@ -2943,7 +2943,7 @@ Parser::functionDef(JSAtom *funAtom, FunctionType type, uintN lambda)
* when jsemit.cpp's BindNameToSlot can optimize a JSOP_NAME into a * when jsemit.cpp's BindNameToSlot can optimize a JSOP_NAME into a
* JSOP_GETLOCAL bytecode). * JSOP_GETLOCAL bytecode).
*/ */
if (topLevel && tc->inFunction()) { if (bodyLevel && tc->inFunction()) {
/* /*
* Define a local in the outer function so that BindNameToSlot * Define a local in the outer function so that BindNameToSlot
* can properly optimize accesses. Note that we need a local * can properly optimize accesses. Note that we need a local
@ -3099,11 +3099,12 @@ Parser::functionDef(JSAtom *funAtom, FunctionType type, uintN lambda)
outertc->flags |= TCF_FUN_HEAVYWEIGHT; outertc->flags |= TCF_FUN_HEAVYWEIGHT;
} else { } else {
/* /*
* If this function is a named statement function not at top-level * If this function is not at body level of a program or function (i.e.
* (i.e. not a top-level function definiton or expression), then our * it is a function statement that is not a direct child of a program
* enclosing function, if any, must be heavyweight. * or function), then our enclosing function, if any, must be
* heavyweight.
*/ */
if (!topLevel && lambda == 0 && funAtom) if (!bodyLevel && lambda == 0 && funAtom)
outertc->flags |= TCF_FUN_HEAVYWEIGHT; outertc->flags |= TCF_FUN_HEAVYWEIGHT;
} }
@ -3129,7 +3130,7 @@ Parser::functionDef(JSAtom *funAtom, FunctionType type, uintN lambda)
result->pn_pos = pn->pn_pos; result->pn_pos = pn->pn_pos;
result->pn_kid = pn; result->pn_kid = pn;
op = JSOP_LAMBDA; op = JSOP_LAMBDA;
} else if (!topLevel) { } else if (!bodyLevel) {
/* /*
* ECMA ed. 3 extension: a function expression statement not at the * ECMA ed. 3 extension: a function expression statement not at the
* top level, e.g., in a compound statement such as the "then" part * top level, e.g., in a compound statement such as the "then" part
@ -3151,8 +3152,7 @@ Parser::functionDef(JSAtom *funAtom, FunctionType type, uintN lambda)
pn->pn_body = body; pn->pn_body = body;
} }
if (!outertc->inFunction() && topLevel && funAtom && !lambda && if (!outertc->inFunction() && bodyLevel && funAtom && !lambda && outertc->compiling()) {
outertc->compiling()) {
JS_ASSERT(pn->pn_cookie.isFree()); JS_ASSERT(pn->pn_cookie.isFree());
if (!DefineGlobal(pn, outertc->asCodeGenerator(), funAtom)) if (!DefineGlobal(pn, outertc->asCodeGenerator(), funAtom))
return false; return false;
@ -3276,7 +3276,7 @@ Parser::statements()
saveBlock = tc->blockNode; saveBlock = tc->blockNode;
tc->blockNode = pn; tc->blockNode = pn;
bool inDirectivePrologue = tc->atTopLevel(); bool inDirectivePrologue = tc->atBodyLevel();
tokenStream.setOctalCharacterEscape(false); tokenStream.setOctalCharacterEscape(false);
for (;;) { for (;;) {
tt = tokenStream.peekToken(TSF_OPERAND); tt = tokenStream.peekToken(TSF_OPERAND);
@ -3300,15 +3300,15 @@ Parser::statements()
if (pn2->pn_type == TOK_FUNCTION) { if (pn2->pn_type == TOK_FUNCTION) {
/* /*
* PNX_FUNCDEFS notifies the emitter that the block contains top- * PNX_FUNCDEFS notifies the emitter that the block contains body-
* level function definitions that should be processed before the * level function definitions that should be processed before the
* rest of nodes. * rest of nodes.
* *
* TCF_HAS_FUNCTION_STMT is for the TOK_LC case in Statement. It * TCF_HAS_FUNCTION_STMT is for the TOK_LC case in Statement. It
* is relevant only for function definitions not at top-level, * is relevant only for function definitions not at body-level,
* which we call function statements. * which we call function statements.
*/ */
if (tc->atTopLevel()) if (tc->atBodyLevel())
pn->pn_xflags |= PNX_FUNCDEFS; pn->pn_xflags |= PNX_FUNCDEFS;
else else
tc->flags |= TCF_HAS_FUNCTION_STMT; tc->flags |= TCF_HAS_FUNCTION_STMT;
@ -3378,10 +3378,10 @@ BindLet(JSContext *cx, BindData *data, JSAtom *atom, JSTreeContext *tc)
jsint n; jsint n;
/* /*
* Top-level 'let' is the same as 'var' currently -- this may change in a * Body-level 'let' is the same as 'var' currently -- this may change in a
* successor standard to ES3.1 that specifies 'let'. * successor standard to ES5 that specifies 'let'.
*/ */
JS_ASSERT(!tc->atTopLevel()); JS_ASSERT(!tc->atBodyLevel());
pn = data->pn; pn = data->pn;
if (!CheckStrictBinding(cx, tc, atom, pn)) if (!CheckStrictBinding(cx, tc, atom, pn))