summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/parser/qdeclarativejsgrammar_p.h
diff options
context:
space:
mode:
authorRoberto Raggi <roberto.raggi@nokia.com>2010-02-25 09:34:28 (GMT)
committerRoberto Raggi <roberto.raggi@nokia.com>2010-02-25 09:34:28 (GMT)
commit0e4dd15a90c119cea4ada833d88b51e336f53ee7 (patch)
tree86eef14fe41bc50e0f638e91227e5ad96a5181de /src/declarative/qml/parser/qdeclarativejsgrammar_p.h
parent75d61cbd7d2c72abb1fcf486c97bbb7429aea81b (diff)
downloadQt-0e4dd15a90c119cea4ada833d88b51e336f53ee7.zip
Qt-0e4dd15a90c119cea4ada833d88b51e336f53ee7.tar.gz
Qt-0e4dd15a90c119cea4ada833d88b51e336f53ee7.tar.bz2
Introduced alternative syntax for defining QML bindings.
Now it is possible to define bindings using the `on' context keyword. For example, you can write Behavior on opacity { NumberAnimation { duration: 500 } } instead of opacity: Behavior { NumberAnimation { duration: 500 } }
Diffstat (limited to 'src/declarative/qml/parser/qdeclarativejsgrammar_p.h')
-rw-r--r--src/declarative/qml/parser/qdeclarativejsgrammar_p.h33
1 files changed, 17 insertions, 16 deletions
diff --git a/src/declarative/qml/parser/qdeclarativejsgrammar_p.h b/src/declarative/qml/parser/qdeclarativejsgrammar_p.h
index d6c3d6b..2da7946 100644
--- a/src/declarative/qml/parser/qdeclarativejsgrammar_p.h
+++ b/src/declarative/qml/parser/qdeclarativejsgrammar_p.h
@@ -61,10 +61,10 @@ QT_BEGIN_NAMESPACE
class QDeclarativeJSGrammar
{
public:
- enum VariousConstants {
+ enum {
EOF_SYMBOL = 0,
- REDUCE_HERE = 99,
- SHIFT_THERE = 98,
+ REDUCE_HERE = 100,
+ SHIFT_THERE = 99,
T_AND = 1,
T_AND_AND = 2,
T_AND_EQ = 3,
@@ -90,12 +90,12 @@ public:
T_EQ_EQ = 18,
T_EQ_EQ_EQ = 19,
T_FALSE = 83,
- T_FEED_JS_EXPRESSION = 95,
- T_FEED_JS_PROGRAM = 97,
- T_FEED_JS_SOURCE_ELEMENT = 96,
- T_FEED_JS_STATEMENT = 94,
- T_FEED_UI_OBJECT_MEMBER = 93,
- T_FEED_UI_PROGRAM = 92,
+ T_FEED_JS_EXPRESSION = 96,
+ T_FEED_JS_PROGRAM = 98,
+ T_FEED_JS_SOURCE_ELEMENT = 97,
+ T_FEED_JS_STATEMENT = 95,
+ T_FEED_UI_OBJECT_MEMBER = 94,
+ T_FEED_UI_PROGRAM = 93,
T_FINALLY = 20,
T_FOR = 21,
T_FUNCTION = 22,
@@ -127,6 +127,7 @@ public:
T_NOT_EQ_EQ = 46,
T_NULL = 81,
T_NUMERIC_LITERAL = 47,
+ T_ON = 92,
T_OR = 48,
T_OR_EQ = 49,
T_OR_OR = 50,
@@ -163,15 +164,15 @@ public:
T_XOR = 79,
T_XOR_EQ = 80,
- ACCEPT_STATE = 635,
- RULE_COUNT = 343,
- STATE_COUNT = 636,
- TERMINAL_COUNT = 100,
+ ACCEPT_STATE = 639,
+ RULE_COUNT = 345,
+ STATE_COUNT = 640,
+ TERMINAL_COUNT = 101,
NON_TERMINAL_COUNT = 106,
- GOTO_INDEX_OFFSET = 636,
- GOTO_INFO_OFFSET = 2520,
- GOTO_CHECK_OFFSET = 2520
+ GOTO_INDEX_OFFSET = 640,
+ GOTO_INFO_OFFSET = 2643,
+ GOTO_CHECK_OFFSET = 2643
};
static const char *const spell [];