qmlweb_parse: support assigning functions to properties

Declaring new properties (qmlpropdef) with functions worked already,
but assiging functions to existing properties (qmlprop) didn't.
This is the fix for those (js functions inside qmlprop statements).

Fixes: #32

Author: ChALkeR

src/api.js

@@ -141,8 +141,8 @@ function qmlweb_parse($TEXT, document_type, exigent_mode) {
 
   var statement_js = statement;
   statement = function() {
-    var in_qmlpropdef = !!statement.in_qmlpropdef;
-    statement.in_qmlpropdef = false;
+    var in_qmlprop = !!statement.in_qmlprop;
+    statement.in_qmlprop = false;
     switch (S.token.type) {
     case "punc":
       switch (S.token.value) {
@@ -152,7 +152,7 @@ function qmlweb_parse($TEXT, document_type, exigent_mode) {
     case "keyword":
       switch (S.token.value) {
       case "function":
-        if (in_qmlpropdef) {
+        if (in_qmlprop) {
           next();
           return function_(false);
         }
@@ -240,7 +240,7 @@ function qmlweb_parse($TEXT, document_type, exigent_mode) {
     }
     if (is("punc", ":")) {
       next();
-      statement.in_qmlpropdef = true;
+      statement.in_qmlprop = true;
       return as_statement("qmlpropdef", name, type);
     } else if (is("punc", ";"))
       next();
@@ -318,6 +318,7 @@ function qmlweb_parse($TEXT, document_type, exigent_mode) {
       } else {
         // Evaluatable item
         expect(":");
+        statement.in_qmlprop = true;
         return as_statement("qmlprop", propname);
       }
     } else if (is("keyword", "default")) {

tests/qml/ParseFunctionVar.qml

@@ -1,8 +1,12 @@
 import QtQuick 2.0
 
-Item {
+MyItem {
   property var aFunction: function(){}
   property var bFunction: function(h) {
     return 21;
   }
+  cFunction: function (a,b, c) {
+    a /= 2;
+    return a - b + c;
+  }
 }

tests/qml/ParseFunctionVar.qml.json

@@ -11,7 +11,7 @@
   ],
   [
     "qmlelem",
-    "Item",
+    "MyItem",
     null,
     [
       [
@@ -46,7 +46,61 @@
             ]
           ]
         ],
-        "function(h) {\n    return 21;\n  }\n"
+        "function(h) {\n    return 21;\n  }\n  "
+      ],
+      [
+        "qmlprop",
+        "cFunction",
+        [
+          "function",
+          null,
+          [
+            "a",
+            "b",
+            "c"
+          ],
+          [
+            [
+              "stat",
+              [
+                "assign",
+                "/",
+                [
+                  "name",
+                  "a"
+                ],
+                [
+                  "num",
+                  2
+                ]
+              ]
+            ],
+            [
+              "return",
+              [
+                "binary",
+                "+",
+                [
+                  "binary",
+                  "-",
+                  [
+                    "name",
+                    "a"
+                  ],
+                  [
+                    "name",
+                    "b"
+                  ]
+                ],
+                [
+                  "name",
+                  "c"
+                ]
+              ]
+            ]
+          ]
+        ],
+        "function (a,b, c) {\n    a /= 2;\n    return a - b + c;\n  }\n"
       ]
     ]
   ]