feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJS: Fix binding and scoping function expressions.

Browse Source 
Reviewed-by: Erik Verbruggen
This commit is contained in:
Christian Kamm
2010-11-24 14:42:10 +01:00
parent 5dd92328fb
commit 05831a8ea5
3 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libs/qmljs/qmljsscopebuilder.cpp
View File

@@ -61,8 +61,8 @@ void ScopeBuilder::push(AST::Node *node)
if (qmlObject)
setQmlScopeObject(qmlObject);
// JS scopes
if (FunctionDeclaration *fun = cast<FunctionDeclaration *>(node)) {
// JS scopes (catch both, FunctionExpression and FunctionDeclaration)
if (FunctionExpression *fun = dynamic_cast<FunctionExpression *>(node)) {
ObjectValue *functionScope = _doc->bind()->findFunctionScope(fun);
if (functionScope)
_context->scopeChain().jsScopes += functionScope;
@@ -83,8 +83,10 @@ void ScopeBuilder::pop()
_nodes.removeLast();
// JS scopes
if (cast<FunctionDeclaration *>(toRemove))
_context->scopeChain().jsScopes.removeLast();
if (FunctionExpression *fun = dynamic_cast<FunctionExpression *>(toRemove)) {
if (_doc->bind()->findFunctionScope(fun))
_context->scopeChain().jsScopes.removeLast();
}
// QML scope object
if (! _nodes.isEmpty()