From feacbf8a2aba95c47790dc6f0133a8976ada9cc8 Mon Sep 17 00:00:00 2001
From: Christian Kamm <christian.d.kamm@nokia.com>
Date: Tue, 23 Feb 2010 14:55:38 +0100
Subject: [PATCH] Check that the id property is a plain lowercase identifier.
---
src/libs/qmljs/qmljscheck.cpp | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp
index 7322d1f8f39..8269f92c893 100644
--- a/src/libs/qmljs/qmljscheck.cpp
+++ b/src/libs/qmljs/qmljscheck.cpp
@@ -144,6 +144,32 @@ void Check::errorOnWrongRhs(const SourceLocation &loc, const Value *lhsValue)
bool Check::visit(UiScriptBinding *ast)
{
+ // special case for id property
+ if (ast->qualifiedId->name->asString() == QLatin1String("id") && ! ast->qualifiedId->next) {
+ if (! ast->statement)
+ return false;
+
+ const SourceLocation loc = locationFromRange(ast->statement->firstSourceLocation(),
+ ast->statement->lastSourceLocation());
+
+ ExpressionStatement *expStmt = cast<ExpressionStatement *>(ast->statement);
+ if (!expStmt) {
+ error(loc, QCoreApplication::translate("QmlJS::Check", "expected id"));
+ return false;
+ }
+
+ IdentifierExpression *idExp = cast<IdentifierExpression *>(expStmt->expression);
+ if (! idExp) {
+ error(loc, QCoreApplication::translate("QmlJS::Check", "expected id"));
+ return false;
+ }
+
+ if (! idExp->name->asString()[0].isLower()) {
+ error(loc, QCoreApplication::translate("QmlJS::Check", "ids must be lower case"));
+ return false;
+ }
+ }
+
const Value *lhsValue = checkScopeObjectMember(ast->qualifiedId);
if (lhsValue) {
// ### Fix the evaluator to accept statements!
--
GitLab