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

QmlJS checks: Disable warnings about expression statements in bindings.

Browse Source 
Change-Id: Ic3aca50bec93ec3b810dbda2f9b57eefb966bbdf
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
This commit is contained in:
Christian Kamm
2011-12-02 10:41:13 +01:00
parent dc72cff71a
commit 37bcdcf4f0
4 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/libs/qmljs/qmljscheck.cpp
View File

@@ -514,6 +514,7 @@ Check::Check(Document::Ptr doc, const ContextPtr &context)
, _scopeBuilder(&_scopeChain)
, _lastValue(0)
, _importsOk(false)
, _inStatementBinding(false)
{
const Imports *imports = context->imports(doc.data());
if (imports && !imports->importFailed())
@@ -736,7 +737,9 @@ bool Check::visit(UiScriptBinding *ast)
Node::accept(ast->qualifiedId, this);
_scopeBuilder.push(ast);
_inStatementBinding = true;
Node::accept(ast->statement, this);
_inStatementBinding = false;
_scopeBuilder.pop();
return false;
@@ -791,7 +794,9 @@ bool Check::visit(UiPublicMember *ast)
checkBindingRhs(ast->statement);
_scopeBuilder.push(ast);
_inStatementBinding = true;
Node::accept(ast->statement, this);
_inStatementBinding = false;
Node::accept(ast->binding, this);
_scopeBuilder.pop();
}
@@ -866,9 +871,14 @@ bool Check::visit(FunctionExpression *ast)
addMessages(unreachableCheck(ast->body));
Node::accept(ast->formals, this);
const bool wasInStatementBinding = _inStatementBinding;
_inStatementBinding = false;
_scopeBuilder.push(ast);
Node::accept(ast->body, this);
_scopeBuilder.pop();
_inStatementBinding = wasInStatementBinding;
return false;
}
@@ -1027,20 +1037,7 @@ bool Check::visit(ExpressionStatement *ast)
}
}
if (!ok) {
for (int i = 0; Node *p = parent(i); ++i) {
if (UiScriptBinding *binding = cast<UiScriptBinding *>(p)) {
if (!cast<Block *>(binding->statement)) {
ok = true;
break;
}
}
if (UiPublicMember *member = cast<UiPublicMember *>(p)) {
if (!cast<Block *>(member->statement)) {
ok = true;
break;
}
}
}
ok = _inStatementBinding;
}
if (!ok) {