Extend the grammar of QML binding declarations.

This allows the use of non-iterative statements on the right hand side of a binding declaration. Change-Id: I60fac880766ba99a410b3647e41b1252677a372f Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
sailfishos · Nov 30, 2011 · dcf1e55 · dcf1e55
1 parent 92b2a05
commit dcf1e55
Show file tree

Hide file tree

Showing 12 changed files with 1,094 additions and 946 deletions.
diff --git a/src/declarative/qml/parser/qdeclarativejs.g b/src/declarative/qml/parser/qdeclarativejs.g
@@ -790,7 +790,10 @@ case $rule_number: {
 UiScriptStatement: Block ;
 UiScriptStatement: EmptyStatement ;
 UiScriptStatement: ExpressionStatement ;
-UiScriptStatement: IfStatement ;  --- ### do we really want if statement in a binding?
+UiScriptStatement: IfStatement ;
+UiScriptStatement: WithStatement ;
+UiScriptStatement: SwitchStatement ;
+UiScriptStatement: TryStatement ;
 
 UiObjectMember: UiQualifiedId T_COLON UiScriptStatement ;
 /.

diff --git a/src/declarative/qml/parser/qdeclarativejsgrammar.cpp b/src/declarative/qml/parser/qdeclarativejsgrammar.cpp
diff --git a/src/declarative/qml/parser/qdeclarativejsgrammar_p.h b/src/declarative/qml/parser/qdeclarativejsgrammar_p.h
@@ -165,15 +165,15 @@ class QDeclarativeJSGrammar
     T_XOR = 79,
     T_XOR_EQ = 80,
 
-    ACCEPT_STATE = 640,
-    RULE_COUNT = 345,
-    STATE_COUNT = 641,
+    ACCEPT_STATE = 643,
+    RULE_COUNT = 348,
+    STATE_COUNT = 644,
     TERMINAL_COUNT = 102,
     NON_TERMINAL_COUNT = 107,
 
-    GOTO_INDEX_OFFSET = 641,
-    GOTO_INFO_OFFSET = 2818,
-    GOTO_CHECK_OFFSET = 2818
+    GOTO_INDEX_OFFSET = 644,
+    GOTO_INFO_OFFSET = 2806,
+    GOTO_CHECK_OFFSET = 2806
   };
 
   static const char  *const    spell [];