From 2057696efa222c46d4301085a60818e569f1ac09 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Tue, 5 May 2009 17:46:18 +1000
Subject: Support simple nested property groups

---
 src/declarative/qml/qmlscriptparser.cpp | 94 ++++++++++++++++-----------------
 1 file changed, 47 insertions(+), 47 deletions(-)

diff --git a/src/declarative/qml/qmlscriptparser.cpp b/src/declarative/qml/qmlscriptparser.cpp
index a4cb199..aed17d6 100644
--- a/src/declarative/qml/qmlscriptparser.cpp
+++ b/src/declarative/qml/qmlscriptparser.cpp
@@ -200,72 +200,73 @@ Object *ProcessAST::defineObjectBinding_helper(int line,
 {
     bool isType = !objectType.isEmpty() && objectType.at(0).isUpper() && !objectType.contains(QLatin1Char('.'));
 
-    if (!isType) {
-        QmlError error;
-        error.setDescription("Expected type name");
-        error.setLine(typeLocation.startLine);
-        error.setColumn(typeLocation.startColumn);
-        _parser->_errors << error;
-        return false;
-    }
-
     int propertyCount = 0;
     for (; propertyName; propertyName = propertyName->next){
         ++propertyCount;
         _stateStack.pushProperty(propertyName->name->asString(), propertyName->identifierToken.startLine);
     }
 
-    // Class
-    const int typeId = _parser->findOrCreateTypeId(objectType);
+    if (!isType) {
 
-    Object *obj = new Object;
-    obj->type = typeId;
-    _scope.append(objectType);
-    obj->typeName = qualifiedNameId().toLatin1();
-    _scope.removeLast();
-    obj->line = line;
+        if(propertyCount || !currentObject()) {
+            QmlError error;
+            error.setDescription("Expected type name");
+            error.setLine(typeLocation.startLine);
+            error.setColumn(typeLocation.startColumn);
+            _parser->_errors << error;
+            return 0;
+        }
 
-    if (propertyCount) {
-        Property *prop = currentProperty();
-        Value *v = new Value;
-        v->object = obj;
-        v->line = line;
-        prop->addValue(v);
+        _stateStack.pushProperty(objectType, line);
+        accept(initializer);
+        _stateStack.pop();
 
-        while (propertyCount--)
-            _stateStack.pop();
+        return 0;
 
     } else {
 
-        if (! _parser->tree()) {
-            _parser->setTree(obj);
+        // Class
+        const int typeId = _parser->findOrCreateTypeId(objectType);
 
-            if (!_parser->scriptFile().isEmpty()) {
-                _stateStack.pushObject(obj);
-                Object *scriptObject= defineObjectBinding(line, 0, QLatin1String("Script"), AST::SourceLocation());
-                _stateStack.pushObject(scriptObject);
-                defineProperty(QLatin1String("src"), line, _parser->scriptFile());
-                _stateStack.pop(); // scriptObject
-                _stateStack.pop(); // object
-            }
+        Object *obj = new Object;
+        obj->type = typeId;
+        _scope.append(objectType);
+        obj->typeName = qualifiedNameId().toLatin1();
+        _scope.removeLast();
+        obj->line = line;
 
-        } else {
-            const State state = _stateStack.top();
+        if (propertyCount) {
+            Property *prop = currentProperty();
             Value *v = new Value;
             v->object = obj;
             v->line = line;
-            if (state.property)
-                state.property->addValue(v);
-            else
-                state.object->getDefaultProperty()->addValue(v);
+            prop->addValue(v);
+
+            while (propertyCount--)
+                _stateStack.pop();
+
+        } else {
+
+            if (! _parser->tree()) {
+                _parser->setTree(obj);
+            } else {
+                const State state = _stateStack.top();
+                Value *v = new Value;
+                v->object = obj;
+                v->line = line;
+                if (state.property)
+                    state.property->addValue(v);
+                else
+                    state.object->getDefaultProperty()->addValue(v);
+            }
         }
-    }
 
-    _stateStack.pushObject(obj);
-    accept(initializer);
-    _stateStack.pop();
+        _stateStack.pushObject(obj);
+        accept(initializer);
+        _stateStack.pop();
 
-    return obj;
+        return obj;
+    }
 }
 
 Object *ProcessAST::defineObjectBinding(int line,
@@ -656,7 +657,6 @@ void QmlScriptParser::clear()
     _nameSpacePaths.clear();
     _typeNames.clear();
     _errors.clear();
-    _scriptFile.clear();
 }
 
 int QmlScriptParser::findOrCreateTypeId(const QString &name)
-- 
cgit v0.12