Drop qmlobjdef, support dot syntax in qmlprop.

akreuzkamp · ChALkeR · commit 6e5bf1ca2eac · 2016-08-24T03:35:45.000+04:00
qmlobjdef supported only two components, a different format was needed to support assignments like Drag.hotSpot.x: width / 2. Now names with dot-syntax are parsed just like they are in pure js, so we now get nested dot-binary-expressions. PR-URL: #19 Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com>
diff --git a/src/api.js b/src/api.js
@@ -177,8 +177,11 @@ function qmlweb_parse($TEXT, document_type, exigent_mode) {
     return expr;
   }
 
-  function qml_is_element(str) {
-    return str[0].toUpperCase() == str[0];
+  function qml_is_element(name) {
+    if (typeof name === "string") {
+        return name[0].toUpperCase() === name[0];
+    }
+    return qml_is_element(name[1]) && name[2][0].toUpperCase() === name[2][0];
   }
 
   function qmlblock() {
@@ -273,24 +276,13 @@ function qmlweb_parse($TEXT, document_type, exigent_mode) {
         return qmlsignaldef();
       }
     } else if (S.token.type == "name") {
-      var propname = S.token.value;
-      next();
-      if (propname == "property" && (S.token.type == "name" || S.token.value == "var")) {
-        return qmlpropdef();
-      } else if (is("punc", ".")) { // property statement
-        // anchors, fonts etc, a.b: statement;
-        // Can also be Component.onCompleted: ...
-        // Assume only one subproperty
+      if (S.token.value == "property" && (S.token.type == "name" || S.token.value == "var")) {
         next();
-        var subname = S.token.value;
-        next();
-        /* Check for ModuleQualifier.QMLElement */
-        if (qml_is_element(subname)) {
-          return as("qmlelem", propname + "." + subname, undefined, qmlblock());
-        }
-        expect(":");
-        return as_statement("qmlobjdef", propname, subname);
-      } else if (qml_is_element(propname)) {
+        return qmlpropdef();
+      }
+
+      var propname = subscripts(as_name(), false);
+      if (qml_is_element(propname)) {
         // Element
         var onProp;
         if (is("name", "on")) {
diff --git a/tests/qml/Children.qml.json b/tests/qml/Children.qml.json
@@ -161,9 +161,12 @@
             "30\n    "
           ],
           [
-            "qmlobjdef",
-            "border",
-            "width",
+            "qmlprop",
+            [
+              "dot",
+              "border",
+              "width"
+            ],
             [
               "stat",
               [
@@ -177,4 +180,4 @@
       ]
     ]
   ]
-]
+]
diff --git a/tests/qml/Drag.qml b/tests/qml/Drag.qml
diff --git a/tests/qml/Drag.qml.json b/tests/qml/Drag.qml.json
@@ -0,0 +1,99 @@
+[
+  "toplevel",
+  [
+    [
+      "qmlimport",
+      "QtQuick",
+      2,
+      "",
+      true
+    ]
+  ],
+  [
+    "qmlelem",
+    "Rectangle",
+    null,
+    [
+      [
+        "qmlprop",
+        "width",
+        [
+          "stat",
+          [
+            "num",
+            100
+          ]
+        ],
+        "100\n  "
+      ],
+      [
+        "qmlprop",
+        "height",
+        [
+          "stat",
+          [
+            "num",
+            100
+          ]
+        ],
+        "100\n\n  "
+      ],
+      [
+        "qmlprop",
+        [
+          "dot",
+          [
+            "dot",
+            "Drag",
+            "hotSpot"
+          ],
+          "x"
+        ],
+        [
+          "stat",
+          [
+            "binary",
+            "/",
+            [
+              "name",
+              "width"
+            ],
+            [
+              "num",
+              2
+            ]
+          ]
+        ],
+        "width / 2\n  "
+      ],
+      [
+        "qmlprop",
+        [
+          "dot",
+          [
+            "dot",
+            "Drag",
+            "hotSpot"
+          ],
+          "y"
+        ],
+        [
+          "stat",
+          [
+            "binary",
+            "/",
+            [
+              "name",
+              "height"
+            ],
+            [
+              "num",
+              2
+            ]
+          ]
+        ],
+        "height / 2\n"
+      ]
+    ]
+  ]
+]
diff --git a/tests/qml/ImportsNamed.qml.json b/tests/qml/ImportsNamed.qml.json
@@ -25,8 +25,12 @@
   ],
   [
     "qmlelem",
-    "DOM.Div",
+    [
+      "dot",
+      "DOM",
+      "Div"
+    ],
     null,
     []
   ]
-]
+]
diff --git a/tests/qml/Properties.qml.json b/tests/qml/Properties.qml.json
@@ -51,9 +51,12 @@
         "'green'\n  "
       ],
       [
-        "qmlobjdef",
-        "border",
-        "width",
+        "qmlprop",
+        [
+          "dot",
+          "border",
+          "width"
+        ],
         [
           "stat",
           [
@@ -140,4 +143,4 @@
       ]
     ]
   ]
-]
+]

Original file line number	Diff line number	Diff line change
`@@ -161,9 +161,12 @@`
`161`	`161`	`"30\n "`
`162`	`162`	`],`
`163`	`163`	`[`
`164`		`- "qmlobjdef",`
`165`		`- "border",`
`166`		`- "width",`
	`164`	`+ "qmlprop",`
	`165`	`+ [`
	`166`	`+ "dot",`
	`167`	`+ "border",`
	`168`	`+ "width"`
	`169`	`+ ],`
`167`	`170`	`[`
`168`	`171`	`"stat",`
`169`	`172`	`[`
`@@ -177,4 +180,4 @@`
`177`	`180`	`]`
`178`	`181`	`]`
`179`	`182`	`]`
`180`		`-]`
	`183`	`+]`
Original file line number	Diff line number	Diff line change
`@@ -51,9 +51,12 @@`
`51`	`51`	`"'green'\n "`
`52`	`52`	`],`
`53`	`53`	`[`
`54`		`- "qmlobjdef",`
`55`		`- "border",`
`56`		`- "width",`
	`54`	`+ "qmlprop",`
	`55`	`+ [`
	`56`	`+ "dot",`
	`57`	`+ "border",`
	`58`	`+ "width"`
	`59`	`+ ],`
`57`	`60`	`[`
`58`	`61`	`"stat",`
`59`	`62`	`[`
`@@ -140,4 +143,4 @@`
`140`	`143`	`]`
`141`	`144`	`]`
`142`	`145`	`]`
`143`		`-]`
	`146`	`+]`