aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/qmljs/jsoncheck.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs/qmljs/jsoncheck.cpp')
-rw-r--r--src/libs/qmljs/jsoncheck.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/libs/qmljs/jsoncheck.cpp b/src/libs/qmljs/jsoncheck.cpp
index c6c455a760..d712b843df 100644
--- a/src/libs/qmljs/jsoncheck.cpp
+++ b/src/libs/qmljs/jsoncheck.cpp
@@ -100,8 +100,9 @@ bool JsonCheck::visit(ObjectLiteral *ast)
return false;
QSet<QString> propertiesFound;
- for (PropertyNameAndValueList *it = ast->properties; it; it = it->next) {
- StringLiteralPropertyName *literalName = cast<StringLiteralPropertyName *>(it->name);
+ for (PropertyAssignmentList *it = ast->properties; it; it = it->next) {
+ PropertyNameAndValue *assignment = AST::cast<AST::PropertyNameAndValue *>(it->assignment);
+ StringLiteralPropertyName *literalName = cast<StringLiteralPropertyName *>(assignment->name);
if (literalName) {
const QString &propertyName = literalName->id.toString();
if (m_schema->hasPropertySchema(propertyName)) {
@@ -109,7 +110,7 @@ bool JsonCheck::visit(ObjectLiteral *ast)
propertiesFound.insert(propertyName);
// Sec. 5.2: "... each property definition's value MUST be a schema..."
m_schema->enterNestedPropertySchema(propertyName);
- processSchema(it->value);
+ processSchema(assignment->value);
m_schema->leaveNestedSchema();
} else {
analysis()->m_messages.append(Message(ErrInvalidPropertyName,
@@ -119,7 +120,7 @@ bool JsonCheck::visit(ObjectLiteral *ast)
}
} else {
analysis()->m_messages.append(Message(ErrStringValueExpected,
- it->name->firstSourceLocation(),
+ assignment->name->firstSourceLocation(),
QString(), QString(),
false));
}