summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-01-19 04:55:34 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-01-19 04:55:34 (GMT)
commit73ed1b2e5722a70e9676332184fb6cd144177d5b (patch)
treef76f740443b9498249ffce01d015898a9589d9e8
parentcdf57ac7a20fb29c1835ccff1dd668aeeba8d71f (diff)
parentbc6940f53891856a3a6c3d8f1c25a8eaada90b33 (diff)
downloadQt-73ed1b2e5722a70e9676332184fb6cd144177d5b.zip
Qt-73ed1b2e5722a70e9676332184fb6cd144177d5b.tar.gz
Qt-73ed1b2e5722a70e9676332184fb6cd144177d5b.tar.bz2
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat
-rw-r--r--src/declarative/graphicsitems/qmlgraphicspathview.cpp34
-rw-r--r--src/declarative/graphicsitems/qmlgraphicstext.cpp4
-rw-r--r--src/declarative/qml/parser/qmljs.g28
-rw-r--r--src/declarative/qml/parser/qmljsast.cpp1
-rw-r--r--src/declarative/qml/parser/qmljsgrammar.cpp1592
-rw-r--r--src/declarative/qml/parser/qmljsgrammar_p.h21
-rw-r--r--src/declarative/qml/parser/qmljsparser.cpp451
-rw-r--r--src/declarative/qml/parser/qmljsparser_p.h8
-rw-r--r--src/declarative/util/qmllistmodel.cpp45
-rw-r--r--tests/auto/declarative/qmllistmodel/tst_qmllistmodel.cpp5
-rw-r--r--tools/qmlviewer/main.cpp3
11 files changed, 1118 insertions, 1074 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicspathview.cpp b/src/declarative/graphicsitems/qmlgraphicspathview.cpp
index 2fc0dfb..112eda2 100644
--- a/src/declarative/graphicsitems/qmlgraphicspathview.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicspathview.cpp
@@ -56,6 +56,18 @@ QT_BEGIN_NAMESPACE
QML_DEFINE_TYPE(Qt,4,6,PathView,QmlGraphicsPathView)
+
+inline qreal qmlMod(qreal x, qreal y)
+{
+#ifdef QT_USE_MATH_H_FLOATS
+ if(sizeof(qreal) == sizeof(float))
+ return fmodf(float(x), float(y));
+ else
+#endif
+ return fmod(x, y);
+}
+
+
class QmlGraphicsPathViewAttached : public QObject
{
Q_OBJECT
@@ -250,7 +262,7 @@ void QmlGraphicsPathViewPrivate::setOffset(qreal o)
{
Q_Q(QmlGraphicsPathView);
if (_offset != o) {
- _offset = fmod(o, qreal(100.0));
+ _offset = qmlMod(o, qreal(100.0));
if (_offset < 0)
_offset = 100.0 + _offset;
q->refill();
@@ -450,8 +462,8 @@ void QmlGraphicsPathView::mouseReleaseEvent(QGraphicsSceneMouseEvent *)
velocity = 100;
else if (velocity < -100)
velocity = -100;
- qreal inc = fmod(d->_offset - d->snapPos, qreal(100.0 / d->model->count()));
- qreal dist = qAbs(velocity/2 - fmod(velocity/2, qreal(100.0 / d->model->count()) - inc));
+ qreal inc = qmlMod(d->_offset - d->snapPos, qreal(100.0 / d->model->count()));
+ qreal dist = qAbs(velocity/2 - qmlMod(velocity/2, qreal(100.0 / d->model->count()) - inc));
d->moveOffset.setValue(d->_offset);
d->tl.accel(d->moveOffset, velocity, 10, dist);
d->tl.execute(d->fixupOffsetEvent);
@@ -542,7 +554,7 @@ void QmlGraphicsPathView::componentComplete()
itemIndex += d->pathOffset;
itemIndex %= d->items.count();
- qreal targetOffset = fmod(100 + (d->snapPos*100) - 100.0 * itemIndex / d->items.count(), qreal(100.0));
+ qreal targetOffset = qmlMod(100 + (d->snapPos*100) - 100.0 * itemIndex / d->items.count(), qreal(100.0));
if (targetOffset < 0)
targetOffset = 100.0 + targetOffset;
@@ -609,7 +621,7 @@ void QmlGraphicsPathView::refill()
for (int i=0; i<d->items.count(); i++){
qreal percent = i * (100. / d->items.count());
percent = percent + d->_offset;
- percent = fmod(percent, qreal(100.0));
+ percent = qmlMod(percent, qreal(100.0));
positions << qAbs(percent/100.0);
}
@@ -696,7 +708,7 @@ void QmlGraphicsPathView::itemsInserted(int modelIndex, int count)
int itemIndex = (d->currentIndex - d->firstIndex + d->model->count())%d->model->count();
itemIndex += d->pathOffset;
itemIndex %= d->items.count();
- qreal targetOffset = fmod(100 + (d->snapPos*100) - 100.0 * itemIndex / d->items.count(), qreal(100.0));
+ qreal targetOffset = qmlMod(100 + (d->snapPos*100) - 100.0 * itemIndex / d->items.count(), qreal(100.0));
if (targetOffset < 0)
targetOffset = 100.0 + targetOffset;
@@ -733,7 +745,7 @@ void QmlGraphicsPathView::itemsRemoved(int modelIndex, int count)
int itemIndex = (d->currentIndex - d->firstIndex + d->model->count())%d->model->count();
itemIndex += d->pathOffset;
itemIndex %= d->items.count();
- qreal targetOffset = fmod(100 + (d->snapPos*100) - 100.0 * itemIndex / d->items.count(), qreal(100.0));
+ qreal targetOffset = qmlMod(100 + (d->snapPos*100) - 100.0 * itemIndex / d->items.count(), qreal(100.0));
if (targetOffset < 0)
targetOffset = 100.0 + targetOffset;
@@ -766,12 +778,12 @@ int QmlGraphicsPathViewPrivate::calcCurrentIndex()
{
int current = -1;
if (model && items.count()) {
- _offset = fmod(_offset, qreal(100.0));
+ _offset = qmlMod(_offset, qreal(100.0));
if (_offset < 0)
_offset += 100.0;
if (pathItems == -1) {
- qreal delta = fmod(_offset - snapPos, qreal(100.0));
+ qreal delta = qmlMod(_offset - snapPos, qreal(100.0));
if (delta < 0)
delta = 100.0 + delta;
int ii = model->count() - qRound(delta * model->count() / 100);
@@ -784,7 +796,7 @@ int QmlGraphicsPathViewPrivate::calcCurrentIndex()
for (int i=0; i<items.count(); i++){
qreal percent = i * (100. / items.count());
percent = percent + _offset;
- percent = fmod(percent, qreal(100.0));
+ percent = qmlMod(percent, qreal(100.0));
qreal diff = qAbs(snapPos - (percent/100.0));
if (diff < bestDiff){
bestDiff = diff;
@@ -843,7 +855,7 @@ void QmlGraphicsPathViewPrivate::snapToCurrent()
itemIndex += pathOffset;
itemIndex %= items.count();
- qreal targetOffset = fmod(100 + (snapPos*100) - 100.0 * itemIndex / items.count(), qreal(100.0));
+ qreal targetOffset = qmlMod(100 + (snapPos*100) - 100.0 * itemIndex / items.count(), qreal(100.0));
if (targetOffset < 0)
targetOffset = 100.0 + targetOffset;
diff --git a/src/declarative/graphicsitems/qmlgraphicstext.cpp b/src/declarative/graphicsitems/qmlgraphicstext.cpp
index 84f925d..bfb928a 100644
--- a/src/declarative/graphicsitems/qmlgraphicstext.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicstext.cpp
@@ -368,7 +368,7 @@ void QmlGraphicsText::setWrap(bool w)
will automatically determine whether the text should be treated as
rich text. This determination is made using Qt::mightBeRichText().
- StyledText is an optimized format able supporting some basic text
+ StyledText is an optimized format supporting some basic text
styling markup, in the style of html 3.2:
\code
@@ -379,6 +379,8 @@ void QmlGraphicsText::setWrap(bool w)
&gt; &lt; &amp;
\endcode
+ \c StyledText parser is strict, requiring tags to be correctly nested.
+
\table
\row
\o
diff --git a/src/declarative/qml/parser/qmljs.g b/src/declarative/qml/parser/qmljs.g
index 49590e8..7fbb3f6 100644
--- a/src/declarative/qml/parser/qmljs.g
+++ b/src/declarative/qml/parser/qmljs.g
@@ -72,6 +72,7 @@
%token T_FEED_JS_STATEMENT
%token T_FEED_JS_EXPRESSION
%token T_FEED_JS_SOURCE_ELEMENT
+%token T_FEED_JS_PROGRAM
%nonassoc SHIFT_THERE
%nonassoc T_IDENTIFIER T_COLON T_SIGNAL T_PROPERTY T_READONLY
@@ -268,6 +269,7 @@ public:
bool parseExpression() { return parse(T_FEED_JS_EXPRESSION); }
bool parseSourceElement() { return parse(T_FEED_JS_SOURCE_ELEMENT); }
bool parseUiObjectMember() { return parse(T_FEED_UI_OBJECT_MEMBER); }
+ bool parseProgram() { return parse(T_FEED_JS_PROGRAM); }
AST::UiProgram *ast() const
{ return AST::cast<AST::UiProgram *>(program); }
@@ -296,6 +298,9 @@ public:
return program->uiObjectMemberCast();
}
+ AST::Node *rootNode() const
+ { return program; }
+
QList<DiagnosticMessage> diagnosticMessages() const
{ return diagnostic_messages; }
@@ -541,7 +546,7 @@ case $rule_number: {
} break;
./
-TopLevel: T_FEED_JS_SOURCE_ELEMENT Expression ;
+TopLevel: T_FEED_JS_SOURCE_ELEMENT SourceElement ;
/.
case $rule_number: {
sym(1).Node = sym(2).Node;
@@ -557,6 +562,14 @@ case $rule_number: {
} break;
./
+TopLevel: T_FEED_JS_PROGRAM Program ;
+/.
+case $rule_number: {
+ sym(1).Node = sym(2).Node;
+ program = sym(1).Node;
+} break;
+./
+
UiProgram: UiImportListOpt UiRootMember ;
/.
case $rule_number: {
@@ -2873,13 +2886,12 @@ case $rule_number: {
} break;
./
---QmlJSProgram: SourceElements ;
---/.
---case $rule_number: {
--- sym(1).Node = makeAstNode<AST::Program> (driver->nodePool(), sym(1).SourceElements->finish ());
--- driver->changeAbstractSyntaxTree(sym(1).Node);
---} break;
---./
+Program: SourceElements ;
+/.
+case $rule_number: {
+ sym(1).Node = makeAstNode<AST::Program> (driver->nodePool(), sym(1).SourceElements->finish ());
+} break;
+./
SourceElements: SourceElement ;
/.
diff --git a/src/declarative/qml/parser/qmljsast.cpp b/src/declarative/qml/parser/qmljsast.cpp
index 2a39aae..e80b05e 100644
--- a/src/declarative/qml/parser/qmljsast.cpp
+++ b/src/declarative/qml/parser/qmljsast.cpp
@@ -798,7 +798,6 @@ void DebuggerStatement::accept0(Visitor *visitor)
visitor->endVisit(this);
}
-
void UiProgram::accept0(Visitor *visitor)
{
if (visitor->visit(this)) {
diff --git a/src/declarative/qml/parser/qmljsgrammar.cpp b/src/declarative/qml/parser/qmljsgrammar.cpp
index 5d6eb02..b416959 100644
--- a/src/declarative/qml/parser/qmljsgrammar.cpp
+++ b/src/declarative/qml/parser/qmljsgrammar.cpp
@@ -54,585 +54,581 @@ const char *const QmlJSGrammar::spell [] = {
")", ";", 0, "*", "*=", "string literal", "property", "signal", "readonly", "switch",
"this", "throw", "~", "try", "typeof", "var", "void", "while", "with", "^",
"^=", "null", "true", "false", "const", "debugger", "reserved word", "multiline string literal", "comment", "public",
- "import", "as", 0, 0, 0, 0, 0, 0, 0};
+ "import", "as", 0, 0, 0, 0, 0, 0, 0, 0};
const short QmlJSGrammar::lhs [] = {
- 99, 99, 99, 99, 99, 100, 104, 104, 107, 107,
- 109, 108, 108, 108, 108, 108, 108, 108, 108, 111,
- 106, 105, 114, 114, 115, 115, 116, 116, 113, 103,
- 103, 103, 103, 103, 103, 103, 122, 122, 122, 123,
- 123, 124, 124, 103, 103, 103, 103, 103, 103, 103,
- 103, 103, 103, 103, 103, 103, 103, 103, 103, 103,
- 103, 112, 112, 112, 112, 127, 127, 127, 127, 127,
- 127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
- 127, 127, 127, 117, 129, 129, 129, 129, 128, 128,
- 131, 131, 133, 133, 133, 133, 133, 133, 134, 134,
- 134, 134, 134, 134, 134, 134, 134, 134, 134, 134,
- 134, 134, 134, 134, 134, 134, 134, 134, 134, 134,
- 134, 134, 134, 134, 134, 134, 134, 134, 134, 135,
- 135, 110, 110, 110, 110, 110, 138, 138, 139, 139,
- 139, 139, 137, 137, 140, 140, 141, 141, 142, 142,
- 142, 143, 143, 143, 143, 143, 143, 143, 143, 143,
- 143, 144, 144, 144, 144, 145, 145, 145, 146, 146,
- 146, 146, 147, 147, 147, 147, 147, 147, 147, 148,
- 148, 148, 148, 148, 148, 149, 149, 149, 149, 149,
- 150, 150, 150, 150, 150, 151, 151, 152, 152, 153,
- 153, 154, 154, 155, 155, 156, 156, 157, 157, 158,
- 158, 159, 159, 160, 160, 161, 161, 162, 162, 132,
- 132, 163, 163, 164, 164, 164, 164, 164, 164, 164,
- 164, 164, 164, 164, 164, 102, 102, 165, 165, 166,
- 166, 167, 167, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 118, 179,
- 179, 178, 178, 126, 126, 180, 180, 181, 181, 183,
- 183, 182, 184, 187, 185, 185, 188, 186, 186, 119,
- 120, 120, 121, 121, 168, 168, 168, 168, 168, 168,
- 168, 169, 169, 169, 169, 170, 170, 170, 170, 171,
- 171, 172, 174, 189, 189, 192, 192, 190, 190, 193,
- 191, 173, 173, 173, 175, 175, 176, 176, 176, 194,
- 195, 177, 177, 125, 136, 199, 199, 196, 196, 197,
- 197, 200, 201, 201, 202, 202, 198, 198, 130, 130,
- 203};
+ 100, 100, 100, 100, 100, 100, 101, 107, 107, 110,
+ 110, 112, 111, 111, 111, 111, 111, 111, 111, 111,
+ 114, 109, 108, 117, 117, 118, 118, 119, 119, 116,
+ 105, 105, 105, 105, 105, 105, 105, 125, 125, 125,
+ 126, 126, 127, 127, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 115, 115, 115, 115, 130, 130, 130, 130,
+ 130, 130, 130, 130, 130, 130, 130, 130, 130, 130,
+ 130, 130, 130, 130, 120, 132, 132, 132, 132, 131,
+ 131, 134, 134, 136, 136, 136, 136, 136, 136, 137,
+ 137, 137, 137, 137, 137, 137, 137, 137, 137, 137,
+ 137, 137, 137, 137, 137, 137, 137, 137, 137, 137,
+ 137, 137, 137, 137, 137, 137, 137, 137, 137, 137,
+ 138, 138, 113, 113, 113, 113, 113, 141, 141, 142,
+ 142, 142, 142, 140, 140, 143, 143, 144, 144, 145,
+ 145, 145, 146, 146, 146, 146, 146, 146, 146, 146,
+ 146, 146, 147, 147, 147, 147, 148, 148, 148, 149,
+ 149, 149, 149, 150, 150, 150, 150, 150, 150, 150,
+ 151, 151, 151, 151, 151, 151, 152, 152, 152, 152,
+ 152, 153, 153, 153, 153, 153, 154, 154, 155, 155,
+ 156, 156, 157, 157, 158, 158, 159, 159, 160, 160,
+ 161, 161, 162, 162, 163, 163, 164, 164, 165, 165,
+ 135, 135, 166, 166, 167, 167, 167, 167, 167, 167,
+ 167, 167, 167, 167, 167, 167, 103, 103, 168, 168,
+ 169, 169, 170, 170, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 121,
+ 182, 182, 181, 181, 129, 129, 183, 183, 184, 184,
+ 186, 186, 185, 187, 190, 188, 188, 191, 189, 189,
+ 122, 123, 123, 124, 124, 171, 171, 171, 171, 171,
+ 171, 171, 172, 172, 172, 172, 173, 173, 173, 173,
+ 174, 174, 175, 177, 192, 192, 195, 195, 193, 193,
+ 196, 194, 176, 176, 176, 178, 178, 179, 179, 179,
+ 197, 198, 180, 180, 128, 139, 202, 202, 199, 199,
+ 200, 200, 203, 106, 204, 204, 104, 104, 201, 201,
+ 133, 133, 205};
const short QmlJSGrammar::rhs [] = {
- 2, 2, 2, 2, 2, 2, 1, 1, 1, 2,
- 1, 2, 2, 3, 3, 5, 5, 4, 4, 2,
- 0, 1, 1, 2, 1, 3, 2, 3, 2, 1,
- 5, 4, 3, 3, 3, 3, 1, 1, 1, 0,
- 1, 2, 4, 6, 6, 3, 3, 7, 7, 4,
- 4, 5, 5, 6, 6, 7, 7, 7, 7, 1,
+ 2, 2, 2, 2, 2, 2, 2, 1, 1, 1,
+ 2, 1, 2, 2, 3, 3, 5, 5, 4, 4,
+ 2, 0, 1, 1, 2, 1, 3, 2, 3, 2,
+ 1, 5, 4, 3, 3, 3, 3, 1, 1, 1,
+ 0, 1, 2, 4, 6, 6, 3, 3, 7, 7,
+ 4, 4, 5, 5, 6, 6, 7, 7, 7, 7,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 2, 3, 3, 4, 5,
- 3, 4, 3, 1, 1, 2, 3, 4, 1, 2,
- 3, 5, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 2, 3, 3, 4,
+ 5, 3, 4, 3, 1, 1, 2, 3, 4, 1,
+ 2, 3, 5, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 4, 3, 5, 1, 2, 4, 4,
- 4, 3, 0, 1, 1, 3, 1, 1, 1, 2,
- 2, 1, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 1, 3, 3, 3, 1, 3, 3, 1, 3,
- 3, 3, 1, 3, 3, 3, 3, 3, 3, 1,
- 3, 3, 3, 3, 3, 1, 3, 3, 3, 3,
- 1, 3, 3, 3, 3, 1, 3, 1, 3, 1,
- 3, 1, 3, 1, 3, 1, 3, 1, 3, 1,
- 3, 1, 3, 1, 3, 1, 5, 1, 5, 1,
- 3, 1, 3, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 3, 0, 1, 1,
- 3, 0, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 3, 1,
- 2, 0, 1, 3, 3, 1, 1, 1, 3, 1,
- 3, 2, 2, 2, 0, 1, 2, 0, 1, 1,
- 2, 2, 7, 5, 7, 7, 5, 9, 10, 7,
- 8, 2, 2, 3, 3, 2, 2, 3, 3, 3,
- 3, 5, 5, 3, 5, 1, 2, 0, 1, 4,
- 3, 3, 3, 3, 3, 3, 3, 3, 4, 5,
- 2, 2, 2, 8, 8, 1, 3, 0, 1, 0,
- 1, 1, 1, 2, 1, 1, 0, 1, 0, 1,
- 2};
+ 1, 1, 1, 1, 4, 3, 5, 1, 2, 4,
+ 4, 4, 3, 0, 1, 1, 3, 1, 1, 1,
+ 2, 2, 1, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 1, 3, 3, 3, 1, 3, 3, 1,
+ 3, 3, 3, 1, 3, 3, 3, 3, 3, 3,
+ 1, 3, 3, 3, 3, 3, 1, 3, 3, 3,
+ 3, 1, 3, 3, 3, 3, 1, 3, 1, 3,
+ 1, 3, 1, 3, 1, 3, 1, 3, 1, 3,
+ 1, 3, 1, 3, 1, 3, 1, 5, 1, 5,
+ 1, 3, 1, 3, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 3, 0, 1,
+ 1, 3, 0, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 3,
+ 1, 2, 0, 1, 3, 3, 1, 1, 1, 3,
+ 1, 3, 2, 2, 2, 0, 1, 2, 0, 1,
+ 1, 2, 2, 7, 5, 7, 7, 5, 9, 10,
+ 7, 8, 2, 2, 3, 3, 2, 2, 3, 3,
+ 3, 3, 5, 5, 3, 5, 1, 2, 0, 1,
+ 4, 3, 3, 3, 3, 3, 3, 3, 3, 4,
+ 5, 2, 2, 2, 8, 8, 1, 3, 0, 1,
+ 0, 1, 1, 1, 1, 2, 1, 1, 0, 1,
+ 0, 1, 2};
const short QmlJSGrammar::action_default [] = {
- 0, 0, 0, 0, 0, 21, 0, 169, 236, 200,
- 208, 204, 148, 220, 196, 3, 133, 67, 149, 212,
- 216, 137, 166, 147, 152, 132, 186, 173, 0, 74,
- 75, 70, 337, 62, 339, 0, 0, 0, 0, 72,
- 0, 0, 68, 71, 0, 0, 63, 65, 64, 73,
- 66, 0, 69, 0, 0, 162, 0, 0, 149, 168,
- 151, 150, 0, 0, 0, 164, 165, 163, 167, 0,
- 197, 0, 0, 0, 0, 187, 0, 0, 0, 0,
- 0, 0, 177, 0, 0, 0, 171, 172, 170, 175,
- 179, 178, 176, 174, 189, 188, 190, 0, 205, 0,
- 201, 0, 0, 143, 130, 142, 131, 99, 100, 101,
- 126, 102, 127, 103, 104, 105, 106, 107, 108, 109,
- 110, 111, 112, 113, 114, 115, 128, 116, 117, 118,
- 119, 120, 121, 122, 123, 124, 125, 129, 0, 0,
- 141, 237, 144, 0, 145, 0, 146, 140, 0, 233,
- 226, 224, 231, 232, 230, 229, 235, 228, 227, 225,
- 234, 221, 0, 209, 0, 0, 213, 0, 0, 217,
- 0, 0, 143, 135, 0, 134, 0, 139, 153, 0,
- 338, 328, 329, 0, 326, 0, 327, 0, 330, 244,
- 251, 250, 258, 246, 0, 247, 331, 0, 336, 248,
- 249, 254, 252, 333, 332, 335, 255, 0, 266, 0,
- 0, 0, 0, 337, 62, 0, 339, 63, 238, 280,
- 64, 0, 0, 0, 267, 0, 0, 256, 257, 0,
- 245, 253, 281, 282, 325, 334, 0, 296, 297, 298,
- 299, 0, 292, 293, 294, 295, 322, 323, 0, 0,
- 0, 0, 0, 285, 286, 242, 240, 202, 210, 206,
- 222, 198, 243, 0, 149, 214, 218, 191, 180, 0,
- 0, 199, 0, 0, 0, 0, 192, 0, 0, 0,
- 0, 0, 184, 182, 185, 183, 181, 194, 193, 195,
- 0, 207, 0, 203, 0, 241, 149, 0, 223, 238,
- 239, 0, 238, 0, 0, 288, 0, 0, 0, 290,
- 0, 211, 0, 0, 215, 0, 0, 219, 278, 0,
- 270, 279, 273, 0, 277, 0, 238, 271, 0, 238,
- 0, 0, 289, 0, 0, 0, 291, 338, 328, 0,
- 0, 330, 0, 324, 0, 314, 0, 0, 0, 284,
- 0, 283, 0, 340, 0, 98, 260, 263, 0, 99,
- 266, 102, 127, 104, 105, 70, 109, 110, 62, 111,
- 114, 68, 71, 63, 238, 64, 73, 117, 66, 119,
- 69, 121, 122, 267, 124, 125, 129, 0, 91, 0,
- 0, 93, 97, 95, 82, 94, 96, 0, 92, 81,
- 261, 259, 137, 138, 143, 0, 136, 0, 313, 0,
- 300, 301, 0, 312, 0, 0, 0, 303, 308, 306,
- 309, 0, 0, 307, 308, 0, 304, 0, 305, 262,
- 311, 0, 262, 310, 0, 315, 316, 0, 262, 317,
- 318, 0, 0, 319, 0, 0, 0, 320, 321, 155,
- 154, 0, 0, 0, 287, 0, 0, 0, 302, 275,
- 268, 0, 276, 272, 0, 274, 264, 0, 265, 269,
- 85, 0, 0, 89, 76, 0, 78, 87, 0, 79,
- 88, 90, 80, 86, 77, 0, 83, 159, 157, 161,
- 158, 156, 160, 4, 2, 60, 84, 0, 0, 63,
- 65, 64, 30, 5, 0, 61, 0, 39, 38, 37,
- 0, 0, 52, 0, 53, 0, 58, 59, 0, 39,
- 0, 0, 0, 0, 0, 48, 49, 0, 50, 0,
- 51, 0, 54, 55, 0, 0, 0, 0, 0, 56,
- 57, 0, 46, 40, 47, 41, 0, 0, 0, 0,
- 43, 0, 44, 45, 42, 0, 0, 29, 33, 34,
- 35, 36, 137, 262, 0, 0, 99, 266, 102, 127,
- 104, 105, 70, 109, 110, 62, 111, 114, 68, 71,
- 63, 238, 64, 73, 117, 66, 119, 69, 121, 122,
- 267, 124, 125, 129, 137, 0, 25, 0, 0, 31,
- 26, 32, 27, 23, 0, 28, 24, 7, 0, 9,
- 0, 8, 0, 1, 20, 11, 0, 12, 0, 13,
- 0, 18, 19, 0, 14, 15, 0, 16, 17, 10,
- 22, 6, 341};
+ 0, 0, 0, 0, 0, 0, 22, 0, 170, 237,
+ 201, 209, 205, 149, 221, 197, 3, 134, 68, 150,
+ 213, 217, 138, 167, 148, 153, 133, 187, 174, 0,
+ 75, 76, 71, 339, 63, 341, 0, 0, 0, 0,
+ 73, 0, 0, 69, 72, 0, 0, 64, 66, 65,
+ 74, 67, 0, 70, 0, 0, 163, 0, 0, 150,
+ 169, 152, 151, 0, 0, 0, 165, 166, 164, 168,
+ 0, 198, 0, 0, 0, 0, 188, 0, 0, 0,
+ 0, 0, 0, 178, 0, 0, 0, 172, 173, 171,
+ 176, 180, 179, 177, 175, 190, 189, 191, 0, 206,
+ 0, 202, 0, 0, 144, 131, 143, 132, 100, 101,
+ 102, 127, 103, 128, 104, 105, 106, 107, 108, 109,
+ 110, 111, 112, 113, 114, 115, 116, 129, 117, 118,
+ 119, 120, 121, 122, 123, 124, 125, 126, 130, 0,
+ 0, 142, 238, 145, 0, 146, 0, 147, 141, 0,
+ 234, 227, 225, 232, 233, 231, 230, 236, 229, 228,
+ 226, 235, 222, 0, 210, 0, 0, 214, 0, 0,
+ 218, 0, 0, 144, 136, 0, 135, 0, 140, 154,
+ 0, 340, 329, 330, 0, 327, 0, 328, 0, 331,
+ 245, 252, 251, 259, 247, 0, 248, 332, 0, 338,
+ 249, 250, 255, 253, 335, 333, 337, 256, 0, 267,
+ 0, 0, 0, 0, 339, 63, 0, 341, 64, 239,
+ 281, 65, 0, 0, 0, 268, 0, 0, 257, 258,
+ 0, 246, 254, 282, 283, 326, 336, 0, 297, 298,
+ 299, 300, 0, 293, 294, 295, 296, 323, 324, 0,
+ 0, 0, 0, 0, 286, 287, 243, 241, 203, 211,
+ 207, 223, 199, 244, 0, 150, 215, 219, 192, 181,
+ 0, 0, 200, 0, 0, 0, 0, 193, 0, 0,
+ 0, 0, 0, 185, 183, 186, 184, 182, 195, 194,
+ 196, 0, 208, 0, 204, 0, 242, 150, 0, 224,
+ 239, 240, 0, 239, 0, 0, 289, 0, 0, 0,
+ 291, 0, 212, 0, 0, 216, 0, 0, 220, 279,
+ 0, 271, 280, 274, 0, 278, 0, 239, 272, 0,
+ 239, 0, 0, 290, 0, 0, 0, 292, 340, 329,
+ 0, 0, 331, 0, 325, 0, 315, 0, 0, 0,
+ 285, 0, 284, 0, 342, 0, 99, 261, 264, 0,
+ 100, 267, 103, 128, 105, 106, 71, 110, 111, 63,
+ 112, 115, 69, 72, 64, 239, 65, 74, 118, 67,
+ 120, 70, 122, 123, 268, 125, 126, 130, 0, 92,
+ 0, 0, 94, 98, 96, 83, 95, 97, 0, 93,
+ 82, 262, 260, 138, 139, 144, 0, 137, 0, 314,
+ 0, 301, 302, 0, 313, 0, 0, 0, 304, 309,
+ 307, 310, 0, 0, 308, 309, 0, 305, 0, 306,
+ 263, 312, 0, 263, 311, 0, 316, 317, 0, 263,
+ 318, 319, 0, 0, 320, 0, 0, 0, 321, 322,
+ 156, 155, 0, 0, 0, 288, 0, 0, 0, 303,
+ 276, 269, 0, 277, 273, 0, 275, 265, 0, 266,
+ 270, 86, 0, 0, 90, 77, 0, 79, 88, 0,
+ 80, 89, 91, 81, 87, 78, 0, 84, 160, 158,
+ 162, 159, 157, 161, 6, 334, 4, 2, 61, 85,
+ 0, 0, 64, 66, 65, 31, 5, 0, 62, 0,
+ 40, 39, 38, 0, 0, 53, 0, 54, 0, 59,
+ 60, 0, 40, 0, 0, 0, 0, 0, 49, 50,
+ 0, 51, 0, 52, 0, 55, 56, 0, 0, 0,
+ 0, 0, 57, 58, 0, 47, 41, 48, 42, 0,
+ 0, 0, 0, 44, 0, 45, 46, 43, 0, 0,
+ 30, 34, 35, 36, 37, 138, 263, 0, 0, 100,
+ 267, 103, 128, 105, 106, 71, 110, 111, 63, 112,
+ 115, 69, 72, 64, 239, 65, 74, 118, 67, 120,
+ 70, 122, 123, 268, 125, 126, 130, 138, 0, 26,
+ 0, 0, 32, 27, 33, 28, 24, 0, 29, 25,
+ 8, 0, 10, 0, 9, 0, 1, 21, 12, 0,
+ 13, 0, 14, 0, 19, 20, 0, 15, 16, 0,
+ 17, 18, 11, 23, 7, 343};
const short QmlJSGrammar::goto_default [] = {
- 6, 613, 356, 194, 503, 612, 631, 607, 611, 609,
- 614, 21, 610, 17, 502, 604, 595, 557, 504, 189,
- 193, 195, 199, 520, 546, 545, 198, 230, 25, 472,
- 471, 354, 353, 8, 352, 355, 105, 16, 143, 23,
- 12, 142, 18, 24, 55, 22, 7, 27, 26, 267,
- 14, 261, 9, 257, 11, 259, 10, 258, 19, 265,
- 20, 266, 13, 260, 256, 297, 409, 262, 263, 200,
- 191, 190, 202, 231, 201, 206, 227, 228, 192, 358,
- 357, 229, 461, 460, 319, 320, 463, 322, 462, 321,
- 417, 421, 424, 420, 419, 439, 440, 183, 197, 179,
- 182, 196, 204, 203, 0};
+ 7, 616, 206, 195, 204, 506, 494, 615, 634, 610,
+ 614, 612, 617, 22, 613, 18, 505, 607, 598, 560,
+ 507, 190, 194, 196, 200, 523, 549, 548, 199, 231,
+ 26, 473, 472, 355, 354, 9, 353, 356, 106, 17,
+ 144, 24, 13, 143, 19, 25, 56, 23, 8, 28,
+ 27, 268, 15, 262, 10, 258, 12, 260, 11, 259,
+ 20, 266, 21, 267, 14, 261, 257, 298, 410, 263,
+ 264, 201, 192, 191, 203, 232, 202, 207, 228, 229,
+ 193, 359, 358, 230, 462, 461, 320, 321, 464, 323,
+ 463, 322, 418, 422, 425, 421, 420, 440, 441, 184,
+ 198, 180, 183, 197, 205, 0};
const short QmlJSGrammar::action_index [] = {
- 316, 1136, 1136, 2148, 870, -77, 22, 108, -99, 54,
- 18, -20, 166, -99, 307, 40, -99, -99, 510, 30,
- 84, 184, 270, -99, -99, -99, 511, 171, 1136, -99,
- -99, -99, 269, -99, 1958, 1407, 1136, 1136, 1136, -99,
- 585, 1136, -99, -99, 1136, 1136, -99, -99, -99, -99,
- -99, 1136, -99, 1136, 1136, -99, 1136, 1136, 122, 270,
- -99, -99, 1136, 1136, 1136, -99, -99, -99, 270, 1136,
- 302, 1136, 1136, 1136, 1136, 511, 1136, 1136, 1136, 1136,
- 1136, 1136, 176, 1136, 1136, 1136, 93, 95, 92, 208,
- 217, 236, 242, 241, 511, 511, 511, 1136, -5, 1136,
- 86, 1863, 1136, 1136, -99, -99, -99, -99, -99, -99,
- -99, -99, -99, -99, -99, -99, -99, -99, -99, -99,
- -99, -99, -99, -99, -99, -99, -99, -99, -99, -99,
- -99, -99, -99, -99, -99, -99, -99, -99, 132, 1136,
- -99, -99, 53, 8, -99, 1136, -99, -99, 1136, -99,
- -99, -99, -99, -99, -99, -99, -99, -99, -99, -99,
- -99, -99, 1136, -24, 1136, 1136, 27, 37, 1136, -99,
- 1863, 1136, 1136, -99, 110, -99, -25, -99, -99, -2,
- -99, 339, 52, 4, -99, 325, -99, 29, 2243, -99,
- -99, -99, -99, -99, 196, -99, -99, -39, -99, -99,
- -99, -99, -99, -99, 2243, -99, -99, 416, -99, 405,
- 91, 2148, 60, 335, 76, 41, 2433, 73, 1136, -99,
- 74, 58, 1136, 49, -99, 57, 31, -99, -99, 272,
- -99, -99, -99, -99, -99, -99, 129, -99, -99, -99,
- -99, 118, -99, -99, -99, -99, -99, -99, 38, 62,
- 1136, 109, 101, -99, -99, 1316, -99, 183, 36, 35,
- -99, 304, 61, 25, 547, 63, 111, 394, 262, 299,
- 1136, 435, 1136, 1136, 1136, 1136, 398, 1136, 1136, 1136,
- 1136, 1136, 209, 202, 186, 214, 218, 423, 404, 433,
- 1136, -3, 1136, 70, 1136, -99, 607, 1136, -99, 1136,
- 64, 12, 1136, 50, 2148, -99, 1136, 146, 2148, -99,
- 1136, 43, 1136, 1136, 97, 98, 1136, -99, 89, 128,
- 78, -99, -99, 1136, -99, 275, 1136, -99, 34, 1136,
- -40, 2148, -99, 1136, 133, 2148, -99, -17, 305, -43,
- -18, 2243, -41, -99, 2148, -99, 1136, 114, 2148, 11,
- 2148, -99, 19, 20, -30, -99, -99, 2148, -45, 430,
- 85, 450, 96, 1136, 2148, -7, -31, 384, 5, -27,
- 773, 0, -1, -99, 1228, -99, 1, -32, 16, 1136,
- 23, 24, 1136, 47, 1136, 17, 15, 1136, -99, 2053,
- 51, -99, -99, -99, -99, -99, -99, 1136, -99, -99,
- -99, -99, 256, -99, 1136, -10, -99, 2148, -99, 68,
- -99, -99, 2148, -99, 1136, 117, 3, -99, 28, -99,
- 26, 113, 1136, -99, 32, 33, -99, -8, -99, 2148,
- -99, 120, 2148, -99, 170, -99, -99, 106, 2148, 21,
- -99, 7, 6, -99, 295, -15, 9, -99, -99, -99,
- -99, 1136, 134, 2148, -99, 1136, 152, 2148, -99, -16,
- -99, 189, -99, -99, 1136, -99, -99, 290, -99, -99,
- -99, 131, 1498, -99, -99, 1680, -99, -99, 1589, -99,
- -99, -99, -99, -99, -99, 116, -99, -99, -99, -99,
- -99, -99, -99, 48, -99, -99, 136, -55, 781, 142,
- -64, -26, -99, -99, 112, -99, 243, -99, -99, -99,
- -11, 160, -99, 1136, -99, 164, -99, -99, 263, 66,
- 75, 187, 87, 79, 88, -99, -99, 198, -99, 1136,
- -99, 215, -99, -99, 179, 56, 71, 1136, 222, -99,
- -99, 234, -99, 219, -99, 55, 10, 246, 178, 315,
- -99, 124, -99, -99, -99, 1768, 1048, -99, -99, -99,
- -99, -99, 354, 2338, 1407, 13, 458, 85, 440, 121,
- 1136, 2148, 14, 2, 348, 42, 65, 666, 82, 81,
- -99, 1228, -99, 83, 39, 72, 1136, 90, 67, 1136,
- 100, 1136, 80, 77, 273, 139, -99, 69, 694, -99,
- -99, -99, -99, -99, 959, -99, -99, -99, 781, -99,
- 255, -38, 694, -99, -99, 158, 330, -99, 224, -99,
- 59, -99, -99, 264, -99, -99, 94, -99, -99, -99,
- -99, -99, -99,
+ 439, 1109, 2228, 2228, 2132, 814, -74, 18, 147, -100,
+ 31, -17, -49, 232, -100, 318, 85, -100, -100, 554,
+ 33, 94, 331, 215, -100, -100, -100, 448, 231, 1109,
+ -100, -100, -100, 320, -100, 1940, 1472, 1109, 1109, 1109,
+ -100, 724, 1109, -100, -100, 1109, 1109, -100, -100, -100,
+ -100, -100, 1109, -100, 1109, 1109, -100, 1109, 1109, 129,
+ 157, -100, -100, 1109, 1109, 1109, -100, -100, -100, 200,
+ 1109, 293, 1109, 1109, 1109, 1109, 466, 1109, 1109, 1109,
+ 1109, 1109, 1109, 179, 1109, 1109, 1109, 119, 125, 95,
+ 188, 198, 184, 203, 178, 567, 567, 484, 1109, -5,
+ 1109, 67, 1844, 1109, 1109, -100, -100, -100, -100, -100,
+ -100, -100, -100, -100, -100, -100, -100, -100, -100, -100,
+ -100, -100, -100, -100, -100, -100, -100, -100, -100, -100,
+ -100, -100, -100, -100, -100, -100, -100, -100, -100, 110,
+ 1109, -100, -100, 70, 61, -100, 1109, -100, -100, 1109,
+ -100, -100, -100, -100, -100, -100, -100, -100, -100, -100,
+ -100, -100, -100, 1109, 55, 1109, 1109, 73, 63, 1109,
+ -100, 1844, 1109, 1109, -100, 141, -100, 41, -100, -100,
+ 87, -100, 255, 80, 78, -100, 287, -100, 83, 2228,
+ -100, -100, -100, -100, -100, 225, -100, -100, 52, -100,
+ -100, -100, -100, -100, -100, 2228, -100, -100, 420, -100,
+ 408, 113, 2132, 50, 330, 65, 46, 2420, 72, 1109,
+ -100, 74, 75, 1109, 77, -100, 53, 56, -100, -100,
+ 323, -100, -100, -100, -100, -100, -100, 96, -100, -100,
+ -100, -100, 99, -100, -100, -100, -100, -100, -100, 60,
+ 47, 1109, 118, 93, -100, -100, 1291, -100, 79, 66,
+ 64, -100, 413, 76, 51, 664, 89, 97, 393, 183,
+ 337, 1109, 413, 1109, 1109, 1109, 1109, 411, 1109, 1109,
+ 1109, 1109, 1109, 252, 272, 212, 217, 221, 490, 490,
+ 383, 1109, 64, 1109, 84, 1109, -100, 536, 1109, -100,
+ 1109, 69, 68, 1109, 44, 2132, -100, 1109, 124, 2132,
+ -100, 1109, 54, 1109, 1109, 71, 88, 1109, -100, 82,
+ 122, 154, -100, -100, 1109, -100, 343, 1109, -100, 81,
+ 1109, 90, 2132, -100, 1109, 112, 2132, -100, 86, 333,
+ -39, -10, 2228, -33, -100, 2132, -100, 1109, 246, 2132,
+ 4, 2132, -100, 10, 16, -21, -100, -100, 2132, -26,
+ 480, 19, 462, 128, 1109, 2132, 6, -9, 400, 8,
+ -22, 840, -3, -6, -100, 1202, -100, -7, -28, 5,
+ 1109, 2, -23, 1109, 0, 1109, -34, -30, 1109, -100,
+ 2036, 21, -100, -100, -100, -100, -100, -100, 1109, -100,
+ -100, -100, -100, 209, -100, 1109, 40, -100, 2132, -100,
+ 101, -100, -100, 2132, -100, 1109, 120, 43, -100, 62,
+ -100, 59, 109, 1109, -100, 57, 58, -100, 39, -100,
+ 2132, -100, 117, 2132, -100, 199, -100, -100, 107, 2132,
+ 34, -100, 24, 11, -100, 346, -19, 14, -100, -100,
+ -100, -100, 1109, 133, 2132, -100, 1109, 126, 2132, -100,
+ 20, -100, 173, -100, -100, 1109, -100, -100, 303, -100,
+ -100, -100, 100, 1656, -100, -100, 1564, -100, -100, 1748,
+ -100, -100, -100, -100, -100, -100, 131, -100, -100, -100,
+ -100, -100, -100, -100, -100, 2228, -100, -100, -100, 158,
+ -20, 752, 165, -16, 22, -100, -100, 98, -100, 189,
+ -100, -100, -100, 28, 170, -100, 1109, -100, 230, -100,
+ -100, 247, 1, 13, 238, 37, -24, 106, -100, -100,
+ 273, -100, 1109, -100, 265, -100, -100, 242, -4, 12,
+ 1109, 241, -100, -100, 234, -100, 245, -100, 3, 9,
+ 311, 190, 316, -100, 134, -100, -100, -100, 1380, 1020,
+ -100, -100, -100, -100, -100, 359, 2324, 1472, 15, 444,
+ 38, 394, 138, 1109, 2132, 36, 17, 397, 42, 23,
+ 840, 32, 29, -100, 1202, -100, 26, 35, 48, 1109,
+ 45, 25, 1109, 49, 1109, 27, 30, 314, 132, -100,
+ 7, 752, -100, -100, -100, -100, -100, 930, -100, -100,
+ -100, 752, -100, 253, -87, 617, -100, -100, 102, 290,
+ -100, 191, -100, 140, -100, -100, 275, -100, -100, 91,
+ -100, -100, -100, -100, -100, -100,
- -105, 12, 13, 16, 226, -105, -105, -105, -105, -105,
- -105, -105, -105, -105, -105, -105, -105, -105, -57, -105,
- -105, -105, -105, -105, -105, -105, -105, -105, 68, -105,
- -105, -105, -2, -105, -105, -14, 25, 80, 84, -105,
- 136, 178, -105, -105, 173, 170, -105, -105, -105, -105,
- -105, 139, -105, 165, 132, -105, 128, 124, -105, -105,
- -105, -105, 146, 142, 145, -105, -105, -105, -105, 143,
- -105, 149, 153, 158, 150, -105, 135, 118, 177, 157,
- 161, 179, -105, 85, 73, 117, -105, -105, -105, -105,
- -105, -105, -105, -105, -105, -105, -105, 94, -105, 97,
- -105, 183, 79, 64, -105, -105, -105, -105, -105, -105,
- -105, -105, -105, -105, -105, -105, -105, -105, -105, -105,
- -105, -105, -105, -105, -105, -105, -105, -105, -105, -105,
- -105, -105, -105, -105, -105, -105, -105, -105, -105, 56,
- -105, -105, -105, -105, -105, 15, -105, -105, 37, -105,
- -105, -105, -105, -105, -105, -105, -105, -105, -105, -105,
- -105, -105, 65, -105, 67, 53, -105, -105, 40, -105,
- 212, 52, 172, -105, -105, -105, -105, -105, -105, -105,
- -105, -11, -105, -105, -105, 46, -105, -105, 55, -105,
- -105, -105, -105, -105, -105, -105, -105, -105, -105, -105,
- -105, -105, -105, -105, 99, -105, -105, 38, -105, 36,
- -105, 42, -105, 71, -105, -105, -105, -105, 74, -105,
- -105, -105, 72, 57, -105, -105, -105, -105, -105, -8,
- -105, -105, -105, -105, -105, -105, -105, -105, -105, -105,
- -105, -105, -105, -105, -105, -105, -105, -105, -105, -105,
- 10, -105, -105, -105, -105, 109, -105, -105, -105, -105,
- -105, -105, -105, -105, -105, -105, -105, -105, -105, 8,
- 185, -105, 231, 241, 250, 242, -105, 115, 87, 108,
- 98, 95, -105, -105, -105, -105, -105, -105, -105, -105,
- 196, -105, 188, -105, 215, -105, -105, 218, -105, 113,
- -105, -105, 114, -105, 23, -105, 6, -105, 100, -105,
- 219, -105, 187, 207, -105, -105, 208, -105, -105, -105,
- -105, -105, -105, 181, -105, 83, 92, -105, -105, 101,
- -105, 76, -105, 77, -105, 70, -105, -105, 75, -105,
- -105, 96, -105, -105, 69, -105, 82, -105, 28, -105,
- 43, -105, -105, -105, -105, -105, -105, 51, -105, 34,
- -105, 29, -105, 169, 35, -105, -105, 45, -105, -105,
- 81, -105, -105, -105, 59, -105, -105, -105, -105, 66,
- -105, 48, 110, -105, 102, -105, -105, 41, -105, 47,
- -105, -105, -105, -105, -105, -105, -105, 50, -105, -105,
- -105, -105, -105, -105, 105, -105, -105, 54, -105, -105,
- -105, -105, 58, -105, 62, -105, -105, -105, -105, -105,
- -26, -105, 63, -105, -27, -105, -105, -105, -105, -16,
- -105, -105, -18, -105, -105, -105, -105, -105, -105, -58,
- -105, -105, 31, -105, 30, -105, 20, -105, -105, -105,
- -105, 33, -105, 39, -105, 49, -105, 44, -105, -105,
- -105, -105, -105, -105, 21, -105, -105, 78, -105, -105,
- -105, -105, 61, -105, -105, 248, -105, -105, 60, -105,
- -105, -105, -105, -105, -105, -105, -105, -105, -105, -105,
- -105, -105, -105, -105, -105, -105, -105, -105, 22, -105,
- -105, -105, -105, -105, -105, -105, -22, -105, -105, -105,
- -105, -105, -105, 32, -105, -105, -105, -105, -105, -105,
- -105, -19, -105, -105, -105, -105, -105, -105, -105, 3,
- -105, -105, -105, -105, -20, -105, -105, -3, -105, -105,
- -105, -105, -105, 9, -105, -105, -105, 14, 0, 11,
- -105, -105, -105, -105, -105, 293, 282, -105, -105, -105,
- -105, -105, -105, -105, 284, 17, 18, -105, -6, -105,
- 169, 24, -105, -105, 27, -105, -105, 205, -105, -105,
- -105, 26, -105, -105, -105, -105, 19, -105, -7, 88,
- -105, 91, -105, -105, -105, -105, -105, -105, 245, -105,
- -105, -105, -105, -105, 292, -105, -105, -105, -1, -105,
- -105, 5, 342, -105, -105, -105, 4, -105, -105, -105,
- -105, -105, -105, 7, -105, -105, -105, -105, -105, -105,
- -105, -105, -105};
+ -106, 12, -87, 18, 17, 212, -106, -106, -106, -106,
+ -106, -106, -106, -106, -106, -106, -106, -106, -106, -53,
+ -106, -106, -106, -106, -106, -106, -106, -106, -106, 162,
+ -106, -106, -106, -4, -106, -106, -11, 24, 75, 76,
+ -106, 83, 55, -106, -106, 157, 158, -106, -106, -106,
+ -106, -106, 150, -106, 172, 176, -106, 168, 167, -106,
+ -106, -106, -106, 173, 154, 115, -106, -106, -106, -106,
+ 147, -106, 121, 113, 112, 125, -106, 128, 143, 146,
+ 140, 139, 136, -106, 122, 138, 130, -106, -106, -106,
+ -106, -106, -106, -106, -106, -106, -106, -106, 149, -106,
+ 153, -106, 110, 82, 46, -106, -106, -106, -106, -106,
+ -106, -106, -106, -106, -106, -106, -106, -106, -106, -106,
+ -106, -106, -106, -106, -106, -106, -106, -106, -106, -106,
+ -106, -106, -106, -106, -106, -106, -106, -106, -106, -106,
+ 35, -106, -106, -106, -106, -106, 37, -106, -106, 45,
+ -106, -106, -106, -106, -106, -106, -106, -106, -106, -106,
+ -106, -106, -106, 92, -106, 88, 58, -106, -106, 51,
+ -106, 209, 72, 78, -106, -106, -106, -106, -106, -106,
+ -106, -106, 27, -106, -106, -106, 63, -106, -106, -106,
+ -106, -106, -106, -106, -106, -106, -106, -106, -106, -106,
+ -106, -106, -106, -106, -106, 50, -106, -106, 28, -106,
+ 29, -106, 47, -106, 33, -106, -106, 66, -106, 73,
+ -106, -106, -106, 81, 53, -106, -106, -106, -106, -106,
+ -13, -106, -106, -106, -106, -106, -106, -106, -106, -106,
+ -106, -106, -106, -106, -106, -106, -106, -106, -106, -106,
+ -106, 9, -106, -106, -106, -106, 111, -106, -106, -106,
+ -106, -106, -106, -106, -106, -106, -106, -106, -106, -106,
+ 3, 186, -106, 220, 228, 234, 204, -106, 90, 91,
+ 94, 97, 93, -106, -106, -106, -106, -106, -106, -106,
+ -106, 210, -106, 187, -106, 214, -106, -106, 208, -106,
+ 207, -106, -106, 155, -106, 8, -106, 4, -106, -1,
+ -106, 217, -106, 177, 185, -106, -106, 184, -106, -106,
+ -106, -106, -106, -106, 183, -106, 194, 105, -106, -106,
+ 99, -106, 71, -106, 74, -106, 65, -106, -106, 114,
+ -106, -106, -55, -106, -106, 64, -106, 44, -106, 30,
+ -106, 31, -106, -106, -106, -106, -106, -106, 57, -106,
+ 36, -106, 40, -106, 70, 59, -106, -106, 42, -106,
+ -106, 104, -106, -106, -106, 38, -106, -106, -106, -106,
+ 79, -106, 69, 108, -106, 84, -106, -106, 56, -106,
+ 68, -106, -106, -106, -106, -106, -106, -106, 52, -106,
+ -106, -106, -106, -106, -106, 109, -106, -106, 77, -106,
+ -106, -106, -106, 86, -106, 80, -106, -106, -106, -106,
+ -106, -59, -106, 43, -106, -63, -106, -106, -106, -106,
+ 98, -106, -106, 95, -106, -106, -106, -106, -106, 60,
+ -34, -106, -106, 32, -106, 41, -106, 39, -106, -106,
+ -106, -106, 49, -106, 61, -106, 62, -106, 48, -106,
+ -106, -106, -106, -106, -106, 23, -106, -106, 96, -106,
+ -106, -106, -106, 34, -106, -106, 133, -106, -106, 54,
+ -106, -106, -106, -106, -106, -106, -106, -106, -106, -106,
+ -106, -106, -106, -106, -106, 67, -106, -106, -106, -106,
+ -106, 22, -106, -106, -106, -106, -106, -106, -106, -22,
+ -106, -106, -106, -106, -106, -106, 2, -106, -106, -106,
+ -106, -106, -106, -106, -19, -106, -106, -106, -106, -106,
+ -106, -106, 100, -106, -106, -106, -106, -21, -106, -106,
+ -3, -106, -106, -106, -106, -106, 13, -106, -106, -106,
+ 11, 14, 10, -106, -106, -106, -106, -106, 279, 283,
+ -106, -106, -106, -106, -106, -106, 19, 273, 15, 16,
+ -106, 21, -106, 224, 6, -106, -106, 25, -106, -106,
+ 85, -106, -106, -106, 26, -106, -106, -106, -106, 20,
+ -106, 7, 87, -106, 107, -106, -106, -106, -106, -106,
+ -106, 317, -106, -106, -106, -106, -106, 277, -106, -106,
+ -106, 0, -106, -106, -2, 271, -106, -106, -106, 1,
+ -106, -106, -106, -106, -106, -106, 5, -106, -106, -106,
+ -106, -106, -106, -106, -106, -106};
const short QmlJSGrammar::action_info [] = {
- -107, 464, 534, 541, 414, 255, -97, -115, -96, 346,
- 401, 506, -93, 608, 343, 341, 234, 340, 511, 338,
- 331, -107, 632, -118, 97, 399, 387, 350, 389, 162,
- -120, 422, 162, 422, 181, 177, 418, 422, 255, 438,
- 429, 442, 438, 444, 168, 446, 556, 428, 139, -93,
- 406, 455, 608, 451, -123, 69, 139, 438, 397, 99,
- 185, 145, 188, 548, 187, 310, 97, 455, 147, 294,
- 551, 270, 139, 302, 99, 414, 292, 346, 537, -118,
- 407, 412, 438, 344, 290, 536, 299, 69, -97, -115,
- -96, 290, -126, 451, 414, 329, 255, -120, 250, 310,
- 438, 346, 556, 521, 527, 316, 323, -123, 524, 333,
- 304, 523, 441, 455, 292, 249, 451, 139, 139, 555,
- 622, 621, 139, 425, 139, 139, 442, 432, 139, 411,
- 410, 0, 56, 56, 164, 56, 325, 0, 165, 475,
- 139, 139, 139, 57, 57, 556, 57, 598, 56, 526,
- 525, 170, 247, 246, 139, 628, 627, 247, 246, 57,
- 139, 312, 254, 253, 60, 313, 175, 513, 426, 252,
- 171, 519, 139, 170, 348, 61, 486, 416, 139, 245,
- 244, 101, 247, 246, 270, 553, 552, 476, 140, 326,
- 240, 239, 171, 335, 453, 599, 83, 467, 84, 170,
- 102, 83, 103, 84, 139, 529, 308, 507, 507, 85,
- 0, 83, 457, 84, 85, 0, 507, 509, 171, 0,
- 172, 514, 512, 139, 85, 517, 516, 83, 508, 84,
- 139, 436, 435, 83, 83, 84, 84, 0, 0, 83,
- 85, 84, 83, 83, 84, 84, 85, 85, 507, 0,
- 468, 466, 85, 509, 509, 85, 85, 233, 232, 530,
- 528, 83, 509, 84, 508, 508, 83, 83, 84, 84,
- 543, 170, 507, 508, 85, 33, 533, 532, 170, 85,
- 85, 0, 62, 540, 539, 625, 624, 83, 170, 84,
- 171, 0, 404, 33, 509, 544, 542, 171, 33, 404,
- 85, 33, 618, 0, 33, 508, -84, 171, 0, 172,
- 0, 0, 46, 48, 47, 623, 619, 617, 509, 33,
- 71, 72, 272, 273, 33, 71, 72, 63, 33, 508,
- 46, 48, 47, 64, 33, 46, 48, 47, 46, 48,
- 47, 46, 48, 47, 33, 0, 616, 73, 74, 274,
- 275, 0, 73, 74, 33, 0, 46, 48, 47, 33,
- 0, 46, 48, 47, 33, 46, 48, 47, 33, 170,
- 0, 46, 48, 47, 0, 0, 0, 33, 0, 0,
- 0, 46, 48, 47, -337, 0, 0, -84, 171, 0,
- 172, 46, 48, 47, 0, 0, 46, 48, 47, 0,
- 0, 46, 48, 47, 0, 46, 48, 47, 5, 4,
- 3, 1, 2, 33, 46, 48, 47, 277, 278, 0,
- -337, 277, 278, 0, 0, 0, 279, 277, 278, 280,
- 279, 281, 0, 280, 33, 281, 279, 0, 0, 280,
- 0, 281, 0, 0, 0, 33, 277, 278, 0, 0,
- 46, 48, 47, 272, 273, 279, 277, 278, 280, 33,
- 281, 0, 0, 0, 0, 279, 243, 242, 280, 33,
- 281, 46, 48, 47, 0, 0, 0, 238, 237, 33,
- 274, 275, 46, 48, 47, 0, 0, 33, 0, 0,
- 0, 238, 237, 0, 0, 0, 46, 48, 47, 0,
- 0, 243, 242, 0, 0, 0, 46, 48, 47, 0,
- 0, 243, 242, 149, 0, 0, 46, 48, 47, 238,
- 237, 0, 0, 150, 46, 48, 47, 151, 0, 0,
- 0, 0, 0, 0, 76, 77, 152, 0, 153, 0,
- 0, 0, 78, 79, 0, 0, 80, 0, 81, 154,
- 149, 155, 60, 0, 0, 0, 0, 0, 0, 156,
- 150, 0, 157, 61, 151, 0, 0, 0, 158, 0,
- 0, 0, 0, 152, 159, 153, 0, 0, 306, 0,
- 0, 0, 0, 0, 0, 0, 154, 0, 155, 60,
- 160, 0, 0, 0, 0, 0, 156, 29, 30, 157,
- 61, 0, 0, 0, 0, 158, 0, 32, 0, 0,
- 149, 159, 0, 0, 33, 0, 0, 0, 34, 35,
- 150, 36, 0, 0, 151, 0, 0, 160, 40, 0,
- 0, 0, 43, 152, 0, 153, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 154, 0, 155, 60,
- 49, 46, 48, 47, 0, 50, 156, 0, 0, 157,
- 61, 0, 0, 0, 0, 158, 42, 52, 31, 0,
- 0, 159, 39, 0, 0, 0, 0, 0, 29, 30,
- 0, 0, 0, 0, 0, 0, 0, 160, 32, 0,
- 0, 0, 0, 0, 0, 33, 0, 0, 0, 34,
- 35, 0, 36, 0, 0, 0, 29, 30, 0, 40,
- 0, 0, 0, 43, 0, 0, 32, 0, 0, 0,
- 0, 0, 0, 33, 0, 0, 0, 34, 35, 0,
- 36, 49, 46, 48, 47, 0, 50, 498, 0, 0,
- 0, 43, 0, 0, 0, 0, 0, 42, 52, 31,
- 0, 0, 0, 39, 0, 0, 0, 0, 0, 49,
- 46, 48, 47, 0, 50, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 42, 52, 31, 0, 0,
- 0, 39, 0, 0, 0, 29, 30, 0, 0, 0,
- 0, 0, 0, 29, 30, 32, 0, 0, 0, 0,
- 0, 0, 33, 32, 0, 0, 34, 35, 0, 36,
- 33, 0, 0, 0, 34, 35, 40, 36, 0, 0,
- 43, 0, 0, 0, 498, 0, 0, 0, 43, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 49, 46,
- 48, 47, 0, 50, 0, 0, 49, 46, 48, 47,
- 0, 50, 0, 0, 42, 52, 31, 0, 0, 0,
- 39, 0, 42, 52, 31, 0, 0, 0, 39, 0,
+ -97, -98, 452, 611, -116, 527, 456, -124, 415, -121,
+ 439, 551, -119, -108, 347, -94, 611, 388, 635, 540,
+ 351, 341, 344, 342, 390, 539, -127, 256, 398, 402,
+ 100, 98, 70, -97, 400, 163, -98, 465, 524, -116,
+ 559, 447, 530, -108, 439, -127, 509, 439, 559, -94,
+ 537, 544, -121, 256, 443, -119, -124, 514, 439, 347,
+ 445, 526, 423, 452, 423, 430, 456, 423, 70, 554,
+ 169, 415, 345, 311, 100, 163, 419, 140, 146, 408,
+ 271, 413, 347, 251, 295, 271, 256, 0, 186, 452,
+ 0, 311, 456, 140, 429, 317, 0, 0, 0, 324,
+ 407, 178, 291, 98, 305, 558, 0, 235, 476, 0,
+ 439, 415, 300, 442, 291, 0, 189, 171, 140, 426,
+ 140, 148, 339, 182, 433, 140, 140, 443, 140, 303,
+ 326, 559, 140, 0, 140, 57, 172, 250, 188, 140,
+ 601, 140, 330, 293, 165, 0, 58, 313, 166, 140,
+ 332, 314, 631, 630, 255, 254, 477, 241, 240, 57,
+ 246, 245, 412, 411, 427, 57, 141, 529, 528, 63,
+ 58, 61, 336, 171, 248, 247, 58, 516, 253, 0,
+ 417, 468, 62, 327, 309, 334, 458, 57, 602, 248,
+ 247, 487, 172, 454, 522, 556, 555, 176, 58, 248,
+ 247, 625, 624, 84, 84, 85, 85, 140, 84, 84,
+ 85, 85, 63, 84, 64, 85, 86, 86, 510, 510,
+ 65, 86, 86, 84, 171, 85, 86, 63, 84, 0,
+ 85, 517, 515, 140, 469, 467, 86, 84, 140, 85,
+ 512, 86, 84, 172, 85, 405, 84, 102, 85, 140,
+ 86, 511, 628, 627, 140, 86, 84, 64, 85, 86,
+ 437, 436, 171, 65, 512, 512, 103, 510, 104, 86,
+ 546, 510, 64, 140, 510, 511, 511, 84, 65, 85,
+ 532, 172, 626, 405, 34, 0, 234, 233, 0, 0,
+ 86, 520, 519, 0, 0, 547, 545, 84, 0, 85,
+ 621, 0, 543, 542, 34, 0, 349, 0, 0, 0,
+ 86, 72, 73, 512, 622, 620, 34, 512, 0, 34,
+ 512, 47, 49, 48, 511, 0, 536, 535, 511, 171,
+ 0, 511, 34, 0, 533, 531, 72, 73, 74, 75,
+ 34, 47, 49, 48, 619, 34, 171, -85, 172, 34,
+ 173, 0, 34, 47, 49, 48, 47, 49, 48, 34,
+ 0, 0, 34, 74, 75, 172, 34, 173, 0, 47,
+ 49, 48, 34, 0, 171, 34, 0, 47, 49, 48,
+ 0, 0, 47, 49, 48, 0, 47, 49, 48, 47,
+ 49, 48, -85, 172, 0, 173, 47, 49, 48, 47,
+ 49, 48, 0, 47, 49, 48, 278, 279, 0, 47,
+ 49, 48, 47, 49, 48, 280, 278, 279, 281, 0,
+ 282, 0, 0, 34, 0, 280, 34, 0, 281, 34,
+ 282, 273, 274, -339, 278, 279, -339, 34, 0, 0,
+ 0, 0, 0, 280, 0, 0, 281, 0, 282, 34,
+ 0, 0, 0, 0, 0, 244, 243, 0, 275, 276,
+ 47, 49, 48, 47, 49, 48, 47, 49, 48, 244,
+ 243, 77, 78, 34, 47, 49, 48, 0, 0, 79,
+ 80, 239, 238, 81, 0, 82, 47, 49, 48, 77,
+ 78, 34, 0, 0, 0, 0, 0, 79, 80, 0,
+ 0, 81, 0, 82, 0, 239, 238, 77, 78, 34,
+ 47, 49, 48, 278, 279, 79, 80, 0, 0, 81,
+ 0, 82, 280, 244, 243, 281, 0, 282, 47, 49,
+ 48, 6, 5, 4, 1, 3, 2, 0, 0, 150,
+ 0, 239, 238, 0, 0, 0, 47, 49, 48, 151,
+ 0, 0, 0, 152, 0, 0, 0, 150, 0, 0,
+ 0, 0, 153, 0, 154, 0, 0, 151, 0, 0,
+ 0, 152, 0, 0, 0, 155, 0, 156, 61, 0,
+ 153, 0, 154, 0, 0, 157, 0, 0, 158, 62,
+ 77, 78, 0, 155, 159, 156, 61, 0, 79, 80,
+ 160, 0, 81, 157, 82, 0, 158, 62, 0, 0,
+ 0, 0, 159, 0, 0, 0, 161, 0, 160, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 30,
+ 31, 0, 0, 0, 161, 0, 0, 0, 0, 33,
+ 0, 0, 0, 0, 0, 0, 34, 0, 0, 0,
+ 35, 36, 0, 37, 0, 0, 0, 0, 0, 0,
+ 501, 0, 0, 0, 44, 0, 0, 150, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 151, 0, 0,
+ 0, 152, 50, 47, 49, 48, 0, 51, 0, 0,
+ 153, 0, 154, 0, 0, 307, 0, 0, 43, 53,
+ 32, 0, 0, 155, 40, 156, 61, 0, 0, 0,
+ 0, 0, 0, 157, 0, 0, 158, 62, 0, 0,
+ 0, 0, 159, 0, 0, 0, 0, 0, 160, 0,
+ 0, 0, 0, 0, 0, 0, 30, 31, 0, 0,
+ 0, 0, 0, 0, 161, 0, 33, 0, 0, 0,
+ 0, 0, 0, 34, 0, 0, 0, 35, 36, 0,
+ 37, 0, 0, 0, 30, 31, 0, 41, 0, 0,
+ 0, 44, 0, 0, 33, 0, 0, 0, 0, 0,
+ 0, 34, 0, 0, 0, 35, 36, 0, 37, 50,
+ 47, 49, 48, 0, 51, 501, 0, 0, 0, 44,
+ 0, 0, 0, 0, 0, 43, 53, 32, 0, 0,
+ 0, 40, 0, 0, 0, 0, 0, 50, 47, 49,
+ 48, 0, 51, 0, 500, 0, 30, 31, 0, 0,
+ 0, 0, 0, 43, 53, 32, 214, 0, 0, 40,
+ 0, 0, 0, 34, 0, 0, 0, 35, 36, 0,
+ 37, 0, 30, 31, 0, 0, 0, 501, 0, 0,
+ 0, 44, 33, 0, 0, 0, 0, 0, 0, 34,
+ 0, 0, 0, 35, 36, 0, 37, 0, 0, 50,
+ 502, 504, 503, 41, 51, 0, 0, 44, 0, 225,
+ 0, 0, 0, 0, 0, 43, 53, 32, 209, 0,
+ 0, 40, 0, 0, 0, 50, 47, 49, 48, 0,
+ 51, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 43, 53, 32, 0, 0, 0, 40, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 497, 0, 29, 30, 0, 0, 0, 0, 0, 0,
- 0, 0, 213, 0, 0, 0, 0, 0, 0, 33,
- 0, 0, 0, 34, 35, 0, 36, 0, 0, 0,
- 0, 0, 0, 498, 0, 0, 0, 43, 0, 0,
+ 500, 0, 30, 31, 0, 0, 0, 0, 0, 0,
+ 0, 0, 214, 0, 0, 0, 0, 0, 0, 34,
+ 0, 0, 0, 35, 36, 0, 37, 0, 0, 0,
+ 0, 0, 0, 501, 0, 0, 0, 44, 0, 0,
+ 0, 0, 0, 0, 0, 608, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 50, 502, 504, 503, 0,
+ 51, 0, 0, 0, 0, 225, 0, 0, 0, 0,
+ 0, 43, 53, 32, 209, 0, 0, 40, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 49, 499, 501, 500, 0,
- 50, 0, 0, 0, 0, 224, 0, 0, 0, 0,
- 0, 42, 52, 31, 208, 0, 0, 39, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 497,
- 0, 29, 30, 0, 0, 0, 0, 0, 0, 0,
- 0, 213, 0, 0, 0, 0, 0, 0, 33, 0,
- 0, 0, 34, 35, 0, 36, 0, 0, 0, 0,
- 0, 0, 498, 0, 0, 0, 43, 0, 0, 0,
- 0, 0, 0, 0, 605, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 49, 499, 501, 500, 0, 50,
- 0, 0, 0, 0, 224, 0, 0, 0, 0, 0,
- 42, 52, 31, 208, 0, 0, 39, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 497, 0,
- 29, 30, 0, 0, 0, 0, 0, 0, 0, 0,
- 213, 0, 0, 0, 0, 0, 0, 33, 0, 0,
- 0, 34, 35, 0, 36, 0, 0, 0, 0, 0,
- 0, 498, 0, 0, 0, 43, 0, 0, 0, 0,
- 0, 0, 0, 602, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 49, 499, 501, 500, 0, 50, 0,
- 0, 0, 0, 224, 0, 0, 0, 0, 0, 42,
- 52, 31, 208, 0, 0, 39, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 28, 29, 30,
- 0, 0, 0, 0, 0, 0, 0, 0, 32, 0,
- 0, 0, 0, 0, 0, 33, 0, 0, 0, 34,
- 35, 0, 36, 0, 0, 0, 37, 0, 38, 40,
- 41, 0, 0, 43, 0, 0, 0, 44, 0, 45,
+ 500, 0, 30, 31, 0, 0, 0, 0, 0, 0,
+ 0, 0, 214, 0, 0, 0, 0, 0, 0, 34,
+ 0, 0, 0, 35, 36, 0, 37, 0, 0, 0,
+ 0, 0, 0, 501, 0, 0, 0, 44, 0, 0,
+ 0, 0, 0, 0, 0, 605, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 50, 502, 504, 503, 0,
+ 51, 0, 0, 0, 0, 225, 0, 0, 0, 0,
+ 0, 43, 53, 32, 209, 0, 0, 40, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 49, 46, 48, 47, 0, 50, 0, 51, 0,
- 53, 0, 54, 0, 0, 0, 0, 42, 52, 31,
- 0, 0, 0, 39, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, -116, 0, 0, 0, 28,
- 29, 30, 0, 0, 0, 0, 0, 0, 0, 0,
- 32, 0, 0, 0, 0, 0, 0, 33, 0, 0,
- 0, 34, 35, 0, 36, 0, 0, 0, 37, 0,
- 38, 40, 41, 0, 0, 43, 0, 0, 0, 44,
- 0, 45, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 49, 46, 48, 47, 0, 50, 0,
- 51, 0, 53, 0, 54, 0, 0, 0, 0, 42,
- 52, 31, 0, 0, 0, 39, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 28, 29, 30,
- 0, 0, 0, 0, 0, 0, 0, 0, 32, 0,
- 0, 0, 0, 0, 0, 33, 0, 0, 0, 34,
- 35, 0, 36, 0, 0, 0, 37, 0, 38, 40,
- 41, 0, 0, 43, 0, 0, 0, 44, 0, 45,
+ 29, 30, 31, 0, 0, 0, 0, 0, 0, 0,
+ 0, 33, 0, 0, 0, 0, 0, 0, 34, 0,
+ 0, 0, 35, 36, 0, 37, 0, 0, 0, 38,
+ 0, 39, 41, 42, 0, 0, 44, 0, 0, 0,
+ 45, 0, 46, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 50, 47, 49, 48, 0, 51,
+ 0, 52, 0, 54, 0, 55, 0, 0, 0, 0,
+ 43, 53, 32, 0, 0, 0, 40, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, -117,
+ 0, 0, 0, 29, 30, 31, 0, 0, 0, 0,
+ 0, 0, 0, 0, 33, 0, 0, 0, 0, 0,
+ 0, 34, 0, 0, 0, 35, 36, 0, 37, 0,
+ 0, 0, 38, 0, 39, 41, 42, 0, 0, 44,
+ 0, 0, 0, 45, 0, 46, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 50, 47, 49,
+ 48, 0, 51, 0, 52, 0, 54, 0, 55, 0,
+ 0, 0, 0, 43, 53, 32, 0, 0, 0, 40,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 49, 46, 48, 47, 0, 50, 0, 51, 0,
- 53, 269, 54, 0, 0, 0, 0, 42, 52, 31,
- 0, 0, 0, 39, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 473, 0, 0, 28, 29,
- 30, 0, 0, 0, 0, 0, 0, 0, 0, 32,
+ 0, 0, 29, 30, 31, 0, 0, 0, 0, 0,
+ 0, 0, 0, 33, 0, 0, 0, 0, 0, 0,
+ 34, 0, 0, 0, 35, 36, 0, 37, 0, 0,
+ 0, 38, 0, 39, 41, 42, 0, 0, 44, 0,
+ 0, 0, 45, 0, 46, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 50, 47, 49, 48,
+ 0, 51, 0, 52, 0, 54, 270, 55, 0, 0,
+ 0, 0, 43, 53, 32, 0, 0, 0, 40, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 29, 30, 31, 0, 0, 0, 0, 0, 0,
+ 0, 0, 33, 0, 0, 0, 0, 0, 0, 34,
+ 216, 0, 0, 566, 567, 0, 37, 0, 0, 0,
+ 38, 0, 39, 41, 42, 0, 0, 44, 0, 0,
+ 0, 45, 0, 46, 0, 0, 0, 0, 0, 0,
+ 0, 220, 0, 0, 0, 50, 47, 49, 48, 0,
+ 51, 0, 52, 0, 54, 0, 55, 0, 0, 0,
+ 0, 43, 53, 32, 0, 0, 0, 40, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 474, 0, 0, 29, 30, 31, 0, 0, 0, 0,
+ 0, 0, 0, 0, 33, 0, 0, 0, 0, 0,
+ 0, 34, 0, 0, 0, 35, 36, 0, 37, 0,
+ 0, 0, 38, 0, 39, 41, 42, 0, 0, 44,
+ 0, 0, 0, 45, 0, 46, 0, 0, 475, 0,
+ 0, 0, 0, 0, 0, 0, 0, 50, 47, 49,
+ 48, 0, 51, 0, 52, 0, 54, 0, 55, 0,
+ 0, 0, 0, 43, 53, 32, 0, 0, 0, 40,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 474, 0, 0, 29, 30, 31, 0, 0,
0, 0, 0, 0, 0, 0, 33, 0, 0, 0,
- 34, 35, 0, 36, 0, 0, 0, 37, 0, 38,
- 40, 41, 0, 0, 43, 0, 0, 0, 44, 0,
- 45, 0, 0, 474, 0, 0, 0, 0, 0, 0,
- 0, 0, 49, 46, 48, 47, 0, 50, 0, 51,
- 0, 53, 0, 54, 0, 0, 0, 0, 42, 52,
- 31, 0, 0, 0, 39, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 481, 0, 0, 28,
- 29, 30, 0, 0, 0, 0, 0, 0, 0, 0,
- 32, 0, 0, 0, 0, 0, 0, 33, 0, 0,
- 0, 34, 35, 0, 36, 0, 0, 0, 37, 0,
- 38, 40, 41, 0, 0, 43, 0, 0, 0, 44,
- 0, 45, 0, 0, 484, 0, 0, 0, 0, 0,
- 0, 0, 0, 49, 46, 48, 47, 0, 50, 0,
- 51, 0, 53, 0, 54, 0, 0, 0, 0, 42,
- 52, 31, 0, 0, 0, 39, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 481, 0, 0,
- 28, 29, 30, 0, 0, 0, 0, 0, 0, 0,
- 0, 32, 0, 0, 0, 0, 0, 0, 33, 0,
- 0, 0, 34, 35, 0, 36, 0, 0, 0, 37,
- 0, 38, 40, 41, 0, 0, 43, 0, 0, 0,
- 44, 0, 45, 0, 0, 482, 0, 0, 0, 0,
- 0, 0, 0, 0, 49, 46, 48, 47, 0, 50,
- 0, 51, 0, 53, 0, 54, 0, 0, 0, 0,
- 42, 52, 31, 0, 0, 0, 39, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 473, 0,
- 0, 28, 29, 30, 0, 0, 0, 0, 0, 0,
- 0, 0, 32, 0, 0, 0, 0, 0, 0, 33,
- 0, 0, 0, 34, 35, 0, 36, 0, 0, 0,
- 37, 0, 38, 40, 41, 0, 0, 43, 0, 0,
- 0, 44, 0, 45, 0, 0, 479, 0, 0, 0,
- 0, 0, 0, 0, 0, 49, 46, 48, 47, 0,
- 50, 0, 51, 0, 53, 0, 54, 0, 0, 0,
- 0, 42, 52, 31, 0, 0, 0, 39, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 28,
- 29, 30, 0, 0, 0, 0, 0, 0, 0, 0,
- 32, 0, 0, 0, 0, 0, 0, 33, 215, 0,
- 0, 563, 564, 0, 36, 0, 0, 0, 37, 0,
- 38, 40, 41, 0, 0, 43, 0, 0, 0, 44,
- 0, 45, 0, 0, 0, 0, 0, 0, 0, 219,
- 0, 0, 0, 49, 46, 48, 47, 0, 50, 0,
- 51, 0, 53, 0, 54, 0, 0, 0, 0, 42,
- 52, 31, 0, 0, 0, 39, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 107, 108, 109,
- 0, 0, 111, 113, 114, 0, 0, 115, 0, 116,
- 0, 0, 0, 118, 119, 120, 0, 0, 0, 0,
- 0, 0, 33, 121, 122, 123, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 124, 0, 0, 0,
+ 0, 0, 0, 34, 0, 0, 0, 35, 36, 0,
+ 37, 0, 0, 0, 38, 0, 39, 41, 42, 0,
+ 0, 44, 0, 0, 0, 45, 0, 46, 0, 0,
+ 480, 0, 0, 0, 0, 0, 0, 0, 0, 50,
+ 47, 49, 48, 0, 51, 0, 52, 0, 54, 0,
+ 55, 0, 0, 0, 0, 43, 53, 32, 0, 0,
+ 0, 40, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 482, 0, 0, 29, 30, 31,
+ 0, 0, 0, 0, 0, 0, 0, 0, 33, 0,
+ 0, 0, 0, 0, 0, 34, 0, 0, 0, 35,
+ 36, 0, 37, 0, 0, 0, 38, 0, 39, 41,
+ 42, 0, 0, 44, 0, 0, 0, 45, 0, 46,
+ 0, 0, 485, 0, 0, 0, 0, 0, 0, 0,
+ 0, 50, 47, 49, 48, 0, 51, 0, 52, 0,
+ 54, 0, 55, 0, 0, 0, 0, 43, 53, 32,
+ 0, 0, 0, 40, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 482, 0, 0, 29,
+ 30, 31, 0, 0, 0, 0, 0, 0, 0, 0,
+ 33, 0, 0, 0, 0, 0, 0, 34, 0, 0,
+ 0, 35, 36, 0, 37, 0, 0, 0, 38, 0,
+ 39, 41, 42, 0, 0, 44, 0, 0, 0, 45,
+ 0, 46, 0, 0, 483, 0, 0, 0, 0, 0,
+ 0, 0, 0, 50, 47, 49, 48, 0, 51, 0,
+ 52, 0, 54, 0, 55, 0, 0, 0, 0, 43,
+ 53, 32, 0, 0, 0, 40, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 108, 109,
+ 110, 0, 0, 112, 114, 115, 0, 0, 116, 0,
+ 117, 0, 0, 0, 119, 120, 121, 0, 0, 0,
+ 0, 0, 0, 34, 122, 123, 124, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 125, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 127, 0, 0, 0, 0, 0, 0, 46,
- 48, 47, 128, 129, 130, 0, 132, 133, 134, 135,
- 136, 137, 0, 0, 125, 131, 117, 110, 112, 126,
+ 0, 0, 0, 128, 0, 0, 0, 0, 0, 0,
+ 47, 49, 48, 129, 130, 131, 0, 133, 134, 135,
+ 136, 137, 138, 0, 0, 126, 132, 118, 111, 113,
+ 127, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 108, 109, 110, 0, 0, 112,
+ 114, 115, 0, 0, 116, 0, 117, 0, 0, 0,
+ 119, 120, 121, 0, 0, 0, 0, 0, 0, 392,
+ 122, 123, 124, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 125, 0, 0, 0, 393, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 128,
+ 0, 0, 0, 0, 0, 397, 394, 396, 0, 129,
+ 130, 131, 0, 133, 134, 135, 136, 137, 138, 0,
+ 0, 126, 132, 118, 111, 113, 127, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 107, 108, 109, 0, 0, 111, 113, 114,
- 0, 0, 115, 0, 116, 0, 0, 0, 118, 119,
- 120, 0, 0, 0, 0, 0, 0, 391, 121, 122,
- 123, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 124, 0, 0, 0, 392, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 127, 0, 0,
- 0, 0, 0, 396, 393, 395, 0, 128, 129, 130,
- 0, 132, 133, 134, 135, 136, 137, 0, 0, 125,
- 131, 117, 110, 112, 126, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 107, 108, 109,
- 0, 0, 111, 113, 114, 0, 0, 115, 0, 116,
- 0, 0, 0, 118, 119, 120, 0, 0, 0, 0,
- 0, 0, 391, 121, 122, 123, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 124, 0, 0, 0,
- 392, 0, 0, 0, 0, 0, 0, 0, 394, 0,
- 0, 0, 127, 0, 0, 0, 0, 0, 396, 393,
- 395, 0, 128, 129, 130, 0, 132, 133, 134, 135,
- 136, 137, 0, 0, 125, 131, 117, 110, 112, 126,
+ 108, 109, 110, 0, 0, 112, 114, 115, 0, 0,
+ 116, 0, 117, 0, 0, 0, 119, 120, 121, 0,
+ 0, 0, 0, 0, 0, 392, 122, 123, 124, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 125,
+ 0, 0, 0, 393, 0, 0, 0, 0, 0, 0,
+ 0, 395, 0, 0, 0, 128, 0, 0, 0, 0,
+ 0, 397, 394, 396, 0, 129, 130, 131, 0, 133,
+ 134, 135, 136, 137, 138, 0, 0, 126, 132, 118,
+ 111, 113, 127, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 208, 0, 0, 0,
+ 0, 210, 0, 29, 30, 31, 212, 0, 0, 0,
+ 0, 0, 0, 213, 33, 0, 0, 0, 0, 0,
+ 0, 215, 216, 0, 0, 217, 36, 0, 37, 0,
+ 0, 0, 38, 0, 39, 41, 42, 0, 0, 44,
+ 0, 0, 0, 45, 0, 46, 0, 0, 0, 0,
+ 0, 219, 0, 220, 0, 0, 0, 50, 218, 221,
+ 48, 222, 51, 223, 52, 224, 54, 225, 55, 226,
+ 227, 0, 0, 43, 53, 32, 209, 211, 0, 40,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 207, 0, 0, 0, 0, 209, 0, 28,
- 29, 30, 211, 0, 0, 0, 0, 0, 0, 212,
- 32, 0, 0, 0, 0, 0, 0, 214, 215, 0,
- 0, 216, 35, 0, 36, 0, 0, 0, 37, 0,
- 38, 40, 41, 0, 0, 43, 0, 0, 0, 44,
- 0, 45, 0, 0, 0, 0, 0, 218, 0, 219,
- 0, 0, 0, 49, 217, 220, 47, 221, 50, 222,
- 51, 223, 53, 224, 54, 225, 226, 0, 0, 42,
- 52, 31, 208, 210, 0, 39, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 207, 0, 0,
- 0, 0, 209, 0, 28, 29, 30, 211, 0, 0,
- 0, 0, 0, 0, 212, 213, 0, 0, 0, 0,
- 0, 0, 214, 215, 0, 0, 216, 35, 0, 36,
- 0, 0, 0, 37, 0, 38, 40, 41, 0, 0,
- 43, 0, 0, 0, 44, 0, 45, 0, 0, 0,
- 0, 0, 218, 0, 219, 0, 0, 0, 49, 217,
- 220, 47, 221, 50, 222, 51, 223, 53, 224, 54,
- 225, 226, 0, 0, 42, 52, 31, 208, 210, 0,
- 39, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 566, 108, 109, 0, 0, 568, 113, 570,
- 29, 30, 571, 0, 116, 0, 0, 0, 118, 573,
- 574, 0, 0, 0, 0, 0, 0, 575, 576, 122,
- 123, 216, 35, 0, 36, 0, 0, 0, 37, 0,
- 38, 577, 41, 0, 0, 579, 0, 0, 0, 44,
- 0, 45, 0, 0, 0, 0, 0, 581, 0, 219,
- 0, 0, 0, 583, 580, 582, 47, 584, 585, 586,
- 51, 588, 589, 590, 591, 592, 593, 0, 0, 578,
- 587, 572, 567, 569, 126, 39, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 359, 108, 109,
- 0, 0, 361, 113, 363, 29, 30, 364, 0, 116,
- 0, 0, 0, 118, 366, 367, 0, 0, 0, 0,
- 0, 0, 368, 369, 122, 123, 216, 35, 0, 36,
- 0, 0, 0, 37, 0, 38, 370, 41, 0, 0,
- 372, 0, 0, 0, 44, 0, 45, 0, -262, 0,
- 0, 0, 374, 0, 219, 0, 0, 0, 376, 373,
- 375, 47, 377, 378, 379, 51, 381, 382, 383, 384,
- 385, 386, 0, 0, 371, 380, 365, 360, 362, 126,
- 39, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0,
-
- 538, 510, 184, 535, 522, 459, 531, 241, 148, 307,
- 615, 180, 437, 251, 629, 15, 493, 620, 494, 470,
- 626, 318, 434, 549, 550, 305, 248, 554, 485, 300,
- 349, 236, 547, 518, 601, 515, 452, 248, 443, 447,
- 180, 454, 241, 445, 248, 351, 458, 236, 146, 241,
- 448, 236, 456, 400, 465, 174, 408, 205, 180, 186,
- 413, 433, 300, 430, 427, 415, 431, 437, 423, 434,
- 161, 345, 336, 169, 388, 434, 437, 300, 332, 0,
- 334, 390, 138, 398, 337, 347, 167, 0, 184, 141,
- 0, 459, 402, 480, 483, 300, 318, 144, 205, 0,
- 0, 205, 309, 0, 300, 0, 0, 58, 0, 58,
- 58, 0, 178, 0, 0, 58, 300, 300, 0, 87,
- 403, 163, 58, 0, 487, 166, 58, 58, 488, 58,
- 58, 86, 449, 58, 283, 450, 58, 58, 144, 58,
- 58, 0, 286, 405, 58, 285, 450, 402, 98, 100,
- 58, 264, 58, 0, 449, 284, 268, 58, 328, 58,
- 58, 469, 282, 88, 0, 89, 58, 330, 327, 68,
- 58, 0, 339, 59, 58, 403, 450, 58, 0, 301,
- 303, 58, 82, 492, 58, 58, 66, 58, 58, 67,
- 65, 58, 58, 70, 342, 58, 104, 75, 96, 58,
- 58, 94, 235, 58, 91, 144, 95, 58, 92, 449,
- 176, 58, 58, 178, 491, 58, 402, 490, 106, 58,
- 58, 58, 489, 296, 90, 104, 93, 58, 268, 58,
- 58, 0, 268, 0, 268, 268, 271, 496, 58, 0,
- 0, 293, 0, 268, 403, 324, 314, 106, 173, 296,
- 296, 291, 495, 505, 268, 268, 496, 296, 0, 600,
- 296, 58, 268, 597, 0, 268, 268, 0, 0, 0,
- 0, 315, 317, 58, 0, 0, 311, 478, 268, 295,
- 276, 477, 298, 58, 58, 0, 603, 0, 268, 268,
- 287, 289, 58, 496, 0, 594, 606, 268, 596, 288,
- 0, 0, 597, 496, 562, 0, 0, 0, 495, 505,
- 0, 565, 558, 559, 560, 561, 0, 470, 495, 505,
+ 0, 0, 208, 0, 0, 0, 0, 210, 0, 29,
+ 30, 31, 212, 0, 0, 0, 0, 0, 0, 213,
+ 214, 0, 0, 0, 0, 0, 0, 215, 216, 0,
+ 0, 217, 36, 0, 37, 0, 0, 0, 38, 0,
+ 39, 41, 42, 0, 0, 44, 0, 0, 0, 45,
+ 0, 46, 0, 0, 0, 0, 0, 219, 0, 220,
+ 0, 0, 0, 50, 218, 221, 48, 222, 51, 223,
+ 52, 224, 54, 225, 55, 226, 227, 0, 0, 43,
+ 53, 32, 209, 211, 0, 40, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 569, 109,
+ 110, 0, 0, 571, 114, 573, 30, 31, 574, 0,
+ 117, 0, 0, 0, 119, 576, 577, 0, 0, 0,
+ 0, 0, 0, 578, 579, 123, 124, 217, 36, 0,
+ 37, 0, 0, 0, 38, 0, 39, 580, 42, 0,
+ 0, 582, 0, 0, 0, 45, 0, 46, 0, 0,
+ 0, 0, 0, 584, 0, 220, 0, 0, 0, 586,
+ 583, 585, 48, 587, 588, 589, 52, 591, 592, 593,
+ 594, 595, 596, 0, 0, 581, 590, 575, 570, 572,
+ 127, 40, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 360, 109, 110, 0, 0, 362,
+ 114, 364, 30, 31, 365, 0, 117, 0, 0, 0,
+ 119, 367, 368, 0, 0, 0, 0, 0, 0, 369,
+ 370, 123, 124, 217, 36, 0, 37, 0, 0, 0,
+ 38, 0, 39, 371, 42, 0, 0, 373, 0, 0,
+ 0, 45, 0, 46, 0, -263, 0, 0, 0, 375,
+ 0, 220, 0, 0, 0, 377, 374, 376, 48, 378,
+ 379, 380, 52, 382, 383, 384, 385, 386, 387, 0,
+ 0, 372, 381, 366, 361, 363, 127, 40, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+
+ 541, 310, 460, 513, 538, 518, 525, 308, 249, 632,
+ 306, 181, 252, 618, 149, 16, 623, 495, 319, 497,
+ 629, 357, 496, 435, 471, 553, 557, 486, 438, 301,
+ 428, 237, 350, 352, 604, 521, 242, 424, 550, 552,
+ 181, 301, 185, 237, 242, 343, 432, 348, 338, 249,
+ 459, 237, 453, 449, 236, 242, 446, 181, 466, 401,
+ 448, 249, 357, 455, 444, 457, 346, 337, 357, 484,
+ 142, 236, 147, 333, 438, 175, 301, 335, 187, 409,
+ 162, 145, 435, 416, 435, 139, 170, 399, 414, 481,
+ 438, 389, 0, 168, 0, 0, 403, 357, 403, 59,
+ 357, 490, 301, 534, 391, 0, 0, 0, 301, 0,
+ 0, 460, 0, 145, 59, 0, 179, 403, 177, 59,
+ 59, 488, 489, 0, 404, 105, 404, 0, 59, 185,
+ 451, 59, 59, 450, 59, 59, 59, 59, 59, 283,
+ 284, 59, 287, 285, 145, 404, 286, 107, 167, 406,
+ 164, 59, 59, 451, 450, 265, 59, 59, 301, 59,
+ 269, 68, 96, 95, 479, 59, 59, 331, 478, 59,
+ 87, 76, 59, 329, 59, 97, 434, 83, 89, 431,
+ 59, 470, 59, 59, 59, 94, 88, 59, 93, 92,
+ 59, 59, 90, 59, 59, 91, 493, 59, 59, 71,
+ 67, 59, 59, 491, 492, 99, 59, 101, 179, 319,
+ 301, 59, 59, 340, 69, 60, 59, 59, 450, 66,
+ 59, 59, 451, 304, 105, 499, 269, 297, 297, 297,
+ 59, 59, 269, 269, 269, 269, 269, 0, 315, 272,
+ 498, 508, 294, 0, 0, 0, 107, 174, 59, 325,
+ 318, 316, 297, 269, 59, 290, 0, 269, 297, 269,
+ 0, 59, 0, 269, 59, 0, 269, 292, 59, 269,
+ 179, 277, 59, 0, 299, 302, 312, 269, 59, 288,
+ 296, 328, 609, 269, 499, 289, 597, 633, 606, 599,
+ 499, 600, 565, 600, 0, 0, 499, 0, 0, 568,
+ 561, 562, 563, 564, 0, 498, 508, 0, 471, 0,
+ 0, 498, 508, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 499, 0, 0, 603, 0, 0, 0, 600, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 496, 0, 0, 630, 0, 0, 0,
- 597, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -640,223 +636,231 @@ const short QmlJSGrammar::action_info [] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0};
+ 0, 0, 0};
const short QmlJSGrammar::action_check [] = {
- 7, 17, 66, 29, 36, 36, 7, 7, 7, 36,
- 55, 66, 7, 90, 55, 33, 55, 60, 29, 36,
- 60, 7, 0, 7, 48, 55, 7, 16, 8, 2,
- 7, 5, 2, 5, 36, 60, 33, 5, 36, 33,
- 7, 20, 33, 36, 7, 60, 33, 55, 8, 7,
- 60, 36, 90, 36, 7, 1, 8, 33, 7, 79,
- 8, 8, 33, 8, 60, 2, 48, 36, 60, 8,
- 60, 1, 8, 61, 79, 36, 79, 36, 7, 7,
- 7, 7, 33, 7, 48, 29, 61, 1, 7, 7,
- 7, 48, 7, 36, 36, 61, 36, 7, 36, 2,
- 33, 36, 33, 37, 29, 7, 17, 7, 29, 31,
- 60, 24, 6, 36, 79, 77, 36, 8, 8, 7,
- 61, 62, 8, 10, 8, 8, 20, 7, 8, 61,
- 62, -1, 40, 40, 50, 40, 8, -1, 54, 8,
- 8, 8, 8, 51, 51, 33, 51, 8, 40, 61,
- 62, 15, 61, 62, 8, 61, 62, 61, 62, 51,
- 8, 50, 61, 62, 42, 54, 56, 7, 55, 60,
- 34, 29, 8, 15, 60, 53, 60, 60, 8, 61,
- 62, 15, 61, 62, 1, 61, 62, 56, 56, 61,
- 61, 62, 34, 60, 60, 56, 25, 8, 27, 15,
- 34, 25, 36, 27, 8, 7, 60, 29, 29, 38,
- -1, 25, 60, 27, 38, -1, 29, 75, 34, -1,
- 36, 61, 62, 8, 38, 61, 62, 25, 86, 27,
- 8, 61, 62, 25, 25, 27, 27, -1, -1, 25,
- 38, 27, 25, 25, 27, 27, 38, 38, 29, -1,
- 61, 62, 38, 75, 75, 38, 38, 61, 62, 61,
- 62, 25, 75, 27, 86, 86, 25, 25, 27, 27,
- 36, 15, 29, 86, 38, 29, 61, 62, 15, 38,
- 38, -1, 12, 61, 62, 61, 62, 25, 15, 27,
- 34, -1, 36, 29, 75, 61, 62, 34, 29, 36,
- 38, 29, 47, -1, 29, 86, 33, 34, -1, 36,
- -1, -1, 66, 67, 68, 91, 61, 62, 75, 29,
- 18, 19, 18, 19, 29, 18, 19, 57, 29, 86,
- 66, 67, 68, 63, 29, 66, 67, 68, 66, 67,
- 68, 66, 67, 68, 29, -1, 91, 45, 46, 45,
- 46, -1, 45, 46, 29, -1, 66, 67, 68, 29,
- -1, 66, 67, 68, 29, 66, 67, 68, 29, 15,
- -1, 66, 67, 68, -1, -1, -1, 29, -1, -1,
- -1, 66, 67, 68, 36, -1, -1, 33, 34, -1,
- 36, 66, 67, 68, -1, -1, 66, 67, 68, -1,
- -1, 66, 67, 68, -1, 66, 67, 68, 92, 93,
- 94, 95, 96, 29, 66, 67, 68, 23, 24, -1,
- 36, 23, 24, -1, -1, -1, 32, 23, 24, 35,
- 32, 37, -1, 35, 29, 37, 32, -1, -1, 35,
- -1, 37, -1, -1, -1, 29, 23, 24, -1, -1,
- 66, 67, 68, 18, 19, 32, 23, 24, 35, 29,
- 37, -1, -1, -1, -1, 32, 61, 62, 35, 29,
- 37, 66, 67, 68, -1, -1, -1, 61, 62, 29,
- 45, 46, 66, 67, 68, -1, -1, 29, -1, -1,
- -1, 61, 62, -1, -1, -1, 66, 67, 68, -1,
- -1, 61, 62, -1, -1, -1, 66, 67, 68, -1,
- -1, 61, 62, 3, -1, -1, 66, 67, 68, 61,
- 62, -1, -1, 13, 66, 67, 68, 17, -1, -1,
- -1, -1, -1, -1, 23, 24, 26, -1, 28, -1,
- -1, -1, 31, 32, -1, -1, 35, -1, 37, 39,
- 3, 41, 42, -1, -1, -1, -1, -1, -1, 49,
- 13, -1, 52, 53, 17, -1, -1, -1, 58, -1,
- -1, -1, -1, 26, 64, 28, -1, -1, 31, -1,
- -1, -1, -1, -1, -1, -1, 39, -1, 41, 42,
- 80, -1, -1, -1, -1, -1, 49, 12, 13, 52,
- 53, -1, -1, -1, -1, 58, -1, 22, -1, -1,
- 3, 64, -1, -1, 29, -1, -1, -1, 33, 34,
- 13, 36, -1, -1, 17, -1, -1, 80, 43, -1,
- -1, -1, 47, 26, -1, 28, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 39, -1, 41, 42,
- 65, 66, 67, 68, -1, 70, 49, -1, -1, 52,
- 53, -1, -1, -1, -1, 58, 81, 82, 83, -1,
- -1, 64, 87, -1, -1, -1, -1, -1, 12, 13,
- -1, -1, -1, -1, -1, -1, -1, 80, 22, -1,
- -1, -1, -1, -1, -1, 29, -1, -1, -1, 33,
- 34, -1, 36, -1, -1, -1, 12, 13, -1, 43,
- -1, -1, -1, 47, -1, -1, 22, -1, -1, -1,
+ 7, 7, 36, 90, 7, 29, 36, 7, 36, 7,
+ 33, 8, 7, 7, 36, 7, 90, 7, 0, 7,
+ 16, 60, 55, 33, 8, 29, 7, 36, 7, 55,
+ 79, 48, 1, 7, 55, 2, 7, 17, 37, 7,
+ 33, 60, 29, 7, 33, 7, 66, 33, 33, 7,
+ 66, 29, 7, 36, 20, 7, 7, 29, 33, 36,
+ 36, 24, 5, 36, 5, 7, 36, 5, 1, 60,
+ 7, 36, 7, 2, 79, 2, 33, 8, 8, 7,
+ 1, 7, 36, 36, 8, 1, 36, -1, 8, 36,
+ -1, 2, 36, 8, 55, 7, -1, -1, -1, 17,
+ 60, 60, 48, 48, 60, 7, -1, 55, 8, -1,
+ 33, 36, 61, 6, 48, -1, 33, 15, 8, 10,
+ 8, 60, 36, 36, 7, 8, 8, 20, 8, 61,
+ 8, 33, 8, -1, 8, 40, 34, 77, 60, 8,
+ 8, 8, 61, 79, 50, -1, 51, 50, 54, 8,
+ 60, 54, 61, 62, 61, 62, 56, 61, 62, 40,
+ 61, 62, 61, 62, 55, 40, 56, 61, 62, 12,
+ 51, 42, 60, 15, 61, 62, 51, 7, 60, -1,
+ 60, 8, 53, 61, 60, 31, 60, 40, 56, 61,
+ 62, 60, 34, 60, 29, 61, 62, 56, 51, 61,
+ 62, 61, 62, 25, 25, 27, 27, 8, 25, 25,
+ 27, 27, 12, 25, 57, 27, 38, 38, 29, 29,
+ 63, 38, 38, 25, 15, 27, 38, 12, 25, -1,
+ 27, 61, 62, 8, 61, 62, 38, 25, 8, 27,
+ 75, 38, 25, 34, 27, 36, 25, 15, 27, 8,
+ 38, 86, 61, 62, 8, 38, 25, 57, 27, 38,
+ 61, 62, 15, 63, 75, 75, 34, 29, 36, 38,
+ 36, 29, 57, 8, 29, 86, 86, 25, 63, 27,
+ 7, 34, 91, 36, 29, -1, 61, 62, -1, -1,
+ 38, 61, 62, -1, -1, 61, 62, 25, -1, 27,
+ 47, -1, 61, 62, 29, -1, 60, -1, -1, -1,
+ 38, 18, 19, 75, 61, 62, 29, 75, -1, 29,
+ 75, 66, 67, 68, 86, -1, 61, 62, 86, 15,
+ -1, 86, 29, -1, 61, 62, 18, 19, 45, 46,
+ 29, 66, 67, 68, 91, 29, 15, 33, 34, 29,
+ 36, -1, 29, 66, 67, 68, 66, 67, 68, 29,
+ -1, -1, 29, 45, 46, 34, 29, 36, -1, 66,
+ 67, 68, 29, -1, 15, 29, -1, 66, 67, 68,
+ -1, -1, 66, 67, 68, -1, 66, 67, 68, 66,
+ 67, 68, 33, 34, -1, 36, 66, 67, 68, 66,
+ 67, 68, -1, 66, 67, 68, 23, 24, -1, 66,
+ 67, 68, 66, 67, 68, 32, 23, 24, 35, -1,
+ 37, -1, -1, 29, -1, 32, 29, -1, 35, 29,
+ 37, 18, 19, 36, 23, 24, 36, 29, -1, -1,
+ -1, -1, -1, 32, -1, -1, 35, -1, 37, 29,
+ -1, -1, -1, -1, -1, 61, 62, -1, 45, 46,
+ 66, 67, 68, 66, 67, 68, 66, 67, 68, 61,
+ 62, 23, 24, 29, 66, 67, 68, -1, -1, 31,
+ 32, 61, 62, 35, -1, 37, 66, 67, 68, 23,
+ 24, 29, -1, -1, -1, -1, -1, 31, 32, -1,
+ -1, 35, -1, 37, -1, 61, 62, 23, 24, 29,
+ 66, 67, 68, 23, 24, 31, 32, -1, -1, 35,
+ -1, 37, 32, 61, 62, 35, -1, 37, 66, 67,
+ 68, 92, 93, 94, 95, 96, 97, -1, -1, 3,
+ -1, 61, 62, -1, -1, -1, 66, 67, 68, 13,
+ -1, -1, -1, 17, -1, -1, -1, 3, -1, -1,
+ -1, -1, 26, -1, 28, -1, -1, 13, -1, -1,
+ -1, 17, -1, -1, -1, 39, -1, 41, 42, -1,
+ 26, -1, 28, -1, -1, 49, -1, -1, 52, 53,
+ 23, 24, -1, 39, 58, 41, 42, -1, 31, 32,
+ 64, -1, 35, 49, 37, -1, 52, 53, -1, -1,
+ -1, -1, 58, -1, -1, -1, 80, -1, 64, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 12,
+ 13, -1, -1, -1, 80, -1, -1, -1, -1, 22,
+ -1, -1, -1, -1, -1, -1, 29, -1, -1, -1,
+ 33, 34, -1, 36, -1, -1, -1, -1, -1, -1,
+ 43, -1, -1, -1, 47, -1, -1, 3, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 13, -1, -1,
+ -1, 17, 65, 66, 67, 68, -1, 70, -1, -1,
+ 26, -1, 28, -1, -1, 31, -1, -1, 81, 82,
+ 83, -1, -1, 39, 87, 41, 42, -1, -1, -1,
+ -1, -1, -1, 49, -1, -1, 52, 53, -1, -1,
+ -1, -1, 58, -1, -1, -1, -1, -1, 64, -1,
+ -1, -1, -1, -1, -1, -1, 12, 13, -1, -1,
+ -1, -1, -1, -1, 80, -1, 22, -1, -1, -1,
-1, -1, -1, 29, -1, -1, -1, 33, 34, -1,
- 36, 65, 66, 67, 68, -1, 70, 43, -1, -1,
- -1, 47, -1, -1, -1, -1, -1, 81, 82, 83,
- -1, -1, -1, 87, -1, -1, -1, -1, -1, 65,
- 66, 67, 68, -1, 70, -1, -1, -1, -1, -1,
+ 36, -1, -1, -1, 12, 13, -1, 43, -1, -1,
+ -1, 47, -1, -1, 22, -1, -1, -1, -1, -1,
+ -1, 29, -1, -1, -1, 33, 34, -1, 36, 65,
+ 66, 67, 68, -1, 70, 43, -1, -1, -1, 47,
-1, -1, -1, -1, -1, 81, 82, 83, -1, -1,
- -1, 87, -1, -1, -1, 12, 13, -1, -1, -1,
- -1, -1, -1, 12, 13, 22, -1, -1, -1, -1,
- -1, -1, 29, 22, -1, -1, 33, 34, -1, 36,
- 29, -1, -1, -1, 33, 34, 43, 36, -1, -1,
- 47, -1, -1, -1, 43, -1, -1, -1, 47, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 65, 66,
- 67, 68, -1, 70, -1, -1, 65, 66, 67, 68,
- -1, 70, -1, -1, 81, 82, 83, -1, -1, -1,
- 87, -1, 81, 82, 83, -1, -1, -1, 87, -1,
+ -1, 87, -1, -1, -1, -1, -1, 65, 66, 67,
+ 68, -1, 70, -1, 10, -1, 12, 13, -1, -1,
+ -1, -1, -1, 81, 82, 83, 22, -1, -1, 87,
+ -1, -1, -1, 29, -1, -1, -1, 33, 34, -1,
+ 36, -1, 12, 13, -1, -1, -1, 43, -1, -1,
+ -1, 47, 22, -1, -1, -1, -1, -1, -1, 29,
+ -1, -1, -1, 33, 34, -1, 36, -1, -1, 65,
+ 66, 67, 68, 43, 70, -1, -1, 47, -1, 75,
+ -1, -1, -1, -1, -1, 81, 82, 83, 84, -1,
+ -1, 87, -1, -1, -1, 65, 66, 67, 68, -1,
+ 70, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 81, 82, 83, -1, -1, -1, 87, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
10, -1, 12, 13, -1, -1, -1, -1, -1, -1,
-1, -1, 22, -1, -1, -1, -1, -1, -1, 29,
-1, -1, -1, 33, 34, -1, 36, -1, -1, -1,
-1, -1, -1, 43, -1, -1, -1, 47, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 55, -1, -1, -1, -1,
-1, -1, -1, -1, -1, 65, 66, 67, 68, -1,
70, -1, -1, -1, -1, 75, -1, -1, -1, -1,
-1, 81, 82, 83, 84, -1, -1, 87, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 10,
- -1, 12, 13, -1, -1, -1, -1, -1, -1, -1,
- -1, 22, -1, -1, -1, -1, -1, -1, 29, -1,
- -1, -1, 33, 34, -1, 36, -1, -1, -1, -1,
- -1, -1, 43, -1, -1, -1, 47, -1, -1, -1,
- -1, -1, -1, -1, 55, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 65, 66, 67, 68, -1, 70,
- -1, -1, -1, -1, 75, -1, -1, -1, -1, -1,
- 81, 82, 83, 84, -1, -1, 87, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 10, -1,
- 12, 13, -1, -1, -1, -1, -1, -1, -1, -1,
- 22, -1, -1, -1, -1, -1, -1, 29, -1, -1,
- -1, 33, 34, -1, 36, -1, -1, -1, -1, -1,
- -1, 43, -1, -1, -1, 47, -1, -1, -1, -1,
- -1, -1, -1, 55, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 65, 66, 67, 68, -1, 70, -1,
- -1, -1, -1, 75, -1, -1, -1, -1, -1, 81,
- 82, 83, 84, -1, -1, 87, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 11, 12, 13,
- -1, -1, -1, -1, -1, -1, -1, -1, 22, -1,
- -1, -1, -1, -1, -1, 29, -1, -1, -1, 33,
- 34, -1, 36, -1, -1, -1, 40, -1, 42, 43,
- 44, -1, -1, 47, -1, -1, -1, 51, -1, 53,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 65, 66, 67, 68, -1, 70, -1, 72, -1,
- 74, -1, 76, -1, -1, -1, -1, 81, 82, 83,
- -1, -1, -1, 87, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 7, -1, -1, -1, 11,
- 12, 13, -1, -1, -1, -1, -1, -1, -1, -1,
- 22, -1, -1, -1, -1, -1, -1, 29, -1, -1,
- -1, 33, 34, -1, 36, -1, -1, -1, 40, -1,
- 42, 43, 44, -1, -1, 47, -1, -1, -1, 51,
- -1, 53, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 65, 66, 67, 68, -1, 70, -1,
- 72, -1, 74, -1, 76, -1, -1, -1, -1, 81,
- 82, 83, -1, -1, -1, 87, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 11, 12, 13,
- -1, -1, -1, -1, -1, -1, -1, -1, 22, -1,
- -1, -1, -1, -1, -1, 29, -1, -1, -1, 33,
- 34, -1, 36, -1, -1, -1, 40, -1, 42, 43,
- 44, -1, -1, 47, -1, -1, -1, 51, -1, 53,
+ 10, -1, 12, 13, -1, -1, -1, -1, -1, -1,
+ -1, -1, 22, -1, -1, -1, -1, -1, -1, 29,
+ -1, -1, -1, 33, 34, -1, 36, -1, -1, -1,
+ -1, -1, -1, 43, -1, -1, -1, 47, -1, -1,
+ -1, -1, -1, -1, -1, 55, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 65, 66, 67, 68, -1,
+ 70, -1, -1, -1, -1, 75, -1, -1, -1, -1,
+ -1, 81, 82, 83, 84, -1, -1, 87, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 65, 66, 67, 68, -1, 70, -1, 72, -1,
- 74, 75, 76, -1, -1, -1, -1, 81, 82, 83,
- -1, -1, -1, 87, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 8, -1, -1, 11, 12,
- 13, -1, -1, -1, -1, -1, -1, -1, -1, 22,
- -1, -1, -1, -1, -1, -1, 29, -1, -1, -1,
- 33, 34, -1, 36, -1, -1, -1, 40, -1, 42,
- 43, 44, -1, -1, 47, -1, -1, -1, 51, -1,
- 53, -1, -1, 56, -1, -1, -1, -1, -1, -1,
- -1, -1, 65, 66, 67, 68, -1, 70, -1, 72,
- -1, 74, -1, 76, -1, -1, -1, -1, 81, 82,
- 83, -1, -1, -1, 87, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 8, -1, -1, 11,
- 12, 13, -1, -1, -1, -1, -1, -1, -1, -1,
- 22, -1, -1, -1, -1, -1, -1, 29, -1, -1,
- -1, 33, 34, -1, 36, -1, -1, -1, 40, -1,
- 42, 43, 44, -1, -1, 47, -1, -1, -1, 51,
- -1, 53, -1, -1, 56, -1, -1, -1, -1, -1,
- -1, -1, -1, 65, 66, 67, 68, -1, 70, -1,
- 72, -1, 74, -1, 76, -1, -1, -1, -1, 81,
- 82, 83, -1, -1, -1, 87, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 8, -1, -1,
11, 12, 13, -1, -1, -1, -1, -1, -1, -1,
-1, 22, -1, -1, -1, -1, -1, -1, 29, -1,
-1, -1, 33, 34, -1, 36, -1, -1, -1, 40,
-1, 42, 43, 44, -1, -1, 47, -1, -1, -1,
- 51, -1, 53, -1, -1, 56, -1, -1, -1, -1,
+ 51, -1, 53, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, 65, 66, 67, 68, -1, 70,
-1, 72, -1, 74, -1, 76, -1, -1, -1, -1,
81, 82, 83, -1, -1, -1, 87, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 8, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 7,
+ -1, -1, -1, 11, 12, 13, -1, -1, -1, -1,
+ -1, -1, -1, -1, 22, -1, -1, -1, -1, -1,
+ -1, 29, -1, -1, -1, 33, 34, -1, 36, -1,
+ -1, -1, 40, -1, 42, 43, 44, -1, -1, 47,
+ -1, -1, -1, 51, -1, 53, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 65, 66, 67,
+ 68, -1, 70, -1, 72, -1, 74, -1, 76, -1,
+ -1, -1, -1, 81, 82, 83, -1, -1, -1, 87,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 11, 12, 13, -1, -1, -1, -1, -1,
+ -1, -1, -1, 22, -1, -1, -1, -1, -1, -1,
+ 29, -1, -1, -1, 33, 34, -1, 36, -1, -1,
+ -1, 40, -1, 42, 43, 44, -1, -1, 47, -1,
+ -1, -1, 51, -1, 53, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 65, 66, 67, 68,
+ -1, 70, -1, 72, -1, 74, 75, 76, -1, -1,
+ -1, -1, 81, 82, 83, -1, -1, -1, 87, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, 11, 12, 13, -1, -1, -1, -1, -1, -1,
-1, -1, 22, -1, -1, -1, -1, -1, -1, 29,
- -1, -1, -1, 33, 34, -1, 36, -1, -1, -1,
+ 30, -1, -1, 33, 34, -1, 36, -1, -1, -1,
40, -1, 42, 43, 44, -1, -1, 47, -1, -1,
- -1, 51, -1, 53, -1, -1, 56, -1, -1, -1,
- -1, -1, -1, -1, -1, 65, 66, 67, 68, -1,
+ -1, 51, -1, 53, -1, -1, -1, -1, -1, -1,
+ -1, 61, -1, -1, -1, 65, 66, 67, 68, -1,
70, -1, 72, -1, 74, -1, 76, -1, -1, -1,
-1, 81, 82, 83, -1, -1, -1, 87, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 11,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 8, -1, -1, 11, 12, 13, -1, -1, -1, -1,
+ -1, -1, -1, -1, 22, -1, -1, -1, -1, -1,
+ -1, 29, -1, -1, -1, 33, 34, -1, 36, -1,
+ -1, -1, 40, -1, 42, 43, 44, -1, -1, 47,
+ -1, -1, -1, 51, -1, 53, -1, -1, 56, -1,
+ -1, -1, -1, -1, -1, -1, -1, 65, 66, 67,
+ 68, -1, 70, -1, 72, -1, 74, -1, 76, -1,
+ -1, -1, -1, 81, 82, 83, -1, -1, -1, 87,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 8, -1, -1, 11, 12, 13, -1, -1,
+ -1, -1, -1, -1, -1, -1, 22, -1, -1, -1,
+ -1, -1, -1, 29, -1, -1, -1, 33, 34, -1,
+ 36, -1, -1, -1, 40, -1, 42, 43, 44, -1,
+ -1, 47, -1, -1, -1, 51, -1, 53, -1, -1,
+ 56, -1, -1, -1, -1, -1, -1, -1, -1, 65,
+ 66, 67, 68, -1, 70, -1, 72, -1, 74, -1,
+ 76, -1, -1, -1, -1, 81, 82, 83, -1, -1,
+ -1, 87, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 8, -1, -1, 11, 12, 13,
+ -1, -1, -1, -1, -1, -1, -1, -1, 22, -1,
+ -1, -1, -1, -1, -1, 29, -1, -1, -1, 33,
+ 34, -1, 36, -1, -1, -1, 40, -1, 42, 43,
+ 44, -1, -1, 47, -1, -1, -1, 51, -1, 53,
+ -1, -1, 56, -1, -1, -1, -1, -1, -1, -1,
+ -1, 65, 66, 67, 68, -1, 70, -1, 72, -1,
+ 74, -1, 76, -1, -1, -1, -1, 81, 82, 83,
+ -1, -1, -1, 87, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 8, -1, -1, 11,
12, 13, -1, -1, -1, -1, -1, -1, -1, -1,
- 22, -1, -1, -1, -1, -1, -1, 29, 30, -1,
+ 22, -1, -1, -1, -1, -1, -1, 29, -1, -1,
-1, 33, 34, -1, 36, -1, -1, -1, 40, -1,
42, 43, 44, -1, -1, 47, -1, -1, -1, 51,
- -1, 53, -1, -1, -1, -1, -1, -1, -1, 61,
+ -1, 53, -1, -1, 56, -1, -1, -1, -1, -1,
-1, -1, -1, 65, 66, 67, 68, -1, 70, -1,
72, -1, 74, -1, 76, -1, -1, -1, -1, 81,
82, 83, -1, -1, -1, 87, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 4, 5, 6,
- -1, -1, 9, 10, 11, -1, -1, 14, -1, 16,
- -1, -1, -1, 20, 21, 22, -1, -1, -1, -1,
- -1, -1, 29, 30, 31, 32, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 43, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 4, 5,
+ 6, -1, -1, 9, 10, 11, -1, -1, 14, -1,
+ 16, -1, -1, -1, 20, 21, 22, -1, -1, -1,
+ -1, -1, -1, 29, 30, 31, 32, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 43, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 59, -1, -1, -1, -1, -1, -1, 66,
- 67, 68, 69, 70, 71, -1, 73, 74, 75, 76,
- 77, 78, -1, -1, 81, 82, 83, 84, 85, 86,
+ -1, -1, -1, 59, -1, -1, -1, -1, -1, -1,
+ 66, 67, 68, 69, 70, 71, -1, 73, 74, 75,
+ 76, 77, 78, -1, -1, 81, 82, 83, 84, 85,
+ 86, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 4, 5, 6, -1, -1, 9,
+ 10, 11, -1, -1, 14, -1, 16, -1, -1, -1,
+ 20, 21, 22, -1, -1, -1, -1, -1, -1, 29,
+ 30, 31, 32, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 43, -1, -1, -1, 47, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 59,
+ -1, -1, -1, -1, -1, 65, 66, 67, -1, 69,
+ 70, 71, -1, 73, 74, 75, 76, 77, 78, -1,
+ -1, 81, 82, 83, 84, 85, 86, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 4, 5, 6, -1, -1, 9, 10, 11,
- -1, -1, 14, -1, 16, -1, -1, -1, 20, 21,
- 22, -1, -1, -1, -1, -1, -1, 29, 30, 31,
- 32, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 43, -1, -1, -1, 47, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 59, -1, -1,
- -1, -1, -1, 65, 66, 67, -1, 69, 70, 71,
- -1, 73, 74, 75, 76, 77, 78, -1, -1, 81,
- 82, 83, 84, 85, 86, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 4, 5, 6,
- -1, -1, 9, 10, 11, -1, -1, 14, -1, 16,
- -1, -1, -1, 20, 21, 22, -1, -1, -1, -1,
- -1, -1, 29, 30, 31, 32, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 43, -1, -1, -1,
- 47, -1, -1, -1, -1, -1, -1, -1, 55, -1,
- -1, -1, 59, -1, -1, -1, -1, -1, 65, 66,
- 67, -1, 69, 70, 71, -1, 73, 74, 75, 76,
- 77, 78, -1, -1, 81, 82, 83, 84, 85, 86,
+ 4, 5, 6, -1, -1, 9, 10, 11, -1, -1,
+ 14, -1, 16, -1, -1, -1, 20, 21, 22, -1,
+ -1, -1, -1, -1, -1, 29, 30, 31, 32, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 43,
+ -1, -1, -1, 47, -1, -1, -1, -1, -1, -1,
+ -1, 55, -1, -1, -1, 59, -1, -1, -1, -1,
+ -1, 65, 66, 67, -1, 69, 70, 71, -1, 73,
+ 74, 75, 76, 77, 78, -1, -1, 81, 82, 83,
+ 84, 85, 86, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 4, -1, -1, -1,
+ -1, 9, -1, 11, 12, 13, 14, -1, -1, -1,
+ -1, -1, -1, 21, 22, -1, -1, -1, -1, -1,
+ -1, 29, 30, -1, -1, 33, 34, -1, 36, -1,
+ -1, -1, 40, -1, 42, 43, 44, -1, -1, 47,
+ -1, -1, -1, 51, -1, 53, -1, -1, -1, -1,
+ -1, 59, -1, 61, -1, -1, -1, 65, 66, 67,
+ 68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
+ 78, -1, -1, 81, 82, 83, 84, 85, -1, 87,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, 4, -1, -1, -1, -1, 9, -1, 11,
12, 13, 14, -1, -1, -1, -1, -1, -1, 21,
@@ -867,74 +871,62 @@ const short QmlJSGrammar::action_check [] = {
-1, -1, -1, 65, 66, 67, 68, 69, 70, 71,
72, 73, 74, 75, 76, 77, 78, -1, -1, 81,
82, 83, 84, 85, -1, 87, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 4, -1, -1,
- -1, -1, 9, -1, 11, 12, 13, 14, -1, -1,
- -1, -1, -1, -1, 21, 22, -1, -1, -1, -1,
- -1, -1, 29, 30, -1, -1, 33, 34, -1, 36,
- -1, -1, -1, 40, -1, 42, 43, 44, -1, -1,
- 47, -1, -1, -1, 51, -1, 53, -1, -1, -1,
- -1, -1, 59, -1, 61, -1, -1, -1, 65, 66,
- 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
- 77, 78, -1, -1, 81, 82, 83, 84, 85, -1,
- 87, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 4, 5, 6, -1, -1, 9, 10, 11,
- 12, 13, 14, -1, 16, -1, -1, -1, 20, 21,
- 22, -1, -1, -1, -1, -1, -1, 29, 30, 31,
- 32, 33, 34, -1, 36, -1, -1, -1, 40, -1,
- 42, 43, 44, -1, -1, 47, -1, -1, -1, 51,
- -1, 53, -1, -1, -1, -1, -1, 59, -1, 61,
- -1, -1, -1, 65, 66, 67, 68, 69, 70, 71,
- 72, 73, 74, 75, 76, 77, 78, -1, -1, 81,
- 82, 83, 84, 85, 86, 87, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 4, 5, 6,
- -1, -1, 9, 10, 11, 12, 13, 14, -1, 16,
- -1, -1, -1, 20, 21, 22, -1, -1, -1, -1,
- -1, -1, 29, 30, 31, 32, 33, 34, -1, 36,
- -1, -1, -1, 40, -1, 42, 43, 44, -1, -1,
- 47, -1, -1, -1, 51, -1, 53, -1, 55, -1,
- -1, -1, 59, -1, 61, -1, -1, -1, 65, 66,
- 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
- 77, 78, -1, -1, 81, 82, 83, 84, 85, 86,
- 87, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1,
-
- 3, 23, 13, 23, 23, 13, 3, 13, 65, 3,
- 11, 13, 19, 3, 9, 3, 3, 13, 2, 33,
- 13, 13, 3, 23, 13, 2, 2, 13, 3, 3,
- 2, 13, 23, 11, 17, 3, 3, 2, 96, 19,
- 13, 2, 13, 13, 2, 2, 2, 13, 33, 13,
- 19, 13, 3, 2, 33, 3, 2, 2, 13, 13,
- 2, 79, 3, 79, 91, 3, 3, 19, 94, 3,
- 33, 2, 2, 33, 33, 3, 19, 3, 2, -1,
- 3, 34, 3, 33, 13, 3, 33, -1, 13, 33,
- -1, 13, 11, 33, 33, 3, 13, 33, 2, -1,
- -1, 2, 2, -1, 3, -1, -1, 42, -1, 42,
- 42, -1, 44, -1, -1, 42, 3, 3, -1, 46,
- 39, 56, 42, -1, 44, 58, 42, 42, 44, 42,
- 42, 46, 44, 42, 47, 44, 42, 42, 33, 42,
- 42, -1, 47, 38, 42, 47, 44, 11, 54, 52,
- 42, 42, 42, -1, 44, 47, 47, 42, 66, 42,
- 42, 83, 47, 46, -1, 47, 42, 66, 85, 45,
- 42, -1, 97, 45, 42, 39, 44, 42, -1, 66,
- 66, 42, 47, 44, 42, 42, 44, 42, 42, 44,
- 44, 42, 42, 50, 98, 42, 13, 48, 48, 42,
- 42, 48, 103, 42, 47, 33, 48, 42, 47, 44,
- 38, 42, 42, 44, 44, 42, 11, 44, 35, 42,
- 42, 42, 44, 42, 47, 13, 47, 42, 47, 42,
- 42, -1, 47, -1, 47, 47, 51, 11, 42, -1,
- -1, 53, -1, 47, 39, 64, 59, 35, 36, 42,
- 42, 55, 26, 27, 47, 47, 11, 42, -1, 14,
- 42, 42, 47, 18, -1, 47, 47, -1, -1, -1,
- -1, 64, 64, 42, -1, -1, 57, 29, 47, 64,
- 49, 33, 64, 42, 42, -1, 4, -1, 47, 47,
- 49, 49, 42, 11, -1, 11, 4, 47, 14, 49,
- -1, -1, 18, 11, 11, -1, -1, -1, 26, 27,
- -1, 18, 19, 20, 21, 22, -1, 33, 26, 27,
+ -1, -1, -1, -1, -1, -1, -1, -1, 4, 5,
+ 6, -1, -1, 9, 10, 11, 12, 13, 14, -1,
+ 16, -1, -1, -1, 20, 21, 22, -1, -1, -1,
+ -1, -1, -1, 29, 30, 31, 32, 33, 34, -1,
+ 36, -1, -1, -1, 40, -1, 42, 43, 44, -1,
+ -1, 47, -1, -1, -1, 51, -1, 53, -1, -1,
+ -1, -1, -1, 59, -1, 61, -1, -1, -1, 65,
+ 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
+ 76, 77, 78, -1, -1, 81, 82, 83, 84, 85,
+ 86, 87, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 4, 5, 6, -1, -1, 9,
+ 10, 11, 12, 13, 14, -1, 16, -1, -1, -1,
+ 20, 21, 22, -1, -1, -1, -1, -1, -1, 29,
+ 30, 31, 32, 33, 34, -1, 36, -1, -1, -1,
+ 40, -1, 42, 43, 44, -1, -1, 47, -1, -1,
+ -1, 51, -1, 53, -1, 55, -1, -1, -1, 59,
+ -1, 61, -1, -1, -1, 65, 66, 67, 68, 69,
+ 70, 71, 72, 73, 74, 75, 76, 77, 78, -1,
+ -1, 81, 82, 83, 84, 85, 86, 87, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+
+ 3, 2, 15, 25, 25, 3, 25, 3, 2, 11,
+ 2, 15, 3, 13, 67, 3, 15, 104, 15, 2,
+ 15, 2, 4, 3, 35, 15, 15, 3, 21, 3,
+ 93, 15, 2, 2, 19, 13, 15, 96, 25, 25,
+ 15, 3, 15, 15, 15, 100, 3, 3, 15, 2,
+ 2, 15, 3, 21, 4, 15, 15, 15, 35, 2,
+ 21, 2, 2, 2, 98, 3, 2, 2, 2, 35,
+ 35, 4, 35, 2, 21, 3, 3, 3, 15, 2,
+ 35, 35, 3, 3, 3, 3, 35, 35, 2, 35,
+ 21, 35, -1, 35, -1, -1, 13, 2, 13, 44,
+ 2, 46, 3, 3, 36, -1, -1, -1, 3, -1,
+ -1, 15, -1, 35, 44, -1, 46, 13, 40, 44,
+ 44, 46, 46, -1, 41, 15, 41, -1, 44, 15,
+ 46, 44, 44, 46, 44, 44, 44, 44, 44, 49,
+ 49, 44, 49, 49, 35, 41, 49, 37, 60, 40,
+ 58, 44, 44, 46, 46, 44, 44, 44, 3, 44,
+ 49, 46, 50, 50, 31, 44, 44, 68, 35, 44,
+ 48, 50, 44, 68, 44, 50, 81, 49, 48, 81,
+ 44, 85, 44, 44, 44, 49, 48, 44, 49, 49,
+ 44, 44, 49, 44, 44, 49, 46, 44, 44, 52,
+ 46, 44, 44, 46, 46, 56, 44, 54, 46, 15,
+ 3, 44, 44, 99, 47, 47, 44, 44, 46, 46,
+ 44, 44, 46, 68, 15, 13, 49, 44, 44, 44,
+ 44, 44, 49, 49, 49, 49, 49, -1, 61, 53,
+ 28, 29, 55, -1, -1, -1, 37, 38, 44, 66,
+ 66, 66, 44, 49, 44, 51, -1, 49, 44, 49,
+ -1, 44, -1, 49, 44, -1, 49, 57, 44, 49,
+ 46, 51, 44, -1, 66, 68, 59, 49, 44, 51,
+ 66, 87, 5, 49, 13, 51, 13, 16, 5, 16,
+ 13, 20, 13, 20, -1, -1, 13, -1, -1, 20,
+ 21, 22, 23, 24, -1, 28, 29, -1, 35, -1,
+ -1, 28, 29, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 13, -1, -1, 16, -1, -1, -1, 20, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 11, -1, -1, 14, -1, -1, -1,
- 18, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -942,6 +934,6 @@ const short QmlJSGrammar::action_check [] = {
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1};
+ -1, -1, -1};
QT_END_NAMESPACE
diff --git a/src/declarative/qml/parser/qmljsgrammar_p.h b/src/declarative/qml/parser/qmljsgrammar_p.h
index 469ed92..903e2c4 100644
--- a/src/declarative/qml/parser/qmljsgrammar_p.h
+++ b/src/declarative/qml/parser/qmljsgrammar_p.h
@@ -63,8 +63,8 @@ class QmlJSGrammar
public:
enum {
EOF_SYMBOL = 0,
- REDUCE_HERE = 98,
- SHIFT_THERE = 97,
+ REDUCE_HERE = 99,
+ SHIFT_THERE = 98,
T_AND = 1,
T_AND_AND = 2,
T_AND_EQ = 3,
@@ -91,6 +91,7 @@ public:
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,
@@ -162,15 +163,15 @@ public:
T_XOR = 79,
T_XOR_EQ = 80,
- ACCEPT_STATE = 632,
- RULE_COUNT = 341,
- STATE_COUNT = 633,
- TERMINAL_COUNT = 99,
- NON_TERMINAL_COUNT = 105,
+ ACCEPT_STATE = 635,
+ RULE_COUNT = 343,
+ STATE_COUNT = 636,
+ TERMINAL_COUNT = 100,
+ NON_TERMINAL_COUNT = 106,
- GOTO_INDEX_OFFSET = 633,
- GOTO_INFO_OFFSET = 2532,
- GOTO_CHECK_OFFSET = 2532
+ GOTO_INDEX_OFFSET = 636,
+ GOTO_INFO_OFFSET = 2520,
+ GOTO_CHECK_OFFSET = 2520
};
static const char *const spell [];
diff --git a/src/declarative/qml/parser/qmljsparser.cpp b/src/declarative/qml/parser/qmljsparser.cpp
index e38f317..c2788f4 100644
--- a/src/declarative/qml/parser/qmljsparser.cpp
+++ b/src/declarative/qml/parser/qmljsparser.cpp
@@ -220,33 +220,38 @@ case 4: {
} break;
case 5: {
+ sym(1).Node = sym(2).Node;
+ program = sym(1).Node;
+} break;
+
+case 6: {
sym(1).UiProgram = makeAstNode<AST::UiProgram> (driver->nodePool(), sym(1).UiImportList,
sym(2).UiObjectMemberList->finish());
} break;
-case 7: {
+case 8: {
sym(1).Node = sym(1).UiImportList->finish();
} break;
-case 8: {
+case 9: {
sym(1).Node = makeAstNode<AST::UiImportList> (driver->nodePool(), sym(1).UiImport);
} break;
-case 9: {
+case 10: {
sym(1).Node = makeAstNode<AST::UiImportList> (driver->nodePool(),
sym(1).UiImportList, sym(2).UiImport);
} break;
-case 12: {
+case 13: {
sym(1).UiImport->semicolonToken = loc(2);
} break;
-case 14: {
+case 15: {
sym(1).UiImport->versionToken = loc(2);
sym(1).UiImport->semicolonToken = loc(3);
} break;
-case 16: {
+case 17: {
sym(1).UiImport->versionToken = loc(2);
sym(1).UiImport->asToken = loc(3);
sym(1).UiImport->importIdToken = loc(4);
@@ -254,14 +259,14 @@ case 16: {
sym(1).UiImport->semicolonToken = loc(5);
} break;
-case 18: {
+case 19: {
sym(1).UiImport->asToken = loc(2);
sym(1).UiImport->importIdToken = loc(3);
sym(1).UiImport->importId = sym(3).sval;
sym(1).UiImport->semicolonToken = loc(4);
} break;
-case 19: {
+case 20: {
AST::UiImport *node = 0;
if (AST::StringLiteral *importIdLiteral = AST::cast<AST::StringLiteral *>(sym(2).Expression)) {
@@ -287,56 +292,56 @@ case 19: {
}
} break;
-case 20: {
+case 21: {
sym(1).Node = 0;
} break;
-case 21: {
+case 22: {
sym(1).Node = makeAstNode<AST::UiObjectMemberList> (driver->nodePool(), sym(1).UiObjectMember);
} break;
-case 22: {
+case 23: {
sym(1).Node = makeAstNode<AST::UiObjectMemberList> (driver->nodePool(), sym(1).UiObjectMember);
} break;
-case 23: {
+case 24: {
AST::UiObjectMemberList *node = makeAstNode<AST:: UiObjectMemberList> (driver->nodePool(),
sym(1).UiObjectMemberList, sym(2).UiObjectMember);
sym(1).Node = node;
} break;
-case 24: {
+case 25: {
sym(1).Node = makeAstNode<AST::UiArrayMemberList> (driver->nodePool(), sym(1).UiObjectMember);
} break;
-case 25: {
+case 26: {
AST::UiArrayMemberList *node = makeAstNode<AST::UiArrayMemberList> (driver->nodePool(),
sym(1).UiArrayMemberList, sym(3).UiObjectMember);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 26: {
+case 27: {
AST::UiObjectInitializer *node = makeAstNode<AST::UiObjectInitializer> (driver->nodePool(), (AST::UiObjectMemberList*)0);
node->lbraceToken = loc(1);
node->rbraceToken = loc(2);
sym(1).Node = node;
} break;
-case 27: {
+case 28: {
AST::UiObjectInitializer *node = makeAstNode<AST::UiObjectInitializer> (driver->nodePool(), sym(2).UiObjectMemberList->finish());
node->lbraceToken = loc(1);
node->rbraceToken = loc(3);
sym(1).Node = node;
} break;
-case 28: {
+case 29: {
AST::UiObjectDefinition *node = makeAstNode<AST::UiObjectDefinition> (driver->nodePool(), sym(1).UiQualifiedId,
sym(2).UiObjectInitializer);
sym(1).Node = node;
} break;
-case 30: {
+case 31: {
AST::UiArrayBinding *node = makeAstNode<AST::UiArrayBinding> (driver->nodePool(),
sym(1).UiQualifiedId, sym(4).UiArrayMemberList->finish());
node->colonToken = loc(2);
@@ -345,13 +350,13 @@ case 30: {
sym(1).Node = node;
} break;
-case 31: {
+case 32: {
AST::UiObjectBinding *node = makeAstNode<AST::UiObjectBinding> (driver->nodePool(),
sym(1).UiQualifiedId, sym(3).UiQualifiedId, sym(4).UiObjectInitializer);
node->colonToken = loc(2);
sym(1).Node = node;
} break;
-case 32:case 33:case 34:case 35:
+case 33:case 34:case 35:case 36:
{
AST::UiScriptBinding *node = makeAstNode<AST::UiScriptBinding> (driver->nodePool(),
sym(1).UiQualifiedId, sym(3).Statement);
@@ -359,35 +364,35 @@ case 32:case 33:case 34:case 35:
sym(1).Node = node;
} break;
-case 36:
+case 37:
-case 37: {
+case 38: {
sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount());
break;
}
-case 39: {
+case 40: {
sym(1).Node = 0;
} break;
-case 40: {
+case 41: {
sym(1).Node = sym(1).UiParameterList->finish ();
} break;
-case 41: {
+case 42: {
AST::UiParameterList *node = makeAstNode<AST::UiParameterList> (driver->nodePool(), sym(1).sval, sym(2).sval);
node->identifierToken = loc(2);
sym(1).Node = node;
} break;
-case 42: {
+case 43: {
AST::UiParameterList *node = makeAstNode<AST::UiParameterList> (driver->nodePool(), sym(1).UiParameterList, sym(3).sval, sym(4).sval);
node->commaToken = loc(2);
node->identifierToken = loc(4);
sym(1).Node = node;
} break;
-case 44: {
+case 45: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval);
node->type = AST::UiPublicMember::Signal;
node->propertyToken = loc(1);
@@ -398,7 +403,7 @@ case 44: {
sym(1).Node = node;
} break;
-case 46: {
+case 47: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval);
node->type = AST::UiPublicMember::Signal;
node->propertyToken = loc(1);
@@ -408,7 +413,7 @@ case 46: {
sym(1).Node = node;
} break;
-case 48: {
+case 49: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(4).sval, sym(6).sval);
node->typeModifier = sym(2).sval;
node->propertyToken = loc(1);
@@ -419,7 +424,7 @@ case 48: {
sym(1).Node = node;
} break;
-case 50: {
+case 51: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval);
node->propertyToken = loc(1);
node->typeToken = loc(2);
@@ -428,7 +433,7 @@ case 50: {
sym(1).Node = node;
} break;
-case 52: {
+case 53: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval);
node->isDefaultMember = true;
node->defaultToken = loc(1);
@@ -439,7 +444,7 @@ case 52: {
sym(1).Node = node;
} break;
-case 54: {
+case 55: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval,
sym(5).Expression);
node->propertyToken = loc(1);
@@ -450,7 +455,7 @@ case 54: {
sym(1).Node = node;
} break;
-case 56: {
+case 57: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval,
sym(6).Expression);
node->isReadonlyMember = true;
@@ -463,7 +468,7 @@ case 56: {
sym(1).Node = node;
} break;
-case 58: {
+case 59: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval,
sym(6).Expression);
node->isDefaultMember = true;
@@ -476,75 +481,75 @@ case 58: {
sym(1).Node = node;
} break;
-case 59: {
+case 60: {
sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node);
} break;
-case 60: {
+case 61: {
sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node);
} break;
-case 62: {
+case 63: {
QString s = QLatin1String(QmlJSGrammar::spell[T_PROPERTY]);
sym(1).sval = driver->intern(s.constData(), s.length());
break;
}
-case 63: {
+case 64: {
QString s = QLatin1String(QmlJSGrammar::spell[T_SIGNAL]);
sym(1).sval = driver->intern(s.constData(), s.length());
break;
}
-case 64: {
+case 65: {
QString s = QLatin1String(QmlJSGrammar::spell[T_READONLY]);
sym(1).sval = driver->intern(s.constData(), s.length());
break;
}
-case 65: {
+case 66: {
AST::ThisExpression *node = makeAstNode<AST::ThisExpression> (driver->nodePool());
node->thisToken = loc(1);
sym(1).Node = node;
} break;
-case 66: {
+case 67: {
AST::IdentifierExpression *node = makeAstNode<AST::IdentifierExpression> (driver->nodePool(), sym(1).sval);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 67: {
+case 68: {
AST::NullExpression *node = makeAstNode<AST::NullExpression> (driver->nodePool());
node->nullToken = loc(1);
sym(1).Node = node;
} break;
-case 68: {
+case 69: {
AST::TrueLiteral *node = makeAstNode<AST::TrueLiteral> (driver->nodePool());
node->trueToken = loc(1);
sym(1).Node = node;
} break;
-case 69: {
+case 70: {
AST::FalseLiteral *node = makeAstNode<AST::FalseLiteral> (driver->nodePool());
node->falseToken = loc(1);
sym(1).Node = node;
} break;
-case 70: {
+case 71: {
AST::NumericLiteral *node = makeAstNode<AST::NumericLiteral> (driver->nodePool(), sym(1).dval);
node->literalToken = loc(1);
sym(1).Node = node;
} break;
-case 71:
-case 72: {
+case 72:
+case 73: {
AST::StringLiteral *node = makeAstNode<AST::StringLiteral> (driver->nodePool(), sym(1).sval);
node->literalToken = loc(1);
sym(1).Node = node;
} break;
-case 73: {
+case 74: {
bool rx = lexer->scanRegExp(Lexer::NoPrefix);
if (!rx) {
diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
@@ -555,7 +560,7 @@ case 73: {
sym(1).Node = node;
} break;
-case 74: {
+case 75: {
bool rx = lexer->scanRegExp(Lexer::EqualPrefix);
if (!rx) {
diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
@@ -566,28 +571,28 @@ case 74: {
sym(1).Node = node;
} break;
-case 75: {
+case 76: {
AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), (AST::Elision *) 0);
node->lbracketToken = loc(1);
node->rbracketToken = loc(2);
sym(1).Node = node;
} break;
-case 76: {
+case 77: {
AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).Elision->finish());
node->lbracketToken = loc(1);
node->rbracketToken = loc(3);
sym(1).Node = node;
} break;
-case 77: {
+case 78: {
AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish ());
node->lbracketToken = loc(1);
node->rbracketToken = loc(3);
sym(1).Node = node;
} break;
-case 78: {
+case 79: {
AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (),
(AST::Elision *) 0);
node->lbracketToken = loc(1);
@@ -596,7 +601,7 @@ case 78: {
sym(1).Node = node;
} break;
-case 79: {
+case 80: {
AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (),
sym(4).Elision->finish());
node->lbracketToken = loc(1);
@@ -605,7 +610,7 @@ case 79: {
sym(1).Node = node;
} break;
-case 80: {
+case 81: {
AST::ObjectLiteral *node = 0;
if (sym(2).Node)
node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(),
@@ -617,7 +622,7 @@ case 80: {
sym(1).Node = node;
} break;
-case 81: {
+case 82: {
AST::ObjectLiteral *node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(),
sym(2).PropertyNameAndValueList->finish ());
node->lbraceToken = loc(1);
@@ -625,14 +630,14 @@ case 81: {
sym(1).Node = node;
} break;
-case 82: {
+case 83: {
AST::NestedExpression *node = makeAstNode<AST::NestedExpression>(driver->nodePool(), sym(2).Expression);
node->lparenToken = loc(1);
node->rparenToken = loc(3);
sym(1).Node = node;
} break;
-case 83: {
+case 84: {
if (AST::ArrayMemberExpression *mem = AST::cast<AST::ArrayMemberExpression *>(sym(1).Expression)) {
diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Warning, mem->lbracketToken,
QLatin1String("Ignored annotation")));
@@ -652,48 +657,48 @@ case 83: {
}
} break;
-case 84: {
+case 85: {
sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), (AST::Elision *) 0, sym(1).Expression);
} break;
-case 85: {
+case 86: {
sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).Elision->finish(), sym(2).Expression);
} break;
-case 86: {
+case 87: {
AST::ElementList *node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).ElementList,
(AST::Elision *) 0, sym(3).Expression);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 87: {
+case 88: {
AST::ElementList *node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).ElementList, sym(3).Elision->finish(),
sym(4).Expression);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 88: {
+case 89: {
AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool());
node->commaToken = loc(1);
sym(1).Node = node;
} break;
-case 89: {
+case 90: {
AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool(), sym(1).Elision);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 90: {
+case 91: {
AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
sym(1).PropertyName, sym(3).Expression);
node->colonToken = loc(2);
sym(1).Node = node;
} break;
-case 91: {
+case 92: {
AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
sym(1).PropertyNameAndValueList, sym(3).PropertyName, sym(5).Expression);
node->commaToken = loc(2);
@@ -701,38 +706,36 @@ case 91: {
sym(1).Node = node;
} break;
-case 92: {
+case 93: {
AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 93:
-case 94: {
+case 94:
+case 95: {
AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()));
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 95: {
+case 96: {
AST::StringLiteralPropertyName *node = makeAstNode<AST::StringLiteralPropertyName> (driver->nodePool(), sym(1).sval);
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 96: {
+case 97: {
AST::NumericLiteralPropertyName *node = makeAstNode<AST::NumericLiteralPropertyName> (driver->nodePool(), sym(1).dval);
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 97: {
+case 98: {
AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 98:
-
case 99:
case 100:
@@ -792,25 +795,27 @@ case 126:
case 127:
case 128:
+
+case 129:
{
sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount());
} break;
-case 133: {
+case 134: {
AST::ArrayMemberExpression *node = makeAstNode<AST::ArrayMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
node->lbracketToken = loc(2);
node->rbracketToken = loc(4);
sym(1).Node = node;
} break;
-case 134: {
+case 135: {
AST::FieldMemberExpression *node = makeAstNode<AST::FieldMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).sval);
node->dotToken = loc(2);
node->identifierToken = loc(3);
sym(1).Node = node;
} break;
-case 135: {
+case 136: {
AST::NewMemberExpression *node = makeAstNode<AST::NewMemberExpression> (driver->nodePool(), sym(2).Expression, sym(4).ArgumentList);
node->newToken = loc(1);
node->lparenToken = loc(3);
@@ -818,384 +823,384 @@ case 135: {
sym(1).Node = node;
} break;
-case 137: {
+case 138: {
AST::NewExpression *node = makeAstNode<AST::NewExpression> (driver->nodePool(), sym(2).Expression);
node->newToken = loc(1);
sym(1).Node = node;
} break;
-case 138: {
+case 139: {
AST::CallExpression *node = makeAstNode<AST::CallExpression> (driver->nodePool(), sym(1).Expression, sym(3).ArgumentList);
node->lparenToken = loc(2);
node->rparenToken = loc(4);
sym(1).Node = node;
} break;
-case 139: {
+case 140: {
AST::CallExpression *node = makeAstNode<AST::CallExpression> (driver->nodePool(), sym(1).Expression, sym(3).ArgumentList);
node->lparenToken = loc(2);
node->rparenToken = loc(4);
sym(1).Node = node;
} break;
-case 140: {
+case 141: {
AST::ArrayMemberExpression *node = makeAstNode<AST::ArrayMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
node->lbracketToken = loc(2);
node->rbracketToken = loc(4);
sym(1).Node = node;
} break;
-case 141: {
+case 142: {
AST::FieldMemberExpression *node = makeAstNode<AST::FieldMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).sval);
node->dotToken = loc(2);
node->identifierToken = loc(3);
sym(1).Node = node;
} break;
-case 142: {
+case 143: {
sym(1).Node = 0;
} break;
-case 143: {
+case 144: {
sym(1).Node = sym(1).ArgumentList->finish();
} break;
-case 144: {
+case 145: {
sym(1).Node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).Expression);
} break;
-case 145: {
+case 146: {
AST::ArgumentList *node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).ArgumentList, sym(3).Expression);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 149: {
+case 150: {
AST::PostIncrementExpression *node = makeAstNode<AST::PostIncrementExpression> (driver->nodePool(), sym(1).Expression);
node->incrementToken = loc(2);
sym(1).Node = node;
} break;
-case 150: {
+case 151: {
AST::PostDecrementExpression *node = makeAstNode<AST::PostDecrementExpression> (driver->nodePool(), sym(1).Expression);
node->decrementToken = loc(2);
sym(1).Node = node;
} break;
-case 152: {
+case 153: {
AST::DeleteExpression *node = makeAstNode<AST::DeleteExpression> (driver->nodePool(), sym(2).Expression);
node->deleteToken = loc(1);
sym(1).Node = node;
} break;
-case 153: {
+case 154: {
AST::VoidExpression *node = makeAstNode<AST::VoidExpression> (driver->nodePool(), sym(2).Expression);
node->voidToken = loc(1);
sym(1).Node = node;
} break;
-case 154: {
+case 155: {
AST::TypeOfExpression *node = makeAstNode<AST::TypeOfExpression> (driver->nodePool(), sym(2).Expression);
node->typeofToken = loc(1);
sym(1).Node = node;
} break;
-case 155: {
+case 156: {
AST::PreIncrementExpression *node = makeAstNode<AST::PreIncrementExpression> (driver->nodePool(), sym(2).Expression);
node->incrementToken = loc(1);
sym(1).Node = node;
} break;
-case 156: {
+case 157: {
AST::PreDecrementExpression *node = makeAstNode<AST::PreDecrementExpression> (driver->nodePool(), sym(2).Expression);
node->decrementToken = loc(1);
sym(1).Node = node;
} break;
-case 157: {
+case 158: {
AST::UnaryPlusExpression *node = makeAstNode<AST::UnaryPlusExpression> (driver->nodePool(), sym(2).Expression);
node->plusToken = loc(1);
sym(1).Node = node;
} break;
-case 158: {
+case 159: {
AST::UnaryMinusExpression *node = makeAstNode<AST::UnaryMinusExpression> (driver->nodePool(), sym(2).Expression);
node->minusToken = loc(1);
sym(1).Node = node;
} break;
-case 159: {
+case 160: {
AST::TildeExpression *node = makeAstNode<AST::TildeExpression> (driver->nodePool(), sym(2).Expression);
node->tildeToken = loc(1);
sym(1).Node = node;
} break;
-case 160: {
+case 161: {
AST::NotExpression *node = makeAstNode<AST::NotExpression> (driver->nodePool(), sym(2).Expression);
node->notToken = loc(1);
sym(1).Node = node;
} break;
-case 162: {
+case 163: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Mul, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 163: {
+case 164: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Div, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 164: {
+case 165: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Mod, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 166: {
+case 167: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Add, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 167: {
+case 168: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Sub, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 169: {
+case 170: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::LShift, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 170: {
+case 171: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::RShift, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 171: {
+case 172: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::URShift, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 173: {
+case 174: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Lt, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 174: {
+case 175: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Gt, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 175: {
+case 176: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Le, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 176: {
+case 177: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Ge, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 177: {
+case 178: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::InstanceOf, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 178: {
+case 179: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::In, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 180: {
+case 181: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Lt, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 181: {
+case 182: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Gt, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 182: {
+case 183: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Le, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 183: {
+case 184: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Ge, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 184: {
+case 185: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::InstanceOf, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 186: {
+case 187: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Equal, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 187: {
+case 188: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::NotEqual, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 188: {
+case 189: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::StrictEqual, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 189: {
+case 190: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::StrictNotEqual, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 191: {
+case 192: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Equal, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 192: {
+case 193: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::NotEqual, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 193: {
+case 194: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::StrictEqual, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 194: {
+case 195: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::StrictNotEqual, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 196: {
+case 197: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::BitAnd, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 198: {
+case 199: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::BitAnd, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 200: {
+case 201: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::BitXor, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 202: {
+case 203: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::BitXor, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 204: {
+case 205: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::BitOr, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 206: {
+case 207: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::BitOr, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 208: {
+case 209: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::And, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 210: {
+case 211: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::And, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 212: {
+case 213: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Or, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 214: {
+case 215: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Or, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 216: {
+case 217: {
AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
sym(3).Expression, sym(5).Expression);
node->questionToken = loc(2);
@@ -1203,7 +1208,7 @@ case 216: {
sym(1).Node = node;
} break;
-case 218: {
+case 219: {
AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
sym(3).Expression, sym(5).Expression);
node->questionToken = loc(2);
@@ -1211,112 +1216,112 @@ case 218: {
sym(1).Node = node;
} break;
-case 220: {
+case 221: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
sym(2).ival, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 222: {
+case 223: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
sym(2).ival, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 223: {
+case 224: {
sym(1).ival = QSOperator::Assign;
} break;
-case 224: {
+case 225: {
sym(1).ival = QSOperator::InplaceMul;
} break;
-case 225: {
+case 226: {
sym(1).ival = QSOperator::InplaceDiv;
} break;
-case 226: {
+case 227: {
sym(1).ival = QSOperator::InplaceMod;
} break;
-case 227: {
+case 228: {
sym(1).ival = QSOperator::InplaceAdd;
} break;
-case 228: {
+case 229: {
sym(1).ival = QSOperator::InplaceSub;
} break;
-case 229: {
+case 230: {
sym(1).ival = QSOperator::InplaceLeftShift;
} break;
-case 230: {
+case 231: {
sym(1).ival = QSOperator::InplaceRightShift;
} break;
-case 231: {
+case 232: {
sym(1).ival = QSOperator::InplaceURightShift;
} break;
-case 232: {
+case 233: {
sym(1).ival = QSOperator::InplaceAnd;
} break;
-case 233: {
+case 234: {
sym(1).ival = QSOperator::InplaceXor;
} break;
-case 234: {
+case 235: {
sym(1).ival = QSOperator::InplaceOr;
} break;
-case 236: {
+case 237: {
AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 237: {
+case 238: {
sym(1).Node = 0;
} break;
-case 240: {
+case 241: {
AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 241: {
+case 242: {
sym(1).Node = 0;
} break;
-case 258: {
+case 259: {
AST::Block *node = makeAstNode<AST::Block> (driver->nodePool(), sym(2).StatementList);
node->lbraceToken = loc(1);
node->rbraceToken = loc(3);
sym(1).Node = node;
} break;
-case 259: {
+case 260: {
sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).Statement);
} break;
-case 260: {
+case 261: {
sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).StatementList, sym(2).Statement);
} break;
-case 261: {
+case 262: {
sym(1).Node = 0;
} break;
-case 262: {
+case 263: {
sym(1).Node = sym(1).StatementList->finish ();
} break;
-case 264: {
+case 265: {
AST::VariableStatement *node = makeAstNode<AST::VariableStatement> (driver->nodePool(),
sym(2).VariableDeclarationList->finish (/*readOnly=*/sym(1).ival == T_CONST));
node->declarationKindToken = loc(1);
@@ -1324,76 +1329,76 @@ case 264: {
sym(1).Node = node;
} break;
-case 265: {
+case 266: {
sym(1).ival = T_CONST;
} break;
-case 266: {
+case 267: {
sym(1).ival = T_VAR;
} break;
-case 267: {
+case 268: {
sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
} break;
-case 268: {
+case 269: {
AST::VariableDeclarationList *node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(),
sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 269: {
+case 270: {
sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
} break;
-case 270: {
+case 271: {
sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
} break;
-case 271: {
+case 272: {
AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 272: {
+case 273: {
AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 273: {
+case 274: {
// ### TODO: AST for initializer
sym(1) = sym(2);
} break;
-case 274: {
+case 275: {
sym(1).Node = 0;
} break;
-case 276: {
+case 277: {
// ### TODO: AST for initializer
sym(1) = sym(2);
} break;
-case 277: {
+case 278: {
sym(1).Node = 0;
} break;
-case 279: {
+case 280: {
AST::EmptyStatement *node = makeAstNode<AST::EmptyStatement> (driver->nodePool());
node->semicolonToken = loc(1);
sym(1).Node = node;
} break;
-case 281: {
+case 282: {
AST::ExpressionStatement *node = makeAstNode<AST::ExpressionStatement> (driver->nodePool(), sym(1).Expression);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 282: {
+case 283: {
AST::IfStatement *node = makeAstNode<AST::IfStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement, sym(7).Statement);
node->ifToken = loc(1);
node->lparenToken = loc(2);
@@ -1402,7 +1407,7 @@ case 282: {
sym(1).Node = node;
} break;
-case 283: {
+case 284: {
AST::IfStatement *node = makeAstNode<AST::IfStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
node->ifToken = loc(1);
node->lparenToken = loc(2);
@@ -1410,7 +1415,7 @@ case 283: {
sym(1).Node = node;
} break;
-case 285: {
+case 286: {
AST::DoWhileStatement *node = makeAstNode<AST::DoWhileStatement> (driver->nodePool(), sym(2).Statement, sym(5).Expression);
node->doToken = loc(1);
node->whileToken = loc(3);
@@ -1420,7 +1425,7 @@ case 285: {
sym(1).Node = node;
} break;
-case 286: {
+case 287: {
AST::WhileStatement *node = makeAstNode<AST::WhileStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
node->whileToken = loc(1);
node->lparenToken = loc(2);
@@ -1428,7 +1433,7 @@ case 286: {
sym(1).Node = node;
} break;
-case 287: {
+case 288: {
AST::ForStatement *node = makeAstNode<AST::ForStatement> (driver->nodePool(), sym(3).Expression,
sym(5).Expression, sym(7).Expression, sym(9).Statement);
node->forToken = loc(1);
@@ -1439,7 +1444,7 @@ case 287: {
sym(1).Node = node;
} break;
-case 288: {
+case 289: {
AST::LocalForStatement *node = makeAstNode<AST::LocalForStatement> (driver->nodePool(),
sym(4).VariableDeclarationList->finish (/*readOnly=*/false), sym(6).Expression,
sym(8).Expression, sym(10).Statement);
@@ -1452,7 +1457,7 @@ case 288: {
sym(1).Node = node;
} break;
-case 289: {
+case 290: {
AST:: ForEachStatement *node = makeAstNode<AST::ForEachStatement> (driver->nodePool(), sym(3).Expression,
sym(5).Expression, sym(7).Statement);
node->forToken = loc(1);
@@ -1462,7 +1467,7 @@ case 289: {
sym(1).Node = node;
} break;
-case 290: {
+case 291: {
AST::LocalForEachStatement *node = makeAstNode<AST::LocalForEachStatement> (driver->nodePool(),
sym(4).VariableDeclaration, sym(6).Expression, sym(8).Statement);
node->forToken = loc(1);
@@ -1473,14 +1478,14 @@ case 290: {
sym(1).Node = node;
} break;
-case 292: {
+case 293: {
AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool());
node->continueToken = loc(1);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 294: {
+case 295: {
AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool(), sym(2).sval);
node->continueToken = loc(1);
node->identifierToken = loc(2);
@@ -1488,14 +1493,14 @@ case 294: {
sym(1).Node = node;
} break;
-case 296: {
+case 297: {
AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool());
node->breakToken = loc(1);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 298: {
+case 299: {
AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool(), sym(2).sval);
node->breakToken = loc(1);
node->identifierToken = loc(2);
@@ -1503,14 +1508,14 @@ case 298: {
sym(1).Node = node;
} break;
-case 300: {
+case 301: {
AST::ReturnStatement *node = makeAstNode<AST::ReturnStatement> (driver->nodePool(), sym(2).Expression);
node->returnToken = loc(1);
node->semicolonToken = loc(3);
sym(1).Node = node;
} break;
-case 301: {
+case 302: {
AST::WithStatement *node = makeAstNode<AST::WithStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
node->withToken = loc(1);
node->lparenToken = loc(2);
@@ -1518,7 +1523,7 @@ case 301: {
sym(1).Node = node;
} break;
-case 302: {
+case 303: {
AST::SwitchStatement *node = makeAstNode<AST::SwitchStatement> (driver->nodePool(), sym(3).Expression, sym(5).CaseBlock);
node->switchToken = loc(1);
node->lparenToken = loc(2);
@@ -1526,90 +1531,90 @@ case 302: {
sym(1).Node = node;
} break;
-case 303: {
+case 304: {
AST::CaseBlock *node = makeAstNode<AST::CaseBlock> (driver->nodePool(), sym(2).CaseClauses);
node->lbraceToken = loc(1);
node->rbraceToken = loc(3);
sym(1).Node = node;
} break;
-case 304: {
+case 305: {
AST::CaseBlock *node = makeAstNode<AST::CaseBlock> (driver->nodePool(), sym(2).CaseClauses, sym(3).DefaultClause, sym(4).CaseClauses);
node->lbraceToken = loc(1);
node->rbraceToken = loc(5);
sym(1).Node = node;
} break;
-case 305: {
+case 306: {
sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClause);
} break;
-case 306: {
+case 307: {
sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClauses, sym(2).CaseClause);
} break;
-case 307: {
+case 308: {
sym(1).Node = 0;
} break;
-case 308: {
+case 309: {
sym(1).Node = sym(1).CaseClauses->finish ();
} break;
-case 309: {
+case 310: {
AST::CaseClause *node = makeAstNode<AST::CaseClause> (driver->nodePool(), sym(2).Expression, sym(4).StatementList);
node->caseToken = loc(1);
node->colonToken = loc(3);
sym(1).Node = node;
} break;
-case 310: {
+case 311: {
AST::DefaultClause *node = makeAstNode<AST::DefaultClause> (driver->nodePool(), sym(3).StatementList);
node->defaultToken = loc(1);
node->colonToken = loc(2);
sym(1).Node = node;
} break;
-case 311:
-case 312: {
+case 312:
+case 313: {
AST::LabelledStatement *node = makeAstNode<AST::LabelledStatement> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()), sym(3).Statement);
node->identifierToken = loc(1);
node->colonToken = loc(2);
sym(1).Node = node;
} break;
-case 313: {
+case 314: {
AST::LabelledStatement *node = makeAstNode<AST::LabelledStatement> (driver->nodePool(), sym(1).sval, sym(3).Statement);
node->identifierToken = loc(1);
node->colonToken = loc(2);
sym(1).Node = node;
} break;
-case 315: {
+case 316: {
AST::ThrowStatement *node = makeAstNode<AST::ThrowStatement> (driver->nodePool(), sym(2).Expression);
node->throwToken = loc(1);
node->semicolonToken = loc(3);
sym(1).Node = node;
} break;
-case 316: {
+case 317: {
AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch);
node->tryToken = loc(1);
sym(1).Node = node;
} break;
-case 317: {
+case 318: {
AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Finally);
node->tryToken = loc(1);
sym(1).Node = node;
} break;
-case 318: {
+case 319: {
AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch, sym(4).Finally);
node->tryToken = loc(1);
sym(1).Node = node;
} break;
-case 319: {
+case 320: {
AST::Catch *node = makeAstNode<AST::Catch> (driver->nodePool(), sym(3).sval, sym(5).Block);
node->catchToken = loc(1);
node->lparenToken = loc(2);
@@ -1618,20 +1623,20 @@ case 319: {
sym(1).Node = node;
} break;
-case 320: {
+case 321: {
AST::Finally *node = makeAstNode<AST::Finally> (driver->nodePool(), sym(2).Block);
node->finallyToken = loc(1);
sym(1).Node = node;
} break;
-case 322: {
+case 323: {
AST::DebuggerStatement *node = makeAstNode<AST::DebuggerStatement> (driver->nodePool());
node->debuggerToken = loc(1);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 323: {
+case 324: {
AST::FunctionDeclaration *node = makeAstNode<AST::FunctionDeclaration> (driver->nodePool(), sym(2).sval, sym(4).FormalParameterList, sym(7).FunctionBody);
node->functionToken = loc(1);
node->identifierToken = loc(2);
@@ -1642,7 +1647,7 @@ case 323: {
sym(1).Node = node;
} break;
-case 324: {
+case 325: {
AST::FunctionExpression *node = makeAstNode<AST::FunctionExpression> (driver->nodePool(), sym(2).sval, sym(4).FormalParameterList, sym(7).FunctionBody);
node->functionToken = loc(1);
if (sym(2).sval)
@@ -1654,56 +1659,60 @@ case 324: {
sym(1).Node = node;
} break;
-case 325: {
+case 326: {
AST::FormalParameterList *node = makeAstNode<AST::FormalParameterList> (driver->nodePool(), sym(1).sval);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 326: {
+case 327: {
AST::FormalParameterList *node = makeAstNode<AST::FormalParameterList> (driver->nodePool(), sym(1).FormalParameterList, sym(3).sval);
node->commaToken = loc(2);
node->identifierToken = loc(3);
sym(1).Node = node;
} break;
-case 327: {
+case 328: {
sym(1).Node = 0;
} break;
-case 328: {
+case 329: {
sym(1).Node = sym(1).FormalParameterList->finish ();
} break;
-case 329: {
+case 330: {
sym(1).Node = 0;
} break;
-case 331: {
+case 332: {
sym(1).Node = makeAstNode<AST::FunctionBody> (driver->nodePool(), sym(1).SourceElements->finish ());
} break;
-case 332: {
+case 333: {
+ sym(1).Node = makeAstNode<AST::Program> (driver->nodePool(), sym(1).SourceElements->finish ());
+} break;
+
+case 334: {
sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElement);
} break;
-case 333: {
+case 335: {
sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElements, sym(2).SourceElement);
} break;
-case 334: {
+case 336: {
sym(1).Node = makeAstNode<AST::StatementSourceElement> (driver->nodePool(), sym(1).Statement);
} break;
-case 335: {
+case 337: {
sym(1).Node = makeAstNode<AST::FunctionSourceElement> (driver->nodePool(), sym(1).FunctionDeclaration);
} break;
-case 336: {
+case 338: {
sym(1).sval = 0;
} break;
-case 338: {
+case 340: {
sym(1).Node = 0;
} break;
diff --git a/src/declarative/qml/parser/qmljsparser_p.h b/src/declarative/qml/parser/qmljsparser_p.h
index 2a09a63..42fb422 100644
--- a/src/declarative/qml/parser/qmljsparser_p.h
+++ b/src/declarative/qml/parser/qmljsparser_p.h
@@ -134,6 +134,7 @@ public:
bool parseExpression() { return parse(T_FEED_JS_EXPRESSION); }
bool parseSourceElement() { return parse(T_FEED_JS_SOURCE_ELEMENT); }
bool parseUiObjectMember() { return parse(T_FEED_UI_OBJECT_MEMBER); }
+ bool parseProgram() { return parse(T_FEED_JS_PROGRAM); }
AST::UiProgram *ast() const
{ return AST::cast<AST::UiProgram *>(program); }
@@ -162,6 +163,9 @@ public:
return program->uiObjectMemberCast();
}
+ AST::Node *rootNode() const
+ { return program; }
+
QList<DiagnosticMessage> diagnosticMessages() const
{ return diagnostic_messages; }
@@ -231,9 +235,9 @@ protected:
-#define J_SCRIPT_REGEXPLITERAL_RULE1 73
+#define J_SCRIPT_REGEXPLITERAL_RULE1 74
-#define J_SCRIPT_REGEXPLITERAL_RULE2 74
+#define J_SCRIPT_REGEXPLITERAL_RULE2 75
QT_QML_END_NAMESPACE
diff --git a/src/declarative/util/qmllistmodel.cpp b/src/declarative/util/qmllistmodel.cpp
index de6ee2e..cd4a120 100644
--- a/src/declarative/util/qmllistmodel.cpp
+++ b/src/declarative/util/qmllistmodel.cpp
@@ -265,6 +265,7 @@ struct ModelNode
QmlListModel *modelCache;
ModelObject *objectCache;
+ bool isArray;
};
QT_END_NAMESPACE
@@ -280,6 +281,7 @@ void ModelNode::setObjectValue(const QScriptValue& valuemap) {
ModelNode *value = new ModelNode;
QScriptValue v = it.value();
if (v.isArray()) {
+ value->isArray = true;
value->setListValue(v);
} else {
value->values << v.toVariant();
@@ -296,6 +298,7 @@ void ModelNode::setListValue(const QScriptValue& valuelist) {
ModelNode *value = new ModelNode;
QScriptValue v = it.value();
if (v.isArray()) {
+ value->isArray = true;
value->setListValue(v);
} else if (v.isObject()) {
value->setObjectValue(v);
@@ -367,27 +370,29 @@ QVariant QmlListModel::valueForNode(ModelNode *node) const
{
QObject *rv = 0;
- if (!node->properties.isEmpty()) {
- // Object
- rv = node->object(this);
- } else if (node->values.count() == 0) {
- // Invalid
- return QVariant();
- } else if (node->values.count() == 1) {
- // Value
- QVariant &var = node->values[0];
- ModelNode *valueNode = qvariant_cast<ModelNode *>(var);
- if (valueNode) {
- if (!valueNode->properties.isEmpty())
- rv = valueNode->object(this);
- else
- rv = valueNode->model(this);
- } else {
- return var;
- }
- } else if (node->values.count() > 1) {
+ if (node->isArray) {
// List
rv = node->model(this);
+ } else {
+ if (!node->properties.isEmpty()) {
+ // Object
+ rv = node->object(this);
+ } else if (node->values.count() == 0) {
+ // Invalid
+ return QVariant();
+ } else if (node->values.count() == 1) {
+ // Value
+ QVariant &var = node->values[0];
+ ModelNode *valueNode = qvariant_cast<ModelNode *>(var);
+ if (valueNode) {
+ if (!valueNode->properties.isEmpty())
+ rv = valueNode->object(this);
+ else
+ rv = valueNode->model(this);
+ } else {
+ return var;
+ }
+ }
}
if (rv)
@@ -933,7 +938,7 @@ static void dump(ModelNode *node, int ind)
}
ModelNode::ModelNode()
-: modelCache(0), objectCache(0)
+: modelCache(0), objectCache(0), isArray(false)
{
}
diff --git a/tests/auto/declarative/qmllistmodel/tst_qmllistmodel.cpp b/tests/auto/declarative/qmllistmodel/tst_qmllistmodel.cpp
index 0986d20..b43b699 100644
--- a/tests/auto/declarative/qmllistmodel/tst_qmllistmodel.cpp
+++ b/tests/auto/declarative/qmllistmodel/tst_qmllistmodel.cpp
@@ -150,7 +150,12 @@ void tst_QmlListModel::dynamic_data()
QTest::newRow("listprop1a") << "{append({'foo':123,'bars':[{'a':1},{'a':2},{'a':3}]});count}" << 1 << "";
QTest::newRow("listprop1b") << "{append({'foo':123,'bars':[{'a':1},{'a':2},{'a':3}]});get(0).bars.get(1).a}" << 2 << "";
+ QTest::newRow("listprop1c") << "{append({'foo':123,'bars':[{'a':1},{'a':2},{'a':3}]});get(0).bars.count}" << 3 << "";
QTest::newRow("listprop2a") << "{append({'foo':123,'bars':[{'a':1},{'a':2},{'a':3}]});get(0).bars.append({'a':4});get(0).bars.get(3).a}" << 4 << "";
+
+ QTest::newRow("list-0-items") << "{append({'foo':[]});get(0).foo.count}" << 0 << "";
+ QTest::newRow("list-1-item") << "{append({'foo':[1]});get(0).foo.count}" << 1 << "";
+ QTest::newRow("list-multi-items") << "{append({'foo':[1,2,3]});get(0).foo.count}" << 3 << "";
}
void tst_QmlListModel::dynamic()
diff --git a/tools/qmlviewer/main.cpp b/tools/qmlviewer/main.cpp
index 8a5efa3..0a4537d 100644
--- a/tools/qmlviewer/main.cpp
+++ b/tools/qmlviewer/main.cpp
@@ -83,6 +83,7 @@ void usage()
qWarning(" -skin <qvfbskindir> ...................... run with a skin window frame");
qWarning(" \"list\" for a list of built-ins");
qWarning(" -resizeview .............................. resize the view, not the skin");
+ qWarning(" -qmlbrowser .............................. use a QML-based file browser");
qWarning(" -recordfile <output> ..................... set video recording file");
qWarning(" - ImageMagick 'convert' for GIF)");
qWarning(" - png file for raw frames");
@@ -222,6 +223,8 @@ int main(int argc, char ** argv)
translationFile = argv[++i];
} else if (arg == "-opengl") {
useGL = true;
+ } else if (arg == "-qmlbrowser") {
+ useNativeFileBrowser = false;
} else if (arg == "-L") {
if (lastArg) usage();
libraries << QString(argv[++i]);
generated by cgit v0.12 at 2024-12-29 06:30:47 (GMT)