[new compiler] Fix a few more tests related to property declarations with initializers

Consistently declare the property first before processing the initializer tree or binding
statement. Some tests expect errors in the declaration to show up before errors in the
statement for example.

Change-Id: If66bc4969fe9db7ae32f00023f3c90343bbe98e0
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

1 files changed, 4 insertions, 7 deletions

diff --git a/src/qml/compiler/qqmlcodegenerator.cpp b/src/qml/compiler/qqmlcodegenerator.cpp
index cedbc92f8e..fe90f18db6 100644
--- a/src/qml/compiler/qqmlcodegenerator.cpp
+++ b/src/qml/compiler/qqmlcodegenerator.cpp
@@ -829,12 +829,7 @@ bool QQmlCodeGenerator::visit(QQmlJS::AST::UiPublicMember *node)
                  propertyValue += alias.at(2);
              }
              property->aliasPropertyValueIndex = registerString(propertyValue);
-        } else if (node->statement) {
-            qSwap(_propertyDeclaration, property);
-            appendBinding(node->identifierToken, node->identifierToken, _propertyDeclaration->nameIndex, node->statement);
-            qSwap(_propertyDeclaration, property);
         }
-
         QQmlJS::AST::SourceLocation errorLocation;
         QString error;
 
@@ -855,12 +850,14 @@ bool QQmlCodeGenerator::visit(QQmlJS::AST::UiPublicMember *node)
             return false;
         }
 
+        qSwap(_propertyDeclaration, property);
         if (node->binding) {
-            qSwap(_propertyDeclaration, property);
             // process QML-like initializers (e.g. property Object o: Object {})
             QQmlJS::AST::Node::accept(node->binding, this);
-            qSwap(_propertyDeclaration, property);
+        } else if (node->statement && type != QV4::CompiledData::Property::Alias) {
+            appendBinding(node->identifierToken, node->identifierToken, _propertyDeclaration->nameIndex, node->statement);
         }
+        qSwap(_propertyDeclaration, property);
     }
 
     return false;