Fix parsing of default properties

Merging a5b4f4d

Author: Plaristote

Diff for: package.json

@@ -1,6 +1,6 @@
 {
   "name": "qmlweb-parser",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "description": "QML parser in JavaScript",
   "license": "BSD-2-Clause",
   "repository": "qmlweb/qmlweb-parser",

Diff for: src/api.js

@@ -252,21 +252,23 @@ function qmlweb_parse($TEXT, document_type, exigent_mode) {
         var propName = S.token.value;
         next();
       }
-      return as("qmlaliasdef", name, objName, propName);
+      return as("qmlaliasdef", name, false, objName, propName);
     }
     if (is("punc", ":")) {
       next();
       statement.in_qmlprop = true;
-      return as_statement("qmlpropdef", name, type);
+      return as_statement("qmlpropdef", name, false, type);
     } else if (is("punc", ";"))
       next();
-    return as("qmlpropdef", name, type);
+    return as("qmlpropdef", name, false, type);
   }
 
   function qmldefaultprop() {
     next();
     expect_token("name", "property");
-    return as("qmldefaultprop", qmlpropdef());
+    const tree = qmlpropdef();
+    tree[2] = true;
+    return tree;
   }
 
   function qmlsignaldef() {

Diff for: tests/qml/Alias.qml.json

@@ -17,6 +17,7 @@
       [
         "qmlaliasdef",
         "childX",
+        false,
         "child",
         "x"
       ],
@@ -53,4 +54,4 @@
       ]
     ]
   ]
-]
+]

Diff for: tests/qml/DefaultProperty.qml.json

@@ -15,12 +15,10 @@
     null,
     [
       [
-        "qmldefaultprop",
-        [
-          "qmlpropdef",
-          "defaultProperty",
-          "var"
-        ]
+        "qmlpropdef",
+        "defaultProperty",
+        true,
+        "var"
       ],
       [
         "qmlprop",
@@ -48,4 +46,4 @@
       ]
     ]
   ]
-]
+]

Diff for: tests/qml/MultilineString.qml.json

@@ -17,6 +17,7 @@
       [
         "qmlpropdef",
         "foo",
+        false,
         "string",
         [
           "stat",
@@ -30,6 +31,7 @@
       [
         "qmlpropdef",
         "bar",
+        false,
         "string",
         [
           "stat",
@@ -43,6 +45,7 @@
       [
         "qmlpropdef",
         "test",
+        false,
         "string",
         [
           "stat",
@@ -55,4 +58,4 @@
       ]
     ]
   ]
-]
+]

Diff for: tests/qml/ParseFunctionVar.qml.json

@@ -17,6 +17,7 @@
       [
         "qmlpropdef",
         "aFunction",
+        false,
         "var",
         [
           "function",
@@ -29,6 +30,7 @@
       [
         "qmlpropdef",
         "bFunction",
+        false,
         "var",
         [
           "function",
@@ -104,4 +106,4 @@
       ]
     ]
   ]
-]
+]

Diff for: tests/qml/Properties.qml.json

@@ -88,16 +88,19 @@
       [
         "qmlpropdef",
         "flag",
+        false,
         "bool"
       ],
       [
         "qmlpropdef",
         "integer",
+        false,
         "int"
       ],
       [
         "qmlpropdef",
         "number",
+        false,
         "int",
         [
           "stat",
@@ -111,6 +114,7 @@
       [
         "qmlpropdef",
         "number2",
+        false,
         "int",
         [
           "stat",
@@ -124,6 +128,7 @@
       [
         "qmlpropdef",
         "foo",
+        false,
         "var",
         [
           "block",
@@ -134,6 +139,7 @@
       [
         "qmlpropdef",
         "bar",
+        false,
         "var",
         [
           "stat",
@@ -148,6 +154,7 @@
       [
         "qmlpropdef",
         "item",
+        false,
         "Item",
         [
           "stat",
@@ -163,11 +170,13 @@
       [
         "qmlpropdef",
         "items",
+        false,
         "list"
       ],
       [
         "qmlpropdef",
         "domDiv",
+        false,
         "var",
         [
           "stat",
@@ -186,4 +195,4 @@
       ]
     ]
   ]
-]
+]