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 1179063 - Cleanup: Rename scopal back to scopeStmt. (r=me)

Browse Source
This commit is contained in:
Shu-yu Guo 2015-07-30 22:17:04 -07:00
parent 6a0c305653
commit 11e50a4dcb
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/frontend/BytecodeEmitter.cpp
View File

@ -930,7 +930,7 @@ BytecodeEmitter::enterNestedScope(StmtInfoBCE* stmt, ObjectBox* objbox, StmtType
pushStatement(stmt, stmtType, offset());
scopeObj->initEnclosingNestedScope(enclosingStaticScope());
stmtStack.linkAsInnermostScopal(stmt, *scopeObj);
stmtStack.linkAsInnermostScopeStmt(stmt, *scopeObj);
MOZ_ASSERT(stmt->linksScope());
stmt->isBlockScope = (stmtType == StmtType::BLOCK);

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

@ -220,7 +220,7 @@ struct BytecodeEmitter
bool updateLocalsToFrameSlots();
StmtInfoBCE* innermostStmt() const { return stmtStack.innermost(); }
StmtInfoBCE* innermostScopeStmt() const { return stmtStack.innermostScopal(); }
StmtInfoBCE* innermostScopeStmt() const { return stmtStack.innermostScopeStmt(); }
bool isAliasedName(ParseNode* pn);

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

@ -287,7 +287,7 @@ struct ParseContext : public GenericParseContext
unsigned blockid() { return stmtStack.innermost() ? stmtStack.innermost()->blockid : bodyid; }
StmtInfoPC* innermostStmt() const { return stmtStack.innermost(); }
StmtInfoPC* innermostScopeStmt() const { return stmtStack.innermostScopal(); }
StmtInfoPC* innermostScopeStmt() const { return stmtStack.innermostScopeStmt(); }
// 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

10
js/src/frontend/SharedContext.h
View File

@ -567,7 +567,7 @@ class MOZ_STACK_CLASS StmtInfoStack
{ }
StmtInfo* innermost() const { return innermostStmt_; }
StmtInfo* innermostScopal() const { return innermostScopeStmt_; }
StmtInfo* innermostScopeStmt() const { return innermostScopeStmt_; }
void push(StmtInfo* stmt, StmtType type) {
stmt->type = type;
@ -582,7 +582,7 @@ class MOZ_STACK_CLASS StmtInfoStack
void pushNestedScope(StmtInfo* stmt, StmtType type, NestedScopeObject& staticScope) {
push(stmt, type);
linkAsInnermostScopal(stmt, staticScope);
linkAsInnermostScopeStmt(stmt, staticScope);
}
void pop() {
@ -592,8 +592,8 @@ class MOZ_STACK_CLASS StmtInfoStack
innermostScopeStmt_ = stmt->enclosingScope;
}
void linkAsInnermostScopal(StmtInfo* stmt, NestedScopeObject& staticScope) {
MOZ_ASSERT(stmt != innermostScopal());
void linkAsInnermostScopeStmt(StmtInfo* stmt, NestedScopeObject& staticScope) {
MOZ_ASSERT(stmt != innermostScopeStmt_);
MOZ_ASSERT(!stmt->enclosingScope);
stmt->enclosingScope = innermostScopeStmt_;
innermostScopeStmt_ = stmt;
@ -604,7 +604,7 @@ class MOZ_STACK_CLASS StmtInfoStack
MOZ_ASSERT(!innermostStmt_->isBlockScope);
MOZ_ASSERT(innermostStmt_->canBeBlockScope());
innermostStmt_->isBlockScope = true;
linkAsInnermostScopal(innermostStmt_, blockObj);
linkAsInnermostScopeStmt(innermostStmt_, blockObj);
}
};