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

QmlJS checks: Correct the check for dangerous == and add tests.

Browse Source 
Change-Id: Ie0f4062069bf241020868af34ce6d36146b4b0c7
Reviewed-on: http://codereview.qt-project.org/4646
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
This commit is contained in:
Christian Kamm
2011-09-12 10:44:11 +02:00
parent 97ad582c28
commit 367e27cde7
4 changed files with 78 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -895,22 +895,24 @@ bool Check::visit(FunctionExpression *ast)
return false;
}
static bool shouldAvoidNonStrictEqualityCheck(ExpressionNode *exp, const Value *other)
static bool shouldAvoidNonStrictEqualityCheck(const Value *lhs, const Value *rhs)
{
if (NumericLiteral *literal = cast<NumericLiteral *>(exp)) {
if (literal->value == 0 && !other->asNumberValue())
return true;
} else if ((cast<TrueLiteral *>(exp) || cast<FalseLiteral *>(exp)) && !other->asBooleanValue()) {
// we currently use undefined as a "we don't know" value
if (lhs->asUndefinedValue() || rhs->asUndefinedValue())
return true;
} else if (cast<NullExpression *>(exp)) {
return true;
} else if (IdentifierExpression *ident = cast<IdentifierExpression *>(exp)) {
if (ident->name && ident->name->asString() == QLatin1String("undefined"))
return true;
} else if (StringLiteral *literal = cast<StringLiteral *>(exp)) {
if ((!literal->value || literal->value->asString().isEmpty()) && !other->asStringValue())
return true;
}
if (lhs->asStringValue() && rhs->asNumberValue())
return true; // coerces string to number
if (lhs->asObjectValue() && rhs->asNumberValue())
return true; // coerces object to primitive
if (lhs->asObjectValue() && rhs->asStringValue())
return true; // coerces object to primitive
if (lhs->asBooleanValue() && !rhs->asBooleanValue())
return true; // coerces bool to number
return false;
}
@@ -922,8 +924,8 @@ bool Check::visit(BinaryExpression *ast)
Evaluate eval(&_scopeChain);
const Value *lhs = eval(ast->left);
const Value *rhs = eval(ast->right);
warn = shouldAvoidNonStrictEqualityCheck(ast->left, rhs)
|| shouldAvoidNonStrictEqualityCheck(ast->right, lhs);
warn = shouldAvoidNonStrictEqualityCheck(lhs, rhs)
|| shouldAvoidNonStrictEqualityCheck(rhs, lhs);
}
if (warn) {
warning(ast->operatorToken, tr("== and != perform type coercion, use === or !== instead to avoid"));