diff options
34 files changed, 1382 insertions, 1093 deletions
diff --git a/demos/declarative/calculator/CalcButton.qml b/demos/declarative/calculator/CalcButton.qml index 966c8e4..55b5f0c 100644 --- a/demos/declarative/calculator/CalcButton.qml +++ b/demos/declarative/calculator/CalcButton.qml @@ -1,9 +1,9 @@ import Qt 4.6 Rectangle { - property string operation - property bool toggable : false - property bool toggled : false + property alias operation: Label.text + property bool toggable: false + property bool toggled: false signal clicked id: Button; width: 50; height: 30 @@ -13,7 +13,7 @@ Rectangle { GradientStop { id: G2; position: 1.0; color: Palette.button } } - Text { anchors.centerIn: parent; text: operation; color: Palette.buttonText } + Text { id: Label; anchors.centerIn: parent; color: Palette.buttonText } MouseRegion { id: ClickRegion diff --git a/demos/declarative/calculator/calculator.qml b/demos/declarative/calculator/calculator.qml index b95cc7ab..d93f04a 100644 --- a/demos/declarative/calculator/calculator.qml +++ b/demos/declarative/calculator/calculator.qml @@ -12,7 +12,7 @@ Rectangle { Rectangle { id: Container - width: 316; height: 50; z: 2 + width: 316; height: 50 border.color: Palette.dark; color: Palette.base Text { @@ -104,7 +104,6 @@ Rectangle { CalcButton { operation: "M+" } CalcButton { operation: "+/-" } } - } } diff --git a/demos/declarative/flickr/flickr-mobile.qml b/demos/declarative/flickr/flickr-mobile.qml index 9d2a3fb..32f3e37 100644 --- a/demos/declarative/flickr/flickr-mobile.qml +++ b/demos/declarative/flickr/flickr-mobile.qml @@ -53,13 +53,26 @@ Item { onButton2Clicked: if (Screen.inListView == true) Screen.inListView = false; else Screen.inListView = true } + Connection { + sender: ImageDetails; signal: "closed()" + script: { + if (Background.state == "DetailedView") { + Background.state = ''; + ImageDetails.photoUrl = ""; + } + } + } + states: State { name: "DetailedView" PropertyChanges { target: Views; x: -parent.width } PropertyChanges { target: ToolBar; button1Label: "More..." } - PropertyChanges { target: ToolBar; onButton1Clicked: { } } + PropertyChanges { + target: ToolBar + onButton1Clicked: if (ImageDetails.state=='') ImageDetails.state='Back'; else ImageDetails.state='' + } PropertyChanges { target: ToolBar; button2Label: "Back" } - PropertyChanges { target: ToolBar; onButton2Clicked: { } } + PropertyChanges { target: ToolBar; onButton2Clicked: ImageDetails.closed() } } transitions: Transition { diff --git a/demos/declarative/flickr/mobile/GridDelegate.qml b/demos/declarative/flickr/mobile/GridDelegate.qml index 890e020..19369b2 100644 --- a/demos/declarative/flickr/mobile/GridDelegate.qml +++ b/demos/declarative/flickr/mobile/GridDelegate.qml @@ -44,8 +44,8 @@ PropertyChanges { target: ScaleMe; scale: 1 } }, State { - name: "Details"; extend: "Show" - //PropertyChanges { target: ImageDetails; z: 2 } + name: "Details" + PropertyChanges { target: ScaleMe; scale: 1 } ParentChange { target: Wrapper; parent: ImageDetails.frontContainer } PropertyChanges { target: Wrapper; x: 20; y: 60; z: 1000 } PropertyChanges { target: Background; state: "DetailedView" } diff --git a/demos/declarative/flickr/mobile/ImageDetails.qml b/demos/declarative/flickr/mobile/ImageDetails.qml index 617fe40..c55ab50 100644 --- a/demos/declarative/flickr/mobile/ImageDetails.qml +++ b/demos/declarative/flickr/mobile/ImageDetails.qml @@ -32,11 +32,6 @@ Flipable { color: "black"; opacity: 0.4 } - Connection { - sender: ToolBar; signal: "button1Clicked()" - script: if (Container.state=='') Container.state='Back'; else Container.state='' - } - Column { spacing: 10 anchors { diff --git a/examples/declarative/border-image/MyBorderImage.qml b/examples/declarative/border-image/MyBorderImage.qml index f9531df..395b648 100644 --- a/examples/declarative/border-image/MyBorderImage.qml +++ b/examples/declarative/border-image/MyBorderImage.qml @@ -1,9 +1,9 @@ import Qt 4.6 Item { - property var horizontalMode : "Stretch" - property var verticalMode : "Stretch" - property string source + property var horizontalMode : BorderImage.Stretch + property var verticalMode : BorderImage.Stretch + property alias source: MyImage.source property int minWidth property int minHeight property int maxWidth @@ -13,19 +13,20 @@ Item { id: Container width: 240; height: 240 BorderImage { - x: Container.width / 2 - width / 2 - y: Container.height / 2 - height / 2 + id: MyImage; x: Container.width / 2 - width / 2; y: Container.height / 2 - height / 2 + width: SequentialAnimation { running: true; repeat: true NumberAnimation { from: Container.minWidth; to: Container.maxWidth; duration: 2000; easing: "easeInOutQuad"} NumberAnimation { from: Container.maxWidth; to: Container.minWidth; duration: 2000; easing: "easeInOutQuad" } } + height: SequentialAnimation { running: true; repeat: true NumberAnimation { from: Container.minHeight; to: Container.maxHeight; duration: 2000; easing: "easeInOutQuad"} NumberAnimation { from: Container.maxHeight; to: Container.minHeight; duration: 2000; easing: "easeInOutQuad" } } - source: Container.source + horizontalTileMode: Container.horizontalMode verticalTileMode: Container.verticalMode border.top: Container.margin diff --git a/examples/declarative/border-image/animated.qml b/examples/declarative/border-image/animated.qml index 2fe2ea9..b34753f 100644 --- a/examples/declarative/border-image/animated.qml +++ b/examples/declarative/border-image/animated.qml @@ -14,19 +14,19 @@ Rectangle { x: 270; y: 20; minWidth: 120; maxWidth: 240 minHeight: 120; maxHeight: 240 source: "colors.png"; margin: 30 - horizontalMode: "Repeat"; verticalMode: "Repeat" + horizontalMode: BorderImage.Repeat; verticalMode: BorderImage.Repeat } MyBorderImage { x: 520; y: 20; minWidth: 120; maxWidth: 240 minHeight: 120; maxHeight: 240 source: "colors.png"; margin: 30 - horizontalMode: "Stretch"; verticalMode: "Repeat" + horizontalMode: BorderImage.Stretch; verticalMode: BorderImage.Repeat } MyBorderImage { x: 770; y: 20; minWidth: 120; maxWidth: 240 minHeight: 120; maxHeight: 240 source: "colors.png"; margin: 30 - horizontalMode: "Round"; verticalMode: "Round" + horizontalMode: BorderImage.Round; verticalMode: BorderImage.Round } MyBorderImage { x: 20; y: 280; minWidth: 60; maxWidth: 200 @@ -37,18 +37,18 @@ Rectangle { x: 270; y: 280; minWidth: 60; maxWidth: 200 minHeight: 40; maxHeight: 200 source: "bw.png"; margin: 10 - horizontalMode: "Repeat"; verticalMode: "Repeat" + horizontalMode: BorderImage.Repeat; verticalMode: BorderImage.Repeat } MyBorderImage { x: 520; y: 280; minWidth: 60; maxWidth: 200 minHeight: 40; maxHeight: 200 source: "bw.png"; margin: 10 - horizontalMode: "Stretch"; verticalMode: "Repeat" + horizontalMode: BorderImage.Stretch; verticalMode: BorderImage.Repeat } MyBorderImage { x: 770; y: 280; minWidth: 60; maxWidth: 200 minHeight: 40; maxHeight: 200 source: "bw.png"; margin: 10 - horizontalMode: "Round"; verticalMode: "Round" + horizontalMode: BorderImage.Round; verticalMode: BorderImage.Round } } diff --git a/examples/declarative/border-image/example.qml b/examples/declarative/border-image/example.qml index 87d3f37..a0b02b7 100644 --- a/examples/declarative/border-image/example.qml +++ b/examples/declarative/border-image/example.qml @@ -13,8 +13,8 @@ Rectangle { width: 180; height: 180 border.left: 30; border.top: 30 border.right: 30; border.bottom: 30 - horizontalTileMode: "Stretch" - verticalTileMode: "Stretch" + horizontalTileMode: BorderImage.Stretch + verticalTileMode: BorderImage.Stretch source: "colors.png" } @@ -22,8 +22,8 @@ Rectangle { width: 180; height: 180 border.left: 30; border.top: 30 border.right: 30; border.bottom: 30 - horizontalTileMode: "Round" - verticalTileMode: "Round" + horizontalTileMode: BorderImage.Round + verticalTileMode: BorderImage.Round source: "colors.png" } //! [0] diff --git a/examples/declarative/focusscope/test4.qml b/examples/declarative/focusscope/test4.qml new file mode 100644 index 0000000..f366543 --- /dev/null +++ b/examples/declarative/focusscope/test4.qml @@ -0,0 +1,75 @@ +import Qt 4.6 + +Rectangle { + color: "white" + width: 800 + height: 600 + + Keys.onDigit9Pressed: print("Error - Root") + + FocusScope { + id: MyScope + + Keys.onDigit9Pressed: print("Error - FocusScope") + + Rectangle { + height: 120 + width: 420 + + color: "transparent" + border.width: 5 + border.color: MyScope.wantsFocus?"blue":"black" + + Rectangle { + id: Item1 + x: 10; y: 10 + width: 100; height: 100; color: "green" + border.width: 5 + border.color: wantsFocus?"blue":"black" + Keys.onDigit9Pressed: print("Error - Top Left"); + KeyNavigation.right: Item2 + focus: true + + Rectangle { + width: 50; height: 50; anchors.centerIn: parent + color: parent.focus?"red":"transparent" + } + } + + Rectangle { + id: Item2 + x: 310; y: 10 + width: 100; height: 100; color: "green" + border.width: 5 + border.color: wantsFocus?"blue":"black" + KeyNavigation.left: Item1 + Keys.onDigit9Pressed: print("Error - Top Right"); + + Rectangle { + width: 50; height: 50; anchors.centerIn: parent + color: parent.focus?"red":"transparent" + } + } + } + KeyNavigation.down: Item3 + } + + Text { x:100; y:170; text: "There should be no blue borders, or red squares.\nPressing \"9\" should do nothing.\nArrow keys should have no effect." } + + Rectangle { + id: Item3 + x: 10; y: 300 + width: 100; height: 100; color: "green" + border.width: 5 + border.color: wantsFocus?"blue":"black" + + Keys.onDigit9Pressed: print("Error - Bottom Left"); + KeyNavigation.up: MyScope + + Rectangle { + width: 50; height: 50; anchors.centerIn: parent + color: parent.focus?"red":"transparent" + } + } + +} diff --git a/examples/declarative/layouts/layouts.qml b/examples/declarative/layouts/layouts.qml index 6e22d8b..b54a7f3 100644 --- a/examples/declarative/layouts/layouts.qml +++ b/examples/declarative/layouts/layouts.qml @@ -5,7 +5,8 @@ Item { id: resizable GraphicsObjectContainer{ anchors.fill:parent QGraphicsWidget{ - geometry:{ "0,0," + parent.width.toString() + "x" + parent.height.toString(); } + size.width:parent.width + size.height:parent.height layout: QGraphicsLinearLayout{ LayoutItem{ minimumSize: "100x100" diff --git a/src/corelib/animation/qabstractanimation.h b/src/corelib/animation/qabstractanimation.h index 50b07d7..3d608b6 100644 --- a/src/corelib/animation/qabstractanimation.h +++ b/src/corelib/animation/qabstractanimation.h @@ -59,6 +59,8 @@ class QAbstractAnimationPrivate; class Q_CORE_EXPORT QAbstractAnimation : public QObject { Q_OBJECT + Q_ENUMS(State) + Q_ENUMS(Direction) Q_PROPERTY(State state READ state NOTIFY stateChanged) Q_PROPERTY(int loopCount READ loopCount WRITE setLoopCount) Q_PROPERTY(int currentTime READ currentTime WRITE setCurrentTime) diff --git a/src/declarative/fx/qfxflickable.cpp b/src/declarative/fx/qfxflickable.cpp index 5c1cccf..a83ee66 100644 --- a/src/declarative/fx/qfxflickable.cpp +++ b/src/declarative/fx/qfxflickable.cpp @@ -744,12 +744,19 @@ void QFxFlickablePrivate::captureDelayedPress(QGraphicsSceneMouseEvent *event) if (event->buttons() & i) { Qt::MouseButton button = Qt::MouseButton(i); delayedPressEvent->setButtonDownPos(button, event->buttonDownPos(button)); + delayedPressEvent->setButtonDownScenePos(button, event->buttonDownScenePos(button)); + delayedPressEvent->setButtonDownScreenPos(button, event->buttonDownScreenPos(button)); } } - delayedPressEvent->setScenePos(event->scenePos()); - delayedPressEvent->setLastScenePos(event->lastScenePos()); + delayedPressEvent->setButtons(event->buttons()); + delayedPressEvent->setButton(event->button()); delayedPressEvent->setPos(event->pos()); + delayedPressEvent->setScenePos(event->scenePos()); + delayedPressEvent->setScreenPos(event->screenPos()); delayedPressEvent->setLastPos(event->lastPos()); + delayedPressEvent->setLastScenePos(event->lastScenePos()); + delayedPressEvent->setLastScreenPos(event->lastScreenPos()); + delayedPressEvent->setModifiers(event->modifiers()); delayedPressTimer.start(pressDelay, q); } diff --git a/src/declarative/fx/qfxlistview.cpp b/src/declarative/fx/qfxlistview.cpp index 5de9bf3..3584892 100644 --- a/src/declarative/fx/qfxlistview.cpp +++ b/src/declarative/fx/qfxlistview.cpp @@ -1339,13 +1339,19 @@ qreal QFxListView::maxXExtent() const void QFxListView::keyPressEvent(QKeyEvent *event) { Q_D(QFxListView); + QFxFlickable::keyPressEvent(event); + if (event->isAccepted()) + return; + if (d->model && d->model->count() && d->interactive) { if ((d->orient == Qt::Horizontal && event->key() == Qt::Key_Left) || (d->orient == Qt::Vertical && event->key() == Qt::Key_Up)) { if (currentIndex() > 0 || (d->wrap && !event->isAutoRepeat())) { d->moveReason = QFxListViewPrivate::Key; - int index = currentIndex()-1; - d->updateCurrent(index >= 0 ? index : d->model->count()-1); + decrementCurrentIndex(); + event->accept(); + return; + } else if (d->wrap) { event->accept(); return; } @@ -1353,8 +1359,10 @@ void QFxListView::keyPressEvent(QKeyEvent *event) || (d->orient == Qt::Vertical && event->key() == Qt::Key_Down)) { if (currentIndex() < d->model->count() - 1 || (d->wrap && !event->isAutoRepeat())) { d->moveReason = QFxListViewPrivate::Key; - int index = currentIndex()+1; - d->updateCurrent(index < d->model->count() ? index : 0); + incrementCurrentIndex(); + event->accept(); + return; + } else if (d->wrap) { event->accept(); return; } @@ -1362,7 +1370,24 @@ void QFxListView::keyPressEvent(QKeyEvent *event) } d->moveReason = QFxListViewPrivate::Other; event->ignore(); - QFxFlickable::keyPressEvent(event); +} + +void QFxListView::incrementCurrentIndex() +{ + Q_D(QFxListView); + if (currentIndex() < d->model->count() - 1 || d->wrap) { + int index = currentIndex()+1; + d->updateCurrent(index < d->model->count() ? index : 0); + } +} + +void QFxListView::decrementCurrentIndex() +{ + Q_D(QFxListView); + if (currentIndex() > 0 || d->wrap) { + int index = currentIndex()-1; + d->updateCurrent(index >= 0 ? index : d->model->count()-1); + } } void QFxListView::componentComplete() diff --git a/src/declarative/fx/qfxlistview.h b/src/declarative/fx/qfxlistview.h index cc3d910..fc15967 100644 --- a/src/declarative/fx/qfxlistview.h +++ b/src/declarative/fx/qfxlistview.h @@ -50,9 +50,6 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) -//### incrementCurrentIndex(), decrementCurrentIndex() slots -//### default Keys.OnUp/DownPressed handler - class QFxVisualModel; class QFxListViewAttached; @@ -131,6 +128,10 @@ public: static QFxListViewAttached *qmlAttachedProperties(QObject *); +public Q_SLOTS: + void incrementCurrentIndex(); + void decrementCurrentIndex(); + Q_SIGNALS: void countChanged(); void spacingChanged(); diff --git a/src/declarative/fx/qfxrepeater.cpp b/src/declarative/fx/qfxrepeater.cpp index 5ef7b10..bc34839 100644 --- a/src/declarative/fx/qfxrepeater.cpp +++ b/src/declarative/fx/qfxrepeater.cpp @@ -282,26 +282,13 @@ void QFxRepeater::regenerate() if (!d->model || !d->model->count() || !d->model->isValid() || !parentItem() || !isComponentComplete()) return; - //In order to do the insertion like the examples, we have to be at the - //same point in the childItems() list. Temporary measure until we think of something better - int pos = parentItem()->childItems().indexOf(this); - Q_ASSERT(pos != -1); - QList<QGraphicsItem*> otherChildren; - for (int ii = pos+1; ii < parentItem()->childItems().count(); ii++){ - QGraphicsItem* otherChild = parentItem()->childItems()[ii]; - otherChildren << otherChild; - otherChild->setParentItem(0); - } - for (int ii = 0; ii < count(); ++ii) { QFxItem *item = d->model->item(ii); if (item) { item->setParent(parentItem()); + item->stackBefore(this); d->deletables << item; } } - - foreach(QGraphicsItem* other, otherChildren) - other->setParentItem(parentItem()); } QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxtextedit.cpp b/src/declarative/fx/qfxtextedit.cpp index 935ccb7..f4c2e4c 100644 --- a/src/declarative/fx/qfxtextedit.cpp +++ b/src/declarative/fx/qfxtextedit.cpp @@ -767,7 +767,7 @@ bool QFxTextEdit::event(QEvent *event) Q_D(QFxTextEdit); if (event->type() == QEvent::ShortcutOverride) { d->control->processEvent(event, QPointF(0, 0)); - return true; + return event->isAccepted(); } return QFxPaintedItem::event(event); } diff --git a/src/declarative/qml/parser/qmljs.g b/src/declarative/qml/parser/qmljs.g index 3c5db0b..211887b 100644 --- a/src/declarative/qml/parser/qmljs.g +++ b/src/declarative/qml/parser/qmljs.g @@ -89,6 +89,7 @@ --- feed tokens %token T_FEED_UI_PROGRAM +%token T_FEED_UI_OBJECT_MEMBER %token T_FEED_JS_STATEMENT %token T_FEED_JS_EXPRESSION @@ -285,6 +286,7 @@ public: bool parse() { return parse(T_FEED_UI_PROGRAM); } bool parseStatement() { return parse(T_FEED_JS_STATEMENT); } bool parseExpression() { return parse(T_FEED_JS_EXPRESSION); } + bool parseUiObjectMember() { return parse(T_FEED_UI_OBJECT_MEMBER); } AST::UiProgram *ast() const { return AST::cast<AST::UiProgram *>(program); } @@ -305,6 +307,14 @@ public: return program->expressionCast(); } + AST::UiObjectMember *uiObjectMember() const + { + if (! program) + return 0; + + return program->uiObjectMemberCast(); + } + QList<DiagnosticMessage> diagnosticMessages() const { return diagnostic_messages; } @@ -550,6 +560,14 @@ case $rule_number: { } break; ./ +TopLevel: T_FEED_UI_OBJECT_MEMBER UiObjectMember ; +/. +case $rule_number: { + sym(1).Node = sym(2).Node; + program = sym(1).Node; +} break; +./ + UiProgram: UiImportListOpt UiRootMember ; /. case $rule_number: { diff --git a/src/declarative/qml/parser/qmljsast.cpp b/src/declarative/qml/parser/qmljsast.cpp index 64fe99c..4c45bc8 100644 --- a/src/declarative/qml/parser/qmljsast.cpp +++ b/src/declarative/qml/parser/qmljsast.cpp @@ -75,6 +75,11 @@ Statement *Node::statementCast() return 0; } +UiObjectMember *Node::uiObjectMemberCast() +{ + return 0; +} + ExpressionNode *ExpressionNode::expressionCast() { return this; @@ -90,6 +95,11 @@ Statement *Statement::statementCast() return this; } +UiObjectMember *UiObjectMember::uiObjectMemberCast() +{ + return this; +} + void NestedExpression::accept0(Visitor *visitor) { if (visitor->visit(this)) { diff --git a/src/declarative/qml/parser/qmljsast_p.h b/src/declarative/qml/parser/qmljsast_p.h index 2d37097..ef8a66b 100644 --- a/src/declarative/qml/parser/qmljsast_p.h +++ b/src/declarative/qml/parser/qmljsast_p.h @@ -228,6 +228,7 @@ public: virtual ExpressionNode *expressionCast(); virtual BinaryExpression *binaryExpressionCast(); virtual Statement *statementCast(); + virtual UiObjectMember *uiObjectMemberCast(); void accept(Visitor *visitor); static void accept(Node *node, Visitor *visitor); @@ -2356,6 +2357,8 @@ class UiObjectMember: public Node public: virtual SourceLocation firstSourceLocation() const = 0; virtual SourceLocation lastSourceLocation() const = 0; + + virtual UiObjectMember *uiObjectMemberCast(); }; class UiObjectMemberList: public Node diff --git a/src/declarative/qml/parser/qmljsgrammar.cpp b/src/declarative/qml/parser/qmljsgrammar.cpp index 4188633..67f1403 100644 --- a/src/declarative/qml/parser/qmljsgrammar.cpp +++ b/src/declarative/qml/parser/qmljsgrammar.cpp @@ -52,581 +52,592 @@ 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}; + "import", "as", 0, 0, 0, 0, 0, 0}; const int QmlJSGrammar::lhs [] = { - 97, 97, 97, 98, 101, 101, 104, 104, 106, 105, - 105, 105, 105, 105, 105, 105, 105, 108, 103, 102, - 111, 111, 113, 113, 114, 114, 110, 112, 112, 112, - 112, 112, 112, 112, 120, 120, 120, 121, 121, 122, - 122, 112, 112, 112, 112, 112, 112, 112, 112, 112, - 112, 112, 112, 112, 112, 112, 112, 112, 112, 109, - 109, 109, 109, 125, 125, 125, 125, 125, 125, 125, - 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, - 125, 115, 127, 127, 127, 127, 126, 126, 129, 129, - 131, 131, 131, 131, 131, 131, 132, 132, 132, 132, - 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, - 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, - 132, 132, 132, 132, 132, 132, 132, 133, 133, 107, - 107, 107, 107, 107, 136, 136, 137, 137, 137, 137, - 135, 135, 138, 138, 139, 139, 140, 140, 140, 141, - 141, 141, 141, 141, 141, 141, 141, 141, 141, 142, - 142, 142, 142, 143, 143, 143, 144, 144, 144, 144, - 145, 145, 145, 145, 145, 145, 145, 146, 146, 146, - 146, 146, 146, 147, 147, 147, 147, 147, 148, 148, - 148, 148, 148, 149, 149, 150, 150, 151, 151, 152, - 152, 153, 153, 154, 154, 155, 155, 156, 156, 157, - 157, 158, 158, 159, 159, 160, 160, 130, 130, 161, - 161, 162, 162, 162, 162, 162, 162, 162, 162, 162, - 162, 162, 162, 100, 100, 163, 163, 164, 164, 165, - 165, 99, 99, 99, 99, 99, 99, 99, 99, 99, - 99, 99, 99, 99, 99, 99, 116, 177, 177, 176, - 176, 124, 124, 178, 178, 179, 179, 181, 181, 180, - 182, 185, 183, 183, 186, 184, 184, 117, 118, 118, - 119, 119, 166, 166, 166, 166, 166, 166, 166, 167, - 167, 167, 167, 168, 168, 168, 168, 169, 169, 170, - 172, 187, 187, 190, 190, 188, 188, 191, 189, 171, - 171, 171, 173, 173, 174, 174, 174, 192, 193, 175, - 175, 123, 134, 197, 197, 194, 194, 195, 195, 198, - 199, 199, 200, 200, 196, 196, 128, 128, 201}; + 98, 98, 98, 98, 99, 103, 103, 106, 106, 108, + 107, 107, 107, 107, 107, 107, 107, 107, 110, 105, + 104, 113, 113, 114, 114, 115, 115, 112, 102, 102, + 102, 102, 102, 102, 102, 121, 121, 121, 122, 122, + 123, 123, 102, 102, 102, 102, 102, 102, 102, 102, + 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, + 111, 111, 111, 111, 126, 126, 126, 126, 126, 126, + 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, + 126, 126, 116, 128, 128, 128, 128, 127, 127, 130, + 130, 132, 132, 132, 132, 132, 132, 133, 133, 133, + 133, 133, 133, 133, 133, 133, 133, 133, 133, 133, + 133, 133, 133, 133, 133, 133, 133, 133, 133, 133, + 133, 133, 133, 133, 133, 133, 133, 133, 134, 134, + 109, 109, 109, 109, 109, 137, 137, 138, 138, 138, + 138, 136, 136, 139, 139, 140, 140, 141, 141, 141, + 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, + 143, 143, 143, 143, 144, 144, 144, 145, 145, 145, + 145, 146, 146, 146, 146, 146, 146, 146, 147, 147, + 147, 147, 147, 147, 148, 148, 148, 148, 148, 149, + 149, 149, 149, 149, 150, 150, 151, 151, 152, 152, + 153, 153, 154, 154, 155, 155, 156, 156, 157, 157, + 158, 158, 159, 159, 160, 160, 161, 161, 131, 131, + 162, 162, 163, 163, 163, 163, 163, 163, 163, 163, + 163, 163, 163, 163, 101, 101, 164, 164, 165, 165, + 166, 166, 100, 100, 100, 100, 100, 100, 100, 100, + 100, 100, 100, 100, 100, 100, 100, 117, 178, 178, + 177, 177, 125, 125, 179, 179, 180, 180, 182, 182, + 181, 183, 186, 184, 184, 187, 185, 185, 118, 119, + 119, 120, 120, 167, 167, 167, 167, 167, 167, 167, + 168, 168, 168, 168, 169, 169, 169, 169, 170, 170, + 171, 173, 188, 188, 191, 191, 189, 189, 192, 190, + 172, 172, 172, 174, 174, 175, 175, 175, 193, 194, + 176, 176, 124, 135, 198, 198, 195, 195, 196, 196, + 199, 200, 200, 201, 201, 197, 197, 129, 129, 202}; const int QmlJSGrammar:: rhs[] = { - 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, + 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, 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, 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, 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}; const int QmlJSGrammar::action_default [] = { - 0, 0, 0, 19, 0, 167, 234, 198, 206, 202, - 146, 218, 194, 3, 131, 65, 147, 210, 214, 135, - 164, 145, 150, 130, 184, 171, 0, 72, 73, 68, - 335, 60, 337, 0, 0, 0, 0, 70, 0, 0, - 66, 69, 0, 0, 61, 63, 62, 71, 64, 0, - 67, 0, 0, 160, 0, 0, 147, 166, 149, 148, - 0, 0, 0, 162, 163, 161, 165, 0, 195, 0, - 0, 0, 0, 185, 0, 0, 0, 0, 0, 0, - 175, 0, 0, 0, 169, 170, 168, 173, 177, 176, - 174, 172, 187, 186, 188, 0, 203, 0, 199, 0, - 0, 141, 128, 140, 129, 97, 98, 99, 124, 100, - 125, 101, 102, 103, 104, 105, 106, 107, 108, 109, - 110, 111, 112, 113, 126, 114, 115, 116, 117, 118, - 119, 120, 121, 122, 123, 127, 0, 0, 139, 235, - 142, 0, 143, 0, 144, 138, 0, 231, 224, 222, - 229, 230, 228, 227, 233, 226, 225, 223, 232, 219, - 0, 207, 0, 0, 211, 0, 0, 215, 0, 0, - 141, 133, 0, 132, 0, 137, 151, 0, 336, 326, - 327, 0, 324, 0, 325, 0, 328, 242, 249, 248, - 256, 244, 0, 245, 329, 0, 334, 246, 247, 252, - 250, 331, 330, 333, 253, 0, 264, 0, 0, 0, - 0, 335, 60, 0, 337, 61, 236, 278, 62, 0, - 0, 0, 265, 0, 0, 254, 255, 0, 243, 251, - 279, 280, 323, 332, 0, 294, 295, 296, 297, 0, - 290, 291, 292, 293, 320, 321, 0, 0, 0, 0, - 0, 283, 284, 240, 238, 200, 208, 204, 220, 196, - 241, 0, 147, 212, 216, 189, 178, 0, 0, 197, - 0, 0, 0, 0, 190, 0, 0, 0, 0, 0, - 182, 180, 183, 181, 179, 192, 191, 193, 0, 205, - 0, 201, 0, 239, 147, 0, 221, 236, 237, 0, - 236, 0, 0, 286, 0, 0, 0, 288, 0, 209, - 0, 0, 213, 0, 0, 217, 276, 0, 268, 277, - 271, 0, 275, 0, 236, 269, 0, 236, 0, 0, - 287, 0, 0, 0, 289, 336, 326, 0, 0, 328, - 0, 322, 0, 312, 0, 0, 0, 282, 0, 281, - 0, 338, 0, 96, 258, 261, 0, 97, 264, 100, - 125, 102, 103, 68, 107, 108, 60, 109, 112, 66, - 69, 61, 236, 62, 71, 115, 64, 117, 67, 119, - 120, 265, 122, 123, 127, 0, 89, 0, 0, 91, - 95, 93, 80, 92, 94, 0, 90, 79, 259, 257, - 135, 136, 141, 0, 134, 0, 311, 0, 298, 299, - 0, 310, 0, 0, 0, 301, 306, 304, 307, 0, - 0, 305, 306, 0, 302, 0, 303, 260, 309, 0, - 260, 308, 0, 313, 314, 0, 260, 315, 316, 0, - 0, 317, 0, 0, 0, 318, 319, 153, 152, 0, - 0, 0, 285, 0, 0, 0, 300, 273, 266, 0, - 274, 270, 0, 272, 262, 0, 263, 267, 83, 0, - 0, 87, 74, 0, 76, 85, 0, 77, 86, 88, - 78, 84, 75, 0, 81, 157, 155, 159, 156, 154, - 158, 2, 5, 0, 7, 0, 6, 0, 1, 18, - 9, 0, 0, 0, 10, 0, 11, 0, 16, 17, - 0, 12, 13, 0, 14, 15, 8, 82, 20, 0, - 4, 0, 27, 58, 0, 61, 25, 63, 62, 28, - 21, 0, 0, 59, 0, 37, 36, 35, 0, 0, - 50, 0, 51, 0, 56, 57, 37, 0, 0, 0, - 0, 0, 46, 47, 0, 48, 0, 49, 0, 52, - 53, 0, 0, 0, 0, 0, 54, 55, 0, 44, - 38, 45, 39, 0, 0, 0, 0, 41, 0, 42, - 43, 40, 26, 22, 0, 31, 32, 33, 34, 135, - 260, 0, 0, 97, 264, 100, 125, 102, 103, 68, - 107, 108, 60, 109, 112, 66, 69, 61, 236, 62, - 71, 115, 64, 117, 67, 119, 120, 265, 122, 123, - 127, 135, 0, 23, 0, 29, 24, 30, 339}; + 0, 0, 0, 0, 20, 0, 168, 235, 199, 207, + 203, 147, 219, 195, 3, 132, 66, 148, 211, 215, + 136, 165, 146, 151, 131, 185, 172, 0, 73, 74, + 69, 336, 61, 338, 0, 0, 0, 0, 71, 0, + 0, 67, 70, 0, 0, 62, 64, 63, 72, 65, + 0, 68, 0, 0, 161, 0, 0, 148, 167, 150, + 149, 0, 0, 0, 163, 164, 162, 166, 0, 196, + 0, 0, 0, 0, 186, 0, 0, 0, 0, 0, + 0, 176, 0, 0, 0, 170, 171, 169, 174, 178, + 177, 175, 173, 188, 187, 189, 0, 204, 0, 200, + 0, 0, 142, 129, 141, 130, 98, 99, 100, 125, + 101, 126, 102, 103, 104, 105, 106, 107, 108, 109, + 110, 111, 112, 113, 114, 127, 115, 116, 117, 118, + 119, 120, 121, 122, 123, 124, 128, 0, 0, 140, + 236, 143, 0, 144, 0, 145, 139, 0, 232, 225, + 223, 230, 231, 229, 228, 234, 227, 226, 224, 233, + 220, 0, 208, 0, 0, 212, 0, 0, 216, 0, + 0, 142, 134, 0, 133, 0, 138, 152, 0, 337, + 327, 328, 0, 325, 0, 326, 0, 329, 243, 250, + 249, 257, 245, 0, 246, 330, 0, 335, 247, 248, + 253, 251, 332, 331, 334, 254, 0, 265, 0, 0, + 0, 0, 336, 61, 0, 338, 62, 237, 279, 63, + 0, 0, 0, 266, 0, 0, 255, 256, 0, 244, + 252, 280, 281, 324, 333, 0, 295, 296, 297, 298, + 0, 291, 292, 293, 294, 321, 322, 0, 0, 0, + 0, 0, 284, 285, 241, 239, 201, 209, 205, 221, + 197, 242, 0, 148, 213, 217, 190, 179, 0, 0, + 198, 0, 0, 0, 0, 191, 0, 0, 0, 0, + 0, 183, 181, 184, 182, 180, 193, 192, 194, 0, + 206, 0, 202, 0, 240, 148, 0, 222, 237, 238, + 0, 237, 0, 0, 287, 0, 0, 0, 289, 0, + 210, 0, 0, 214, 0, 0, 218, 277, 0, 269, + 278, 272, 0, 276, 0, 237, 270, 0, 237, 0, + 0, 288, 0, 0, 0, 290, 337, 327, 0, 0, + 329, 0, 323, 0, 313, 0, 0, 0, 283, 0, + 282, 0, 339, 0, 97, 259, 262, 0, 98, 265, + 101, 126, 103, 104, 69, 108, 109, 61, 110, 113, + 67, 70, 62, 237, 63, 72, 116, 65, 118, 68, + 120, 121, 266, 123, 124, 128, 0, 90, 0, 0, + 92, 96, 94, 81, 93, 95, 0, 91, 80, 260, + 258, 136, 137, 142, 0, 135, 0, 312, 0, 299, + 300, 0, 311, 0, 0, 0, 302, 307, 305, 308, + 0, 0, 306, 307, 0, 303, 0, 304, 261, 310, + 0, 261, 309, 0, 314, 315, 0, 261, 316, 317, + 0, 0, 318, 0, 0, 0, 319, 320, 154, 153, + 0, 0, 0, 286, 0, 0, 0, 301, 274, 267, + 0, 275, 271, 0, 273, 263, 0, 264, 268, 84, + 0, 0, 88, 75, 0, 77, 86, 0, 78, 87, + 89, 79, 85, 76, 0, 82, 158, 156, 160, 157, + 155, 159, 2, 59, 83, 0, 0, 62, 64, 63, + 29, 4, 0, 60, 0, 38, 37, 36, 0, 0, + 51, 0, 52, 0, 57, 58, 0, 38, 0, 0, + 0, 0, 0, 47, 48, 0, 49, 0, 50, 0, + 53, 54, 0, 0, 0, 0, 0, 55, 56, 0, + 45, 39, 46, 40, 0, 0, 0, 0, 42, 0, + 43, 44, 41, 0, 0, 28, 32, 33, 34, 35, + 136, 261, 0, 0, 98, 265, 101, 126, 103, 104, + 69, 108, 109, 61, 110, 113, 67, 70, 62, 237, + 63, 72, 116, 65, 118, 68, 120, 121, 266, 123, + 124, 128, 136, 0, 24, 0, 0, 30, 25, 31, + 26, 22, 0, 27, 23, 6, 0, 8, 0, 7, + 0, 1, 19, 10, 0, 11, 0, 12, 0, 17, + 18, 0, 13, 14, 0, 15, 16, 9, 21, 5, + 340}; const int QmlJSGrammar::goto_default [] = { - 4, 498, 354, 192, 497, 520, 492, 496, 494, 499, - 19, 495, 15, 529, 531, 530, 622, 522, 519, 187, - 191, 193, 197, 547, 573, 572, 196, 228, 23, 470, - 469, 352, 351, 6, 350, 353, 103, 14, 141, 21, - 10, 140, 16, 22, 53, 20, 5, 25, 24, 265, - 12, 259, 7, 255, 9, 257, 8, 256, 17, 263, - 18, 264, 11, 258, 254, 295, 407, 260, 261, 198, - 189, 188, 200, 229, 199, 204, 225, 226, 190, 356, - 355, 227, 459, 458, 317, 318, 461, 320, 460, 319, - 415, 419, 422, 418, 417, 437, 438, 181, 195, 177, - 180, 194, 202, 201, 0}; + 5, 611, 355, 193, 501, 610, 629, 605, 609, 607, + 612, 20, 608, 16, 500, 602, 593, 555, 502, 188, + 192, 194, 198, 518, 544, 543, 197, 229, 24, 471, + 470, 353, 352, 7, 351, 354, 104, 15, 142, 22, + 11, 141, 17, 23, 54, 21, 6, 26, 25, 266, + 13, 260, 8, 256, 10, 258, 9, 257, 18, 264, + 19, 265, 12, 259, 255, 296, 408, 261, 262, 199, + 190, 189, 201, 230, 200, 205, 226, 227, 191, 357, + 356, 228, 460, 459, 318, 319, 462, 321, 461, 320, + 416, 420, 423, 419, 418, 438, 439, 182, 196, 178, + 181, 195, 203, 202, 0}; const int QmlJSGrammar::action_index [] = { - 136, 1173, 2163, -89, 8, 112, -97, 51, 13, -35, - 267, -97, 367, 33, -97, -97, 658, 27, 92, 205, - 232, -97, -97, -97, 564, 261, 1173, -97, -97, -97, - 307, -97, 1977, 1438, 1173, 1173, 1173, -97, 913, 1173, - -97, -97, 1173, 1173, -97, -97, -97, -97, -97, 1173, - -97, 1173, 1173, -97, 1173, 1173, 90, 237, -97, -97, - 1173, 1173, 1173, -97, -97, -97, 252, 1173, 349, 1173, - 1173, 1173, 1173, 450, 1173, 1173, 1173, 1173, 1173, 1173, - 245, 1173, 1173, 1173, 134, 141, 132, 334, 241, 238, - 207, 334, 440, 564, 422, 1173, -1, 1173, 81, 1884, - 1173, 1173, -97, -97, -97, -97, -97, -97, -97, -97, - -97, -97, -97, -97, -97, -97, -97, -97, -97, -97, - -97, -97, -97, -97, -97, -97, -97, -97, -97, -97, - -97, -97, -97, -97, -97, -97, 143, 1173, -97, -97, - 57, -43, -97, 1173, -97, -97, 1173, -97, -97, -97, - -97, -97, -97, -97, -97, -97, -97, -97, -97, -97, - 1173, 22, 1173, 1173, 37, 30, 1173, -97, 1884, 1173, - 1173, -97, 128, -97, -53, -97, -97, -12, -97, 287, - 7, -50, -97, 264, -97, 68, 2256, -97, -97, -97, - -97, -97, 230, -97, -97, 67, -97, -97, -97, -97, - -97, -97, 2256, -97, -97, 449, -97, 462, 127, 2163, - 62, 276, 77, 58, 2442, 72, 1173, -97, 73, 47, - 1173, 52, -97, 50, 76, -97, -97, 273, -97, -97, - -97, -97, -97, -97, 105, -97, -97, -97, -97, 109, - -97, -97, -97, -97, -97, -97, 38, 45, 1173, 95, - 79, -97, -97, 1259, -97, 66, 24, -8, -97, 289, - 61, 32, 577, 74, 146, 398, 334, 258, 1173, 332, - 1173, 1173, 1173, 1173, 490, 1173, 1173, 1173, 1173, 1173, - 334, 334, 334, 334, 210, 490, 490, 391, 1173, -8, - 1173, 91, 1173, -97, 540, 1173, -97, 1173, 87, 64, - 1173, 54, 2163, -97, 1173, 151, 2163, -97, 1173, 69, - 1173, 1173, 180, 84, 1173, -97, 80, 99, 71, -97, - -97, 1173, -97, 290, 1173, -97, 78, 1173, 44, 2163, - -97, 1173, 101, 2163, -97, -22, 246, -48, -24, 2256, - -34, -97, 2163, -97, 1173, 113, 2163, 6, 2163, -97, - -7, -6, -49, -97, -97, 2163, -51, 470, 12, 400, - 133, 1173, 2163, 48, 17, 375, 42, 15, 701, 49, - 56, -97, 1349, -97, 55, 21, 53, 1173, 41, 14, - 1173, 25, 1173, -2, -3, 1173, -97, 2070, 36, -97, - -97, -97, -97, -97, -97, 1173, -97, -97, -97, -97, - 270, -97, 1173, -25, -97, 2163, -97, 88, -97, -97, - 2163, -97, 1173, 108, -28, -97, 85, -97, 85, 110, - 1173, -97, 85, 4, -97, -39, -97, 2163, -97, 111, - 2163, -97, 189, -97, -97, 93, 2163, 20, -97, 0, - -5, -97, 316, -29, 26, -97, -97, -97, -97, 1173, - 130, 2163, -97, 1173, 149, 2163, -97, 3, -97, 197, - -97, -97, 1173, -97, -97, 281, -97, -97, -97, 102, - 1613, -97, -97, 1702, -97, -97, 1791, -97, -97, -97, - -97, -97, -97, 115, -97, -97, -97, -97, -97, -97, - -97, -97, -97, 828, -97, 341, -16, 743, -97, -97, - 176, 743, 262, 340, -97, 145, -97, 116, -97, -97, - 298, -97, -97, 118, -97, -97, -97, 122, -97, 31, - -97, 1087, -97, -97, 34, 140, -97, 40, 39, -97, - -97, 1000, 121, -97, 185, -97, -97, -97, 29, 191, - -97, 1173, -97, 200, -97, -97, -10, 82, 198, 63, - 60, 83, -97, -97, 155, -97, 1173, -97, 193, -97, - -97, 194, 46, 70, 1173, 195, -97, -97, 157, -97, - 147, -97, 65, 28, 323, 192, 331, -97, 125, -97, - -97, -97, -97, -97, 1524, -97, -97, -97, -97, 416, - 2349, 1438, 75, 436, 89, 427, 86, 1173, 2163, 59, - -23, 351, 11, -11, 820, 16, -4, -97, 1349, -97, - 19, 18, 43, 1173, 23, 5, 1173, 35, 1173, 10, - 9, 416, 97, -97, 611, -97, -97, -97, -97, + 251, 1237, 2238, 974, -45, 51, 122, -98, 52, -11, + -39, 182, -98, 389, 36, -98, -98, 628, 58, 75, + 246, 228, -98, -98, -98, 438, 309, 1237, -98, -98, + -98, 348, -98, 2050, 1772, 1237, 1237, 1237, -98, 800, + 1237, -98, -98, 1237, 1237, -98, -98, -98, -98, -98, + 1237, -98, 1237, 1237, -98, 1237, 1237, 97, 226, -98, + -98, 1237, 1237, 1237, -98, -98, -98, 200, 1237, 389, + 1237, 1237, 1237, 1237, 418, 1237, 1237, 1237, 1237, 1237, + 1237, 212, 1237, 1237, 1237, 144, 121, 71, 309, 309, + 164, 156, 179, 448, 428, 408, 1237, -51, 1237, 101, + 1956, 1237, 1237, -98, -98, -98, -98, -98, -98, -98, + -98, -98, -98, -98, -98, -98, -98, -98, -98, -98, + -98, -98, -98, -98, -98, -98, -98, -98, -98, -98, + -98, -98, -98, -98, -98, -98, -98, 236, 1237, -98, + -98, 31, 16, -98, 1237, -98, -98, 1237, -98, -98, + -98, -98, -98, -98, -98, -98, -98, -98, -98, -98, + -98, 1237, 2, 1237, 1237, 41, 35, 1237, -98, 1956, + 1237, 1237, -98, 102, -98, 6, -98, -98, 20, -98, + 299, 53, 14, -98, 321, -98, -22, 2332, -98, -98, + -98, -98, -98, 216, -98, -98, -28, -98, -98, -98, + -98, -98, -98, 2332, -98, -98, 469, -98, 533, 115, + 2238, -2, 335, -3, -36, 2520, 50, 1237, -98, 64, + 33, 1237, 21, -98, 5, -14, -98, -98, 306, -98, + -98, -98, -98, -98, -98, 74, -98, -98, -98, -98, + 117, -98, -98, -98, -98, -98, -98, -57, -18, 1237, + 140, 109, -98, -98, 1324, -98, 104, 67, 27, -98, + 330, 84, 29, 585, 80, 92, 464, 171, 295, 1237, + 314, 1237, 1237, 1237, 1237, 346, 1237, 1237, 1237, 1237, + 1237, 309, 309, 309, 309, 309, 386, 464, 464, 1237, + 27, 1237, 87, 1237, -98, 529, 1237, -98, 1237, 83, + 38, 1237, 48, 2238, -98, 1237, 143, 2238, -98, 1237, + 30, 1237, 1237, 81, 77, 1237, -98, 56, 126, 90, + -98, -98, 1237, -98, 290, 1237, -98, 42, 1237, 44, + 2238, -98, 1237, 133, 2238, -98, 22, 285, -37, -9, + 2332, -30, -98, 2238, -98, 1237, 141, 2238, 10, 2238, + -98, 26, 24, -24, -98, -98, 2238, 25, 453, 23, + 533, 106, 1237, 2238, 9, -29, 361, -4, -31, 800, + -6, 55, -98, 1415, -98, -1, -23, 8, 1237, 7, + -21, 1237, 1, 1237, -27, -19, 1237, -98, 2144, 28, + -98, -98, -98, -98, -98, -98, 1237, -98, -98, -98, + -98, 211, -98, 1237, 17, -98, 2238, -98, 98, -98, + -98, 2238, -98, 1237, 105, 37, -98, 63, -98, 62, + 99, 1237, -98, 60, 57, -98, 4, -98, 2238, -98, + 116, 2238, -98, 180, -98, -98, 112, 2238, 18, -98, + 11, 13, -98, 325, 3, 19, -98, -98, -98, -98, + 1237, 132, 2238, -98, 1237, 139, 2238, -98, 32, -98, + 174, -98, -98, 1237, -98, -98, 229, -98, -98, -98, + 108, 1682, -98, -98, 1862, -98, -98, 1505, -98, -98, + -98, -98, -98, -98, 125, -98, -98, -98, -98, -98, + -98, -98, -98, -98, 111, 46, 792, 184, 34, 85, + -98, -98, 136, -98, 185, -98, -98, -98, 65, 204, + -98, 1237, -98, 207, -98, -98, 193, 61, 43, 225, + 73, 88, 66, -98, -98, 214, -98, 1237, -98, 158, + -98, -98, 181, 91, 72, 1237, 172, -98, -98, 187, + -98, 157, -98, 47, -50, 274, 178, 250, -98, 113, + -98, -98, -98, 1592, 1062, -98, -98, -98, -98, -98, + 271, 2426, 1772, 15, 461, 146, 445, 76, 1237, 2238, + -5, 0, 370, 12, -15, 706, 89, 78, -98, 1415, + -98, 100, 59, 82, 1237, 86, 54, 1237, 79, 1237, + 45, 39, 279, 149, -98, 68, 617, -98, -98, -98, + -98, -98, 1150, -98, -98, -98, 886, -98, 240, -61, + 714, -98, -98, 129, 259, -98, 190, -98, 69, -98, + -98, 255, -98, -98, 94, -98, -98, -98, -98, -98, + -98, - -105, 11, 15, -105, -105, -105, -105, -105, -105, -105, - -105, -105, -105, -105, -105, -105, -54, -105, -105, -105, - -105, -105, -105, -105, -105, -105, 79, -105, -105, -105, - 12, -105, -105, 4, 26, 98, 161, -105, 186, 158, - -105, -105, 173, 169, -105, -105, -105, -105, -105, 131, - -105, 127, 124, -105, 122, 118, -105, -105, -105, -105, - 148, 143, 139, -105, -105, -105, -105, 65, -105, 138, - 134, 151, 146, -105, 130, 115, 123, 114, 167, 174, - -105, 164, 103, 162, -105, -105, -105, -105, -105, -105, - -105, -105, -105, -105, -105, 97, -105, 95, -105, 85, - -1, 5, -105, -105, -105, -105, -105, -105, -105, -105, + -105, 23, 25, 216, -105, -105, -105, -105, -105, -105, + -105, -105, -105, -105, -105, -105, -105, -44, -105, -105, + -105, -105, -105, -105, -105, -105, -105, 70, -105, -105, + -105, 28, -105, -105, 20, 39, 97, 163, -105, 178, + 159, -105, -105, 156, 164, -105, -105, -105, -105, -105, + 132, -105, 153, 135, -105, 139, 140, -105, -105, -105, + -105, 103, 92, 144, -105, -105, -105, -105, 125, -105, + 154, 162, 83, 84, -105, 88, 82, 81, 75, 66, + 122, -105, 116, 98, 104, -105, -105, -105, -105, -105, + -105, -105, -105, -105, -105, -105, 106, -105, 113, -105, + 86, 80, 52, -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, 50, -105, -105, - -105, -105, -105, 9, -105, -105, 35, -105, -105, -105, + -105, -105, -105, -105, -105, -105, -105, -105, 34, -105, + -105, -105, -105, -105, 38, -105, -105, 43, -105, -105, -105, -105, -105, -105, -105, -105, -105, -105, -105, -105, - 71, -105, 61, 48, -105, -105, 36, -105, 242, 53, - 68, -105, -105, -105, -105, -105, -105, -105, -105, -11, - -105, -105, -105, 47, -105, -105, 56, -105, -105, -105, + -105, 136, -105, 91, -29, -105, -105, 3, -105, 225, + 37, 71, -105, -105, -105, -105, -105, -105, -105, -105, + -3, -105, -105, -105, 18, -105, -105, 27, -105, -105, -105, -105, -105, -105, -105, -105, -105, -105, -105, -105, - -105, -105, 109, -105, -105, 39, -105, 37, -105, 42, - -105, 73, -105, -105, -105, -105, 72, -105, -105, -105, - 70, 60, -105, -105, -105, -105, -105, -6, -105, -105, + -105, -105, -105, 87, -105, -105, 62, -105, 56, -105, + 50, -105, 31, -105, -105, -105, -105, 59, -105, -105, + -105, 47, 69, -105, -105, -105, -105, -105, 67, -105, -105, -105, -105, -105, -105, -105, -105, -105, -105, -105, - -105, -105, -105, -105, -105, -105, -105, -105, 17, -105, - -105, -105, -105, 111, -105, -105, -105, -105, -105, -105, - -105, -105, -105, -105, -105, -105, -105, 10, 214, -105, - 224, 194, 210, 204, -105, 96, 83, 89, 82, 62, - -105, -105, -105, -105, -105, -105, -105, -105, 182, -105, - 216, -105, 184, -105, -105, 251, -105, 141, -105, -105, - 125, -105, 23, -105, 6, -105, 93, -105, 192, -105, - 176, 191, -105, -105, 180, -105, -105, -105, -105, -105, - -105, 198, -105, 147, 88, -105, -105, 113, -105, 80, - -105, 75, -105, 74, -105, -105, 77, -105, -105, 86, - -105, -105, 78, -105, 81, -105, 30, -105, 46, -105, - -105, -105, -105, -105, -105, 52, -105, 33, -105, 28, - -105, 153, 34, -105, -105, 43, -105, -105, 116, -105, - -105, -105, 59, -105, -105, -105, -105, 69, -105, 45, - 104, -105, 90, -105, -105, 38, -105, 40, -105, -105, - -105, -105, -105, -105, -105, 44, -105, -105, -105, -105, - -105, -105, 84, -105, -105, 55, -105, -105, -105, -105, - 58, -105, 63, -105, -105, -105, -105, -105, -24, -105, - 64, -105, -28, -105, -105, -105, -105, -14, -105, -105, - -18, -105, -105, -105, -105, -105, -105, -57, -105, -105, - 31, -105, 29, -105, 27, -105, -105, -105, -105, 32, - -105, 41, -105, 49, -105, 51, -105, -105, -105, -105, - -105, -105, 14, -105, -105, 106, -105, -105, -105, -105, - 54, -105, -105, 67, -105, -105, 57, -105, -105, -105, + -105, -105, -105, -105, -105, -105, -105, -105, -105, 30, + -105, -105, -105, -105, 96, -105, -105, -105, -105, -105, + -105, -105, -105, -105, -105, -105, -105, -105, 10, 184, + -105, 222, 226, 232, 202, -105, 124, 114, 112, 110, + 95, -105, -105, -105, -105, -105, -105, -105, -105, 212, + -105, 192, -105, 177, -105, -105, 208, -105, 107, -105, + -105, 255, -105, 11, -105, 13, -105, 44, -105, 206, + -105, 169, 176, -105, -105, 183, -105, -105, -105, -105, + -105, -105, 173, -105, 167, 117, -105, -105, 191, -105, + 54, -105, 55, -105, 58, -105, -105, 102, -105, -105, + 89, -105, -105, 57, -105, 46, -105, 45, -105, 49, + -105, -105, -105, -105, -105, -105, 77, -105, 64, -105, + 51, -105, 109, 61, -105, -105, 48, -105, -105, 152, + -105, -105, -105, 79, -105, -105, -105, -105, 4, -105, + -16, 153, -105, 74, -105, -105, -11, -105, 0, -105, + -105, -105, -105, -105, -105, -105, -5, -105, -105, -105, + -105, -105, -105, 68, -105, -105, 41, -105, -105, -105, + -105, 90, -105, -1, -105, -105, -105, -105, -105, -93, + -105, 32, -105, -4, -105, -105, -105, -105, -22, -105, + -105, -14, -105, -105, -105, -105, -105, -105, -26, -105, + -105, -2, -105, 60, -105, 53, -105, -105, -105, -105, + 65, -105, 76, -105, 78, -105, 72, -105, -105, -105, + -105, -105, -105, 21, -105, -105, 85, -105, -105, -105, + -105, 22, -105, -105, 180, -105, -105, 33, -105, -105, -105, -105, -105, -105, -105, -105, -105, -105, -105, -105, - -105, -105, -105, 76, -105, -105, -3, 188, -105, -105, - -105, -10, -105, -9, -105, -105, -105, -105, -105, -105, - 22, -105, -105, -105, -105, -105, -105, -105, -105, -105, - -105, 346, -105, -105, -105, -105, -105, -105, -105, -105, - -105, 257, -105, -105, -19, -105, -105, -105, -105, -105, - -105, 24, -105, -105, -105, -105, -105, -105, 3, -105, - -105, -105, -105, -105, -105, -105, 20, -105, -105, -105, - -105, -5, -105, -105, 25, -105, -105, -105, -105, -105, - -16, -105, -105, -105, 19, 7, 21, -105, -105, -105, - -105, -105, -105, -105, 269, -105, -105, -105, -105, -105, - -105, 237, -2, 0, -105, 1, -105, 66, 8, -105, - -105, -4, -105, -105, 102, -105, -105, -105, 13, -105, - -105, -105, -105, 16, -105, 2, 108, -105, 91, -105, - -105, -105, -105, -105, 92, -105, -105, -105, -105}; + -105, -105, -105, -105, -105, -105, 73, -105, -105, -105, + -105, -105, -105, -105, 63, -105, -105, -105, -105, -105, + -105, 12, -105, -105, -105, -105, -105, -105, -105, -12, + -105, -105, -105, -105, -105, -105, -105, 6, -105, -105, + -105, -105, -15, -105, -105, 9, -105, -105, -105, -105, + -105, -9, -105, -105, -105, -7, -18, -13, -105, -105, + -105, -105, -105, 277, 266, -105, -105, -105, -105, -105, + -105, -105, 269, 2, 26, -105, 24, -105, 170, 16, + -105, -105, 19, -105, -105, 182, -105, -105, -105, 35, + -105, -105, -105, -105, 42, -105, 29, 153, -105, 128, + -105, -105, -105, -105, -105, -105, 349, -105, -105, -105, + -105, -105, 274, -105, -105, -105, 14, -105, -105, 15, + 218, -105, -105, -105, 7, -105, -105, -105, -105, -105, + -105, 17, -105, -105, -105, -105, -105, -105, -105, -105, + -105}; const int QmlJSGrammar::action_info [] = { - 385, 493, 387, -95, 399, 416, 397, 175, 628, 339, - 185, 427, 338, 253, 336, 183, 426, 145, -91, -124, - 462, 341, 348, -113, 179, 344, -94, 548, 436, 160, - -118, 444, -121, 453, 449, 404, 442, 166, 436, 160, - 440, 137, -121, 395, 97, 453, 449, 436, -118, -91, - -116, 344, 67, 253, 412, -105, -113, 412, 539, 436, - -116, 95, -94, -95, 521, 143, -105, 268, 568, 292, - 95, 290, 288, 575, 493, 563, 308, 564, 97, 405, - 410, 248, 67, 412, 342, 436, 449, 550, 578, 551, - 420, 314, 268, 297, 344, 137, -124, 321, 253, 439, - 534, 186, 331, 137, 329, 624, 561, 323, 521, 137, - 473, 554, 453, 440, 302, 247, 137, 288, 430, 137, - 423, 137, 232, 137, 0, 300, 0, 0, 584, 0, - 0, 0, 58, 0, 0, 0, 137, 168, 137, 327, - 252, 251, 162, 59, 553, 552, 163, 245, 244, 409, - 408, 137, 54, 625, 521, 250, 169, 137, 474, 137, - 324, 333, 556, 55, 0, 424, 238, 237, 414, 546, - 243, 242, 54, 346, 54, 484, 535, 509, 508, 515, - 514, 54, 308, 55, 173, 55, 580, 579, 245, 244, - 451, 168, 55, 570, 245, 244, 310, 137, 541, 138, - 311, 137, 0, 137, 0, 465, 512, 511, 137, 455, - 169, 306, 0, 0, 535, 537, 557, 555, 571, 569, - 168, 535, 537, 535, 0, 0, 536, 535, 3, 2, - 1, 0, 81, 536, 82, 81, 510, 82, 137, 169, - 0, 170, 0, 0, 60, 83, 0, 0, 83, 60, - 434, 433, 542, 540, 560, 559, 567, 566, 466, 464, - 537, 545, 544, 81, 60, 82, 81, 537, 82, 537, - 81, 536, 82, 537, 0, 31, 83, 168, 536, 83, - 536, 0, 99, 83, 536, 168, 81, 31, 82, 61, - 0, 231, 230, 31, 61, 62, 169, 0, 402, 83, - 62, 100, 31, 101, 169, 31, 402, 270, 271, 61, - 31, 0, 44, 46, 45, 62, 31, 0, 0, 31, - 0, 0, 0, 0, 44, 46, 45, 31, 0, 0, - 44, 46, 45, 0, 272, 273, 31, 0, 0, 44, - 46, 45, 44, 46, 45, 31, 0, 44, 46, 45, - 270, 271, 31, 44, 46, 45, 44, 46, 45, 81, - 31, 82, 0, 0, 44, 46, 45, 69, 70, 31, - 0, 0, 83, 44, 46, 45, 0, 272, 273, 0, - 31, 0, 44, 46, 45, 69, 70, -335, 505, 44, - 46, 45, 0, 0, 71, 72, 0, 44, 46, 45, - 0, 0, 506, 504, 31, 0, 44, 46, 45, 0, - 0, -335, 71, 72, 275, 276, 0, 44, 46, 45, - 0, 275, 276, 277, 0, 0, 278, 0, 279, 31, - 277, 168, 503, 278, 0, 279, 0, 0, 0, 0, - 0, 44, 46, 45, 0, 74, 75, 0, 0, -82, - 169, 0, 170, 76, 77, 0, 31, 78, 0, 79, - 0, 241, 240, 74, 75, 31, 44, 46, 45, 0, - 0, 76, 77, 74, 75, 78, 0, 79, 31, 0, - 0, 76, 77, 0, 0, 78, 0, 79, 241, 240, - 0, 31, 0, 44, 46, 45, 0, 236, 235, 31, - 0, 0, 44, 46, 45, 0, 0, 0, 0, 0, - 236, 235, 0, 275, 276, 44, 46, 45, 0, 0, - 0, 0, 277, 241, 240, 278, 0, 279, 44, 46, - 45, 236, 235, 0, 0, 0, 44, 46, 45, 0, - 0, 0, 0, 147, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 148, 0, 0, 0, 149, 0, 0, - 0, 0, 0, 0, 0, 0, 150, 0, 151, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 152, - 147, 153, 58, 0, 0, 0, 0, 74, 75, 154, - 148, 0, 155, 59, 149, 76, 77, 0, 156, 78, - 0, 79, 0, 150, 157, 151, 0, 0, 304, 0, - 0, 0, 0, 0, 0, 0, 152, 0, 153, 58, - 158, 0, 0, 27, 28, 0, 154, 0, 0, 155, - 59, 0, 0, 30, 0, 156, 0, 0, 0, 0, - 31, 157, 0, 0, 32, 33, 0, 34, 0, 0, - 0, 0, 0, 0, 501, 0, 0, 158, 41, 0, - 0, 147, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 148, 0, 0, 0, 149, 47, 44, 46, 45, - 0, 48, 0, 0, 150, 0, 151, 0, 0, 0, - 0, 0, 40, 50, 29, 0, 0, 152, 37, 153, - 58, 0, 0, 0, 0, 0, 0, 154, 0, 0, - 155, 59, 0, 27, 28, 0, 156, 0, 0, 0, - 0, 0, 157, 30, 0, 0, 0, 0, 0, 0, - 31, 0, 0, 0, 32, 33, 0, 34, 158, 0, - 0, 0, 0, 0, 38, 0, 0, 0, 41, 0, - 0, 0, 0, 0, 0, 27, 28, 0, 0, 0, - 0, 0, 0, 0, 0, 30, 47, 44, 46, 45, - 0, 48, 31, 0, 0, 0, 32, 33, 0, 34, - 0, 0, 40, 50, 29, 0, 501, 0, 37, 0, - 41, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 47, 44, - 46, 45, 0, 48, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 40, 50, 29, 0, 0, 0, - 37, 0, 27, 28, 0, 0, 0, 0, 0, 0, - 27, 28, 30, 0, 0, 0, 0, 0, 0, 31, - 30, 0, 0, 32, 33, 0, 34, 31, 0, 0, - 0, 32, 33, 38, 34, 0, 0, 41, 0, 0, - 0, 501, 0, 0, 0, 41, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 47, 44, 46, 45, 0, - 48, 0, 0, 47, 44, 46, 45, 0, 48, 0, - 0, 40, 50, 29, 0, 0, 0, 37, 0, 40, - 50, 29, 0, 0, 0, 37, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 27, 28, 0, 0, 0, - 0, 0, 0, 0, 0, 30, 0, 0, 0, 0, - 0, 0, 31, 0, 0, 0, 32, 33, 0, 34, - 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, - 41, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 47, 44, - 46, 45, 0, 48, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 40, 50, 29, 0, 0, 0, - 37, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 524, 0, 27, 28, 0, 0, 0, 0, 0, 0, - 0, 0, 211, 0, 0, 0, 0, 0, 0, 31, - 0, 0, 0, 32, 33, 0, 34, 0, 0, 0, - 0, 0, 0, 501, 0, 0, 0, 41, 0, 0, - 0, 0, 0, 0, 0, 582, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 47, 525, 528, 527, 0, - 48, 0, 0, 0, 0, 222, 0, 0, 0, 0, - 0, 40, 50, 29, 206, 0, 0, 37, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 524, 0, 27, - 28, 0, 0, 0, 0, 0, 0, 0, 0, 211, + 345, -114, -106, -92, 343, 345, -95, 254, -122, 450, + 549, 187, 437, 413, -119, -117, -106, 454, 249, -92, + 248, 345, 454, 339, 340, 342, 349, 233, 98, 606, + -125, 398, 388, 386, 254, 396, 254, 96, 441, 144, + 98, 450, 167, 161, 138, 606, 437, 443, 554, 463, + 96, 630, 437, 68, 437, 546, 180, 406, 337, 427, + 161, 184, -96, 445, 428, 421, 176, 421, 421, 413, + 417, 411, 525, 322, 186, 454, 146, 405, 289, 535, + 400, 450, 309, 309, 315, -96, -122, 437, 269, -117, + 298, 138, 293, -119, 509, 413, -114, 521, 519, 301, + 532, 554, 68, 328, 330, 269, 291, -95, 303, 424, + 138, 55, 504, 138, 539, 289, 474, 522, 440, 0, + 534, 332, 56, 431, 138, 163, 169, 524, 523, 164, + 620, 619, 441, 138, 324, 239, 238, 246, 245, 59, + 138, 138, 311, 553, 169, 170, 312, 138, 138, 138, + 60, 138, 0, -125, 425, 626, 625, 596, 174, 410, + 409, 55, 55, 170, 475, 415, 138, 246, 245, 554, + 253, 252, 56, 56, 551, 550, 246, 245, 244, 243, + 138, 82, 466, 83, 55, 485, 505, 325, 138, 82, + 0, 83, 452, 334, 84, 56, 82, 100, 83, 456, + 251, 347, 84, 307, 82, 597, 83, 505, 169, 84, + 505, 511, 61, 517, 505, 138, 101, 84, 102, 531, + 530, 527, 0, 541, 138, 0, 169, 170, 0, 403, + 0, 0, 507, 538, 537, 467, 465, 82, 61, 83, + 61, 435, 434, 506, 138, 170, 0, 403, 542, 540, + 84, 623, 622, 507, 505, 0, 507, 62, 32, 507, + 507, 169, 0, 63, 506, 512, 510, 506, 515, 514, + 506, 506, 0, 0, 0, 528, 526, 232, 231, 32, + 170, 621, 171, 62, 32, 62, 169, 616, 32, 63, + 0, 63, 139, 0, 169, 45, 47, 46, 0, 0, + 507, 617, 615, 32, -83, 170, 0, 171, 0, 0, + 0, 506, -83, 170, 32, 171, 45, 47, 46, 32, + 0, 45, 47, 46, 32, 45, 47, 46, 32, 0, + 0, 614, 271, 272, 82, 32, 83, 0, 0, 0, + 45, 47, 46, 4, 3, 2, 1, 84, 271, 272, + 32, 45, 47, 46, 32, 0, 45, 47, 46, 273, + 274, 45, 47, 46, 32, 45, 47, 46, 0, 276, + 277, 0, 45, 47, 46, 273, 274, 32, 278, 0, + 0, 279, 0, 280, 0, 0, 0, 45, 47, 46, + 32, 45, 47, 46, 0, 0, 0, -336, 0, 32, + 0, 45, 47, 46, 0, 0, -336, 70, 71, 276, + 277, 0, 0, 0, 45, 47, 46, 0, 278, 0, + 0, 279, 0, 280, 0, 0, 0, 45, 47, 46, + 0, 75, 76, 0, 72, 73, 45, 47, 46, 77, + 78, 75, 76, 79, 0, 80, 0, 0, 0, 77, + 78, 75, 76, 79, 0, 80, 0, 0, 0, 77, + 78, 75, 76, 79, 0, 80, 0, 0, 0, 77, + 78, 75, 76, 79, 32, 80, 0, 0, 0, 77, + 78, 0, 32, 79, 0, 80, 0, 276, 277, 0, + 32, 0, 0, 0, 0, 0, 278, 0, 32, 279, + 0, 280, 0, 0, 0, 0, 242, 241, 0, 0, + 0, 45, 47, 46, 237, 236, 0, 0, 0, 45, + 47, 46, 237, 236, 0, 0, 0, 45, 47, 46, + 237, 236, 148, 0, 0, 45, 47, 46, 0, 0, + 0, 0, 149, 0, 0, 0, 150, 0, 0, 0, + 0, 0, 0, 0, 0, 151, 0, 152, 0, 0, + 0, 0, 32, 0, 0, 0, 0, 0, 153, 0, + 154, 59, 0, 0, 0, 0, 0, 0, 155, 0, + 0, 156, 60, 0, 0, 0, 0, 157, 148, 0, + 0, 0, 0, 158, 242, 241, 0, 0, 149, 45, + 47, 46, 150, 0, 0, 0, 0, 0, 0, 159, + 0, 151, 0, 152, 0, 0, 305, 0, 0, 0, + 0, 0, 0, 0, 153, 0, 154, 59, 0, 28, + 29, 148, 0, 0, 155, 0, 0, 156, 60, 31, + 0, 149, 0, 157, 0, 150, 32, 0, 0, 158, + 33, 34, 0, 35, 151, 0, 152, 0, 0, 0, + 496, 0, 0, 0, 42, 159, 0, 153, 0, 154, + 59, 0, 0, 0, 0, 0, 0, 155, 0, 0, + 156, 60, 48, 45, 47, 46, 157, 49, 0, 0, + 0, 0, 158, 0, 0, 0, 0, 0, 41, 51, + 30, 0, 0, 0, 38, 0, 0, 0, 159, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 28, 29, + 0, 0, 0, 0, 0, 0, 28, 29, 31, 0, + 0, 0, 0, 0, 0, 32, 31, 0, 0, 33, + 34, 0, 35, 32, 0, 0, 0, 33, 34, 39, + 35, 0, 0, 42, 0, 0, 0, 496, 0, 0, + 0, 42, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 48, 45, 47, 46, 0, 49, 0, 0, 48, + 45, 47, 46, 0, 49, 0, 0, 41, 51, 30, + 0, 0, 0, 38, 0, 41, 51, 30, 0, 0, + 0, 38, 0, 0, 28, 29, 0, 0, 0, 0, + 0, 0, 28, 29, 31, 0, 0, 0, 0, 0, + 0, 32, 31, 0, 0, 33, 34, 0, 35, 32, + 0, 0, 0, 33, 34, 496, 35, 0, 0, 42, + 0, 0, 0, 39, 0, 0, 0, 42, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 48, 45, 47, + 46, 0, 49, 0, 0, 48, 45, 47, 46, 0, + 49, 0, 0, 41, 51, 30, 0, 0, 0, 38, + 0, 41, 51, 30, 0, 0, 0, 38, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 28, 29, + 0, 0, 0, 0, 0, 0, 0, 0, 31, 0, + 0, 0, 0, 0, 0, 32, 0, 0, 0, 33, + 34, 0, 35, 0, 0, 0, 0, 0, 0, 496, + 0, 0, 0, 42, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 48, 45, 47, 46, 0, 49, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 41, 51, 30, + 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 495, 0, 28, 29, 0, 0, + 0, 0, 0, 0, 0, 0, 212, 0, 0, 0, + 0, 0, 0, 32, 0, 0, 0, 33, 34, 0, + 35, 0, 0, 0, 0, 0, 0, 496, 0, 0, + 0, 42, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, + 497, 499, 498, 0, 49, 0, 0, 0, 0, 223, + 0, 0, 0, 0, 0, 41, 51, 30, 207, 0, + 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 495, 0, 28, 29, 0, 0, 0, 0, + 0, 0, 0, 0, 212, 0, 0, 0, 0, 0, + 0, 32, 0, 0, 0, 33, 34, 0, 35, 0, + 0, 0, 0, 0, 0, 496, 0, 0, 0, 42, + 0, 0, 0, 0, 0, 0, 0, 600, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 48, 497, 499, + 498, 0, 49, 0, 0, 0, 0, 223, 0, 0, + 0, 0, 0, 41, 51, 30, 207, 0, 0, 38, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 495, 0, 28, 29, 0, 0, 0, 0, 0, 0, + 0, 0, 212, 0, 0, 0, 0, 0, 0, 32, + 0, 0, 0, 33, 34, 0, 35, 0, 0, 0, + 0, 0, 0, 496, 0, 0, 0, 42, 0, 0, + 0, 0, 0, 0, 0, 603, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 48, 497, 499, 498, 0, + 49, 0, 0, 0, 0, 223, 0, 0, 0, 0, + 0, 41, 51, 30, 207, 0, 0, 38, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 27, 28, + 29, 0, 0, 0, 0, 0, 0, 0, 0, 31, + 0, 0, 0, 0, 0, 0, 32, 0, 0, 0, + 33, 34, 0, 35, 0, 0, 0, 36, 0, 37, + 39, 40, 0, 0, 42, 0, 0, 0, 43, 0, + 44, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 48, 45, 47, 46, 0, 49, 0, 50, + 0, 52, 0, 53, 0, 0, 0, 0, 41, 51, + 30, 0, 0, 0, 38, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 27, 28, 29, 0, 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, - 32, 33, 0, 34, 0, 0, 0, 0, 0, 0, - 501, 0, 0, 0, 41, 0, 0, 0, 0, 0, - 0, 0, 526, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 47, 525, 528, 527, 0, 48, 0, 0, - 0, 0, 222, 0, 0, 0, 0, 0, 40, 50, - 29, 206, 0, 0, 37, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 26, 27, 28, 0, 0, 0, - 0, 0, 0, 0, 0, 30, 0, 0, 0, 0, - 0, 0, 31, 0, 0, 0, 32, 33, 0, 34, - 0, 0, 0, 35, 0, 36, 38, 39, 0, 0, - 41, 0, 0, 0, 42, 0, 43, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 47, 44, - 46, 45, 0, 48, 0, 49, 0, 51, 0, 52, - 0, 0, 0, 0, 40, 50, 29, 0, 0, 0, - 37, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 26, 27, 28, 0, 0, 0, 0, 0, 0, 0, - 0, 30, 0, 0, 0, 0, 0, 0, 31, 0, - 0, 0, 32, 33, 0, 34, 0, 0, 0, 35, - 0, 36, 38, 39, 0, 0, 41, 0, 0, 0, - 42, 0, 43, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 47, 44, 46, 45, 0, 48, - 0, 49, 0, 51, 267, 52, 0, 0, 0, 0, - 40, 50, 29, 0, 0, 0, 37, 0, 0, 0, - 0, 0, 0, 0, 0, 0, -114, 0, 0, 0, - 26, 27, 28, 0, 0, 0, 0, 0, 0, 0, - 0, 30, 0, 0, 0, 0, 0, 0, 31, 0, - 0, 0, 32, 33, 0, 34, 0, 0, 0, 35, - 0, 36, 38, 39, 0, 0, 41, 0, 0, 0, - 42, 0, 43, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 47, 44, 46, 45, 0, 48, - 0, 49, 0, 51, 0, 52, 0, 0, 0, 0, - 40, 50, 29, 0, 0, 0, 37, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 471, 0, 0, 26, - 27, 28, 0, 0, 0, 0, 0, 0, 0, 0, - 30, 0, 0, 0, 0, 0, 0, 31, 0, 0, - 0, 32, 33, 0, 34, 0, 0, 0, 35, 0, - 36, 38, 39, 0, 0, 41, 0, 0, 0, 42, - 0, 43, 0, 0, 472, 0, 0, 0, 0, 0, - 0, 0, 0, 47, 44, 46, 45, 0, 48, 0, - 49, 0, 51, 0, 52, 0, 0, 0, 0, 40, - 50, 29, 0, 0, 0, 37, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 26, 27, 28, 0, 0, - 0, 0, 0, 0, 0, 0, 30, 0, 0, 0, - 0, 0, 0, 31, 213, 0, 0, 590, 591, 0, - 34, 0, 0, 0, 35, 0, 36, 38, 39, 0, - 0, 41, 0, 0, 0, 42, 0, 43, 0, 0, - 0, 0, 0, 0, 0, 217, 0, 0, 0, 47, - 44, 46, 45, 0, 48, 0, 49, 0, 51, 0, - 52, 0, 0, 0, 0, 40, 50, 29, 0, 0, - 0, 37, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 479, 0, 0, 26, 27, 28, 0, 0, 0, - 0, 0, 0, 0, 0, 30, 0, 0, 0, 0, - 0, 0, 31, 0, 0, 0, 32, 33, 0, 34, - 0, 0, 0, 35, 0, 36, 38, 39, 0, 0, - 41, 0, 0, 0, 42, 0, 43, 0, 0, 482, - 0, 0, 0, 0, 0, 0, 0, 0, 47, 44, - 46, 45, 0, 48, 0, 49, 0, 51, 0, 52, - 0, 0, 0, 0, 40, 50, 29, 0, 0, 0, - 37, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 471, 0, 0, 26, 27, 28, 0, 0, 0, 0, - 0, 0, 0, 0, 30, 0, 0, 0, 0, 0, - 0, 31, 0, 0, 0, 32, 33, 0, 34, 0, - 0, 0, 35, 0, 36, 38, 39, 0, 0, 41, - 0, 0, 0, 42, 0, 43, 0, 0, 477, 0, - 0, 0, 0, 0, 0, 0, 0, 47, 44, 46, - 45, 0, 48, 0, 49, 0, 51, 0, 52, 0, - 0, 0, 0, 40, 50, 29, 0, 0, 0, 37, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 479, - 0, 0, 26, 27, 28, 0, 0, 0, 0, 0, - 0, 0, 0, 30, 0, 0, 0, 0, 0, 0, - 31, 0, 0, 0, 32, 33, 0, 34, 0, 0, - 0, 35, 0, 36, 38, 39, 0, 0, 41, 0, - 0, 0, 42, 0, 43, 0, 0, 480, 0, 0, - 0, 0, 0, 0, 0, 0, 47, 44, 46, 45, - 0, 48, 0, 49, 0, 51, 0, 52, 0, 0, - 0, 0, 40, 50, 29, 0, 0, 0, 37, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 105, 106, - 107, 0, 0, 109, 111, 112, 0, 0, 113, 0, - 114, 0, 0, 0, 116, 117, 118, 0, 0, 0, - 0, 0, 0, 31, 119, 120, 121, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 122, 0, 0, + 0, 0, 0, 32, 0, 0, 0, 33, 34, 0, + 35, 0, 0, 0, 36, 0, 37, 39, 40, 0, + 0, 42, 0, 0, 0, 43, 0, 44, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, + 45, 47, 46, 0, 49, 0, 50, 0, 52, 268, + 53, 0, 0, 0, 0, 41, 51, 30, 0, 0, + 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, -115, 0, 0, 0, 27, 28, 29, 0, + 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, + 0, 0, 0, 0, 32, 0, 0, 0, 33, 34, + 0, 35, 0, 0, 0, 36, 0, 37, 39, 40, + 0, 0, 42, 0, 0, 0, 43, 0, 44, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 48, 45, 47, 46, 0, 49, 0, 50, 0, 52, + 0, 53, 0, 0, 0, 0, 41, 51, 30, 0, + 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 480, 0, 0, 27, 28, 29, 0, + 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, + 0, 0, 0, 0, 32, 0, 0, 0, 33, 34, + 0, 35, 0, 0, 0, 36, 0, 37, 39, 40, + 0, 0, 42, 0, 0, 0, 43, 0, 44, 0, + 0, 481, 0, 0, 0, 0, 0, 0, 0, 0, + 48, 45, 47, 46, 0, 49, 0, 50, 0, 52, + 0, 53, 0, 0, 0, 0, 41, 51, 30, 0, + 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 27, 28, 29, 0, 0, 0, 0, + 0, 0, 0, 0, 31, 0, 0, 0, 0, 0, + 0, 32, 214, 0, 0, 561, 562, 0, 35, 0, + 0, 0, 36, 0, 37, 39, 40, 0, 0, 42, + 0, 0, 0, 43, 0, 44, 0, 0, 0, 0, + 0, 0, 0, 218, 0, 0, 0, 48, 45, 47, + 46, 0, 49, 0, 50, 0, 52, 0, 53, 0, + 0, 0, 0, 41, 51, 30, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 125, 0, 0, 0, 0, 0, 0, - 44, 46, 45, 126, 127, 128, 0, 130, 131, 132, - 133, 134, 135, 0, 0, 123, 129, 115, 108, 110, - 124, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 105, 106, 107, 0, 0, 109, 111, 112, 0, - 0, 113, 0, 114, 0, 0, 0, 116, 117, 118, - 0, 0, 0, 0, 0, 0, 389, 119, 120, 121, + 480, 0, 0, 27, 28, 29, 0, 0, 0, 0, + 0, 0, 0, 0, 31, 0, 0, 0, 0, 0, + 0, 32, 0, 0, 0, 33, 34, 0, 35, 0, + 0, 0, 36, 0, 37, 39, 40, 0, 0, 42, + 0, 0, 0, 43, 0, 44, 0, 0, 483, 0, + 0, 0, 0, 0, 0, 0, 0, 48, 45, 47, + 46, 0, 49, 0, 50, 0, 52, 0, 53, 0, + 0, 0, 0, 41, 51, 30, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 122, 0, 0, 0, 390, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 125, 0, 0, 0, - 0, 0, 394, 391, 393, 0, 126, 127, 128, 0, - 130, 131, 132, 133, 134, 135, 0, 0, 123, 129, - 115, 108, 110, 124, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 105, 106, 107, 0, 0, 109, - 111, 112, 0, 0, 113, 0, 114, 0, 0, 0, - 116, 117, 118, 0, 0, 0, 0, 0, 0, 389, - 119, 120, 121, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 122, 0, 0, 0, 390, 0, 0, - 0, 0, 0, 0, 0, 392, 0, 0, 0, 125, - 0, 0, 0, 0, 0, 394, 391, 393, 0, 126, - 127, 128, 0, 130, 131, 132, 133, 134, 135, 0, - 0, 123, 129, 115, 108, 110, 124, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 205, 0, 0, - 0, 0, 207, 0, 26, 27, 28, 209, 0, 0, - 0, 0, 0, 0, 210, 30, 0, 0, 0, 0, - 0, 0, 212, 213, 0, 0, 214, 33, 0, 34, - 0, 0, 0, 35, 0, 36, 38, 39, 0, 0, - 41, 0, 0, 0, 42, 0, 43, 0, 0, 0, - 0, 0, 216, 0, 217, 0, 0, 0, 47, 215, - 218, 45, 219, 48, 220, 49, 221, 51, 222, 52, - 223, 224, 0, 0, 40, 50, 29, 206, 208, 0, - 37, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 205, 0, 0, 0, 0, 207, 0, 26, 27, 28, - 209, 0, 0, 0, 0, 0, 0, 210, 211, 0, - 0, 0, 0, 0, 0, 212, 213, 0, 0, 214, - 33, 0, 34, 0, 0, 0, 35, 0, 36, 38, - 39, 0, 0, 41, 0, 0, 0, 42, 0, 43, - 0, 0, 0, 0, 0, 216, 0, 217, 0, 0, - 0, 47, 215, 218, 45, 219, 48, 220, 49, 221, - 51, 222, 52, 223, 224, 0, 0, 40, 50, 29, - 206, 208, 0, 37, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 593, 106, 107, 0, 0, 595, 111, - 597, 27, 28, 598, 0, 114, 0, 0, 0, 116, - 600, 601, 0, 0, 0, 0, 0, 0, 602, 603, - 120, 121, 214, 33, 0, 34, 0, 0, 0, 35, - 0, 36, 604, 39, 0, 0, 606, 0, 0, 0, - 42, 0, 43, 0, 0, 0, 0, 0, 608, 0, - 217, 0, 0, 0, 610, 607, 609, 45, 611, 612, - 613, 49, 615, 616, 617, 618, 619, 620, 0, 0, - 605, 614, 599, 594, 596, 124, 37, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 357, 106, 107, 0, - 0, 359, 111, 361, 27, 28, 362, 0, 114, 0, - 0, 0, 116, 364, 365, 0, 0, 0, 0, 0, - 0, 366, 367, 120, 121, 214, 33, 0, 34, 0, - 0, 0, 35, 0, 36, 368, 39, 0, 0, 370, - 0, 0, 0, 42, 0, 43, 0, -260, 0, 0, - 0, 372, 0, 217, 0, 0, 0, 374, 371, 373, - 45, 375, 376, 377, 49, 379, 380, 381, 382, 383, - 384, 0, 0, 369, 378, 363, 358, 360, 124, 37, - 0, 0, 0, 0, 0, 0, 0, 0, 0, + 472, 0, 0, 27, 28, 29, 0, 0, 0, 0, + 0, 0, 0, 0, 31, 0, 0, 0, 0, 0, + 0, 32, 0, 0, 0, 33, 34, 0, 35, 0, + 0, 0, 36, 0, 37, 39, 40, 0, 0, 42, + 0, 0, 0, 43, 0, 44, 0, 0, 473, 0, + 0, 0, 0, 0, 0, 0, 0, 48, 45, 47, + 46, 0, 49, 0, 50, 0, 52, 0, 53, 0, + 0, 0, 0, 41, 51, 30, 0, 0, 0, 38, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 472, 0, 0, 27, 28, 29, 0, 0, 0, 0, + 0, 0, 0, 0, 31, 0, 0, 0, 0, 0, + 0, 32, 0, 0, 0, 33, 34, 0, 35, 0, + 0, 0, 36, 0, 37, 39, 40, 0, 0, 42, + 0, 0, 0, 43, 0, 44, 0, 0, 478, 0, + 0, 0, 0, 0, 0, 0, 0, 48, 45, 47, + 46, 0, 49, 0, 50, 0, 52, 0, 53, 0, + 0, 0, 0, 41, 51, 30, 0, 0, 0, 38, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 106, 107, 108, 0, 0, 110, 112, 113, 0, 0, + 114, 0, 115, 0, 0, 0, 117, 118, 119, 0, + 0, 0, 0, 0, 0, 32, 120, 121, 122, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 123, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 126, 0, 0, 0, 0, + 0, 0, 45, 47, 46, 127, 128, 129, 0, 131, + 132, 133, 134, 135, 136, 0, 0, 124, 130, 116, + 109, 111, 125, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 106, 107, 108, 0, 0, 110, + 112, 113, 0, 0, 114, 0, 115, 0, 0, 0, + 117, 118, 119, 0, 0, 0, 0, 0, 0, 390, + 120, 121, 122, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 123, 0, 0, 0, 391, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 126, + 0, 0, 0, 0, 0, 395, 392, 394, 0, 127, + 128, 129, 0, 131, 132, 133, 134, 135, 136, 0, + 0, 124, 130, 116, 109, 111, 125, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 106, 107, + 108, 0, 0, 110, 112, 113, 0, 0, 114, 0, + 115, 0, 0, 0, 117, 118, 119, 0, 0, 0, + 0, 0, 0, 390, 120, 121, 122, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 123, 0, 0, + 0, 391, 0, 0, 0, 0, 0, 0, 0, 393, + 0, 0, 0, 126, 0, 0, 0, 0, 0, 395, + 392, 394, 0, 127, 128, 129, 0, 131, 132, 133, + 134, 135, 136, 0, 0, 124, 130, 116, 109, 111, + 125, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 206, 0, 0, 0, 0, 208, 0, 27, + 28, 29, 210, 0, 0, 0, 0, 0, 0, 211, + 31, 0, 0, 0, 0, 0, 0, 213, 214, 0, + 0, 215, 34, 0, 35, 0, 0, 0, 36, 0, + 37, 39, 40, 0, 0, 42, 0, 0, 0, 43, + 0, 44, 0, 0, 0, 0, 0, 217, 0, 218, + 0, 0, 0, 48, 216, 219, 46, 220, 49, 221, + 50, 222, 52, 223, 53, 224, 225, 0, 0, 41, + 51, 30, 207, 209, 0, 38, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 206, 0, 0, 0, + 0, 208, 0, 27, 28, 29, 210, 0, 0, 0, + 0, 0, 0, 211, 212, 0, 0, 0, 0, 0, + 0, 213, 214, 0, 0, 215, 34, 0, 35, 0, + 0, 0, 36, 0, 37, 39, 40, 0, 0, 42, + 0, 0, 0, 43, 0, 44, 0, 0, 0, 0, + 0, 217, 0, 218, 0, 0, 0, 48, 216, 219, + 46, 220, 49, 221, 50, 222, 52, 223, 53, 224, + 225, 0, 0, 41, 51, 30, 207, 209, 0, 38, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 564, 107, 108, 0, 0, 566, 112, 568, 28, 29, + 569, 0, 115, 0, 0, 0, 117, 571, 572, 0, + 0, 0, 0, 0, 0, 573, 574, 121, 122, 215, + 34, 0, 35, 0, 0, 0, 36, 0, 37, 575, + 40, 0, 0, 577, 0, 0, 0, 43, 0, 44, + 0, 0, 0, 0, 0, 579, 0, 218, 0, 0, + 0, 581, 578, 580, 46, 582, 583, 584, 50, 586, + 587, 588, 589, 590, 591, 0, 0, 576, 585, 570, + 565, 567, 125, 38, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 358, 107, 108, 0, 0, 360, + 112, 362, 28, 29, 363, 0, 115, 0, 0, 0, + 117, 365, 366, 0, 0, 0, 0, 0, 0, 367, + 368, 121, 122, 215, 34, 0, 35, 0, 0, 0, + 36, 0, 37, 369, 40, 0, 0, 371, 0, 0, + 0, 43, 0, 44, 0, -261, 0, 0, 0, 373, + 0, 218, 0, 0, 0, 375, 372, 374, 46, 376, + 377, 378, 50, 380, 381, 382, 383, 384, 385, 0, + 0, 370, 379, 364, 359, 361, 125, 38, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, - 502, 182, 136, 507, 538, 516, 457, 574, 178, 305, - 246, 146, 234, 239, 13, 627, 298, 491, 562, 432, - 249, 435, 316, 558, 178, 303, 549, 543, 565, 483, - 576, 581, 347, 577, 513, 450, 246, 468, 142, 441, - 239, 443, 144, 452, 246, 234, 445, 463, 349, 239, - 446, 234, 454, 456, 398, 178, 172, 406, 203, 184, - 411, 431, 298, 425, 435, 428, 413, 429, 159, 167, - 421, 386, 432, 432, 388, 298, 334, 396, 332, 435, - 343, 165, 330, 139, 345, 335, 500, 481, 203, 182, - 478, 298, 0, 0, 0, 307, 476, 102, 0, 0, - 475, 142, 517, 56, 56, 626, 174, 56, 56, 284, - 176, 203, 400, 56, 0, 68, 298, 142, 457, 164, - 104, 56, 403, 176, 56, 56, 400, 161, 298, 283, - 281, 56, 56, 56, 448, 448, 282, 56, 56, 56, - 56, 401, 485, 280, 298, 56, 56, 98, 447, 85, - 56, 96, 447, 262, 326, 401, 56, 56, 266, 316, - 56, 89, 87, 66, 56, 56, 56, 57, 448, 56, - 88, 447, 56, 56, 337, 490, 56, 80, 0, 328, - 56, 56, 92, 65, 340, 56, 73, 64, 56, 467, - 56, 301, 63, 56, 94, 56, 400, 176, 517, 93, - 56, 518, 487, 56, 56, 486, 56, 299, 86, 56, - 84, 56, 233, 489, 90, 56, 56, 488, 56, 0, - 0, 91, 294, 266, 56, 401, 294, 266, 0, 266, - 0, 266, 325, 294, 56, 312, 56, 289, 266, 266, - 294, 266, 0, 285, 315, 266, 56, 621, 293, 309, - 623, 266, 56, 287, 102, 313, 56, 266, 56, 286, - 0, 266, 322, 266, 0, 269, 56, 517, 0, 291, - 468, 266, 583, 274, 0, 532, 0, 104, 171, 589, - 0, 0, 0, 523, 533, 0, 0, 592, 585, 586, - 587, 588, 0, 294, 0, 0, 0, 0, 266, 0, + 548, 422, 414, 436, 166, 547, 552, 433, 533, 529, + 183, 520, 536, 304, 545, 513, 306, 447, 247, 599, + 618, 147, 387, 317, 627, 613, 14, 492, 397, 204, + 624, 185, 179, 250, 389, 430, 168, 240, 299, 235, + 173, 179, 484, 407, 336, 433, 308, 348, 436, 346, + 433, 350, 247, 469, 464, 482, 331, 429, 333, 344, + 335, 179, 299, 247, 240, 432, 479, 140, 451, 240, + 442, 145, 446, 444, 457, 235, 160, 235, 453, 399, + 458, 455, 299, 137, 516, 143, 508, 426, 436, 204, + 0, 204, 412, 0, 0, 0, 0, 0, 458, 103, + 0, 143, 0, 0, 143, 0, 404, 0, 57, 175, + 299, 0, 57, 91, 177, 183, 57, 57, 449, 0, + 299, 105, 90, 57, 57, 57, 57, 0, 89, 88, + 57, 94, 95, 57, 57, 81, 65, 57, 263, 57, + 57, 486, 285, 267, 86, 57, 57, 64, 57, 165, + 87, 57, 57, 177, 57, 57, 57, 284, 57, 283, + 97, 282, 85, 401, 57, 99, 57, 57, 468, 92, + 57, 281, 449, 300, 57, 69, 491, 57, 57, 449, + 317, 57, 57, 327, 58, 67, 57, 341, 66, 401, + 234, 402, 162, 401, 299, 57, 57, 448, 57, 338, + 489, 57, 74, 488, 57, 57, 57, 487, 490, 477, + 93, 57, 57, 476, 177, 295, 267, 402, 295, 295, + 267, 402, 0, 267, 267, 295, 57, 494, 313, 494, + 267, 267, 628, 0, 57, 270, 595, 323, 103, 267, + 314, 294, 493, 503, 57, 292, 0, 316, 57, 267, + 295, 288, 326, 267, 57, 267, 0, 329, 299, 267, + 105, 172, 0, 310, 57, 0, 0, 290, 57, 267, + 601, 275, 297, 267, 57, 286, 0, 494, 604, 267, + 592, 287, 0, 594, 0, 494, 0, 595, 560, 0, + 0, 0, 493, 503, 0, 563, 556, 557, 558, 559, + 493, 503, 469, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 302, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 296, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 494, 0, 0, 598, 0, 0, 0, 595, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 517, 0, 0, 0, - 0, 0, 0, 0, 532, 0, 0, 0, 0, 0, - 0, 0, 523, 533, 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, @@ -634,110 +645,125 @@ const int 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}; const int QmlJSGrammar::action_check [] = { - 7, 90, 8, 7, 55, 33, 55, 60, 0, 33, - 60, 7, 60, 36, 36, 8, 55, 60, 7, 7, - 17, 55, 16, 7, 36, 36, 7, 37, 33, 2, - 7, 60, 7, 36, 36, 60, 36, 7, 33, 2, - 20, 8, 7, 7, 79, 36, 36, 33, 7, 7, - 7, 36, 1, 36, 36, 7, 7, 36, 29, 33, - 7, 48, 7, 7, 33, 8, 7, 1, 29, 8, - 48, 79, 48, 8, 90, 29, 2, 7, 79, 7, - 7, 36, 1, 36, 7, 33, 36, 24, 60, 29, - 5, 7, 1, 61, 36, 8, 7, 17, 36, 6, - 66, 33, 31, 8, 60, 8, 66, 8, 33, 8, - 8, 29, 36, 20, 60, 77, 8, 48, 7, 8, - 10, 8, 55, 8, -1, 61, -1, -1, 7, -1, - -1, -1, 42, -1, -1, -1, 8, 15, 8, 61, - 61, 62, 50, 53, 61, 62, 54, 61, 62, 61, - 62, 8, 40, 56, 33, 60, 34, 8, 56, 8, - 61, 60, 7, 51, -1, 55, 61, 62, 60, 29, - 61, 62, 40, 60, 40, 60, 29, 61, 62, 61, - 62, 40, 2, 51, 56, 51, 61, 62, 61, 62, - 60, 15, 51, 36, 61, 62, 50, 8, 7, 56, - 54, 8, -1, 8, -1, 8, 61, 62, 8, 60, - 34, 60, -1, -1, 29, 75, 61, 62, 61, 62, - 15, 29, 75, 29, -1, -1, 86, 29, 92, 93, - 94, -1, 25, 86, 27, 25, 91, 27, 8, 34, - -1, 36, -1, -1, 12, 38, -1, -1, 38, 12, - 61, 62, 61, 62, 61, 62, 61, 62, 61, 62, - 75, 61, 62, 25, 12, 27, 25, 75, 27, 75, - 25, 86, 27, 75, -1, 29, 38, 15, 86, 38, - 86, -1, 15, 38, 86, 15, 25, 29, 27, 57, - -1, 61, 62, 29, 57, 63, 34, -1, 36, 38, - 63, 34, 29, 36, 34, 29, 36, 18, 19, 57, - 29, -1, 66, 67, 68, 63, 29, -1, -1, 29, - -1, -1, -1, -1, 66, 67, 68, 29, -1, -1, - 66, 67, 68, -1, 45, 46, 29, -1, -1, 66, - 67, 68, 66, 67, 68, 29, -1, 66, 67, 68, - 18, 19, 29, 66, 67, 68, 66, 67, 68, 25, - 29, 27, -1, -1, 66, 67, 68, 18, 19, 29, - -1, -1, 38, 66, 67, 68, -1, 45, 46, -1, - 29, -1, 66, 67, 68, 18, 19, 36, 47, 66, - 67, 68, -1, -1, 45, 46, -1, 66, 67, 68, - -1, -1, 61, 62, 29, -1, 66, 67, 68, -1, - -1, 36, 45, 46, 23, 24, -1, 66, 67, 68, - -1, 23, 24, 32, -1, -1, 35, -1, 37, 29, - 32, 15, 91, 35, -1, 37, -1, -1, -1, -1, - -1, 66, 67, 68, -1, 23, 24, -1, -1, 33, - 34, -1, 36, 31, 32, -1, 29, 35, -1, 37, - -1, 61, 62, 23, 24, 29, 66, 67, 68, -1, - -1, 31, 32, 23, 24, 35, -1, 37, 29, -1, - -1, 31, 32, -1, -1, 35, -1, 37, 61, 62, - -1, 29, -1, 66, 67, 68, -1, 61, 62, 29, - -1, -1, 66, 67, 68, -1, -1, -1, -1, -1, - 61, 62, -1, 23, 24, 66, 67, 68, -1, -1, - -1, -1, 32, 61, 62, 35, -1, 37, 66, 67, - 68, 61, 62, -1, -1, -1, 66, 67, 68, -1, - -1, -1, -1, 3, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 13, -1, -1, -1, 17, -1, -1, - -1, -1, -1, -1, -1, -1, 26, -1, 28, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 39, - 3, 41, 42, -1, -1, -1, -1, 23, 24, 49, - 13, -1, 52, 53, 17, 31, 32, -1, 58, 35, - -1, 37, -1, 26, 64, 28, -1, -1, 31, -1, - -1, -1, -1, -1, -1, -1, 39, -1, 41, 42, - 80, -1, -1, 12, 13, -1, 49, -1, -1, 52, - 53, -1, -1, 22, -1, 58, -1, -1, -1, -1, - 29, 64, -1, -1, 33, 34, -1, 36, -1, -1, - -1, -1, -1, -1, 43, -1, -1, 80, 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, -1, - -1, -1, 81, 82, 83, -1, -1, 39, 87, 41, + 36, 7, 7, 7, 7, 36, 7, 36, 7, 36, + 60, 33, 33, 36, 7, 7, 7, 36, 36, 7, + 77, 36, 36, 60, 33, 55, 16, 55, 79, 90, + 7, 55, 8, 7, 36, 7, 36, 48, 20, 8, + 79, 36, 7, 2, 8, 90, 33, 36, 33, 17, + 48, 0, 33, 1, 33, 8, 36, 7, 36, 55, + 2, 8, 7, 60, 7, 5, 60, 5, 5, 36, + 33, 7, 29, 17, 60, 36, 60, 60, 48, 7, + 55, 36, 2, 2, 7, 7, 7, 33, 1, 7, + 61, 8, 8, 7, 29, 36, 7, 24, 37, 61, + 66, 33, 1, 61, 60, 1, 79, 7, 60, 10, + 8, 40, 66, 8, 29, 48, 8, 29, 6, -1, + 29, 31, 51, 7, 8, 50, 15, 61, 62, 54, + 61, 62, 20, 8, 8, 61, 62, 61, 62, 42, + 8, 8, 50, 7, 15, 34, 54, 8, 8, 8, + 53, 8, -1, 7, 55, 61, 62, 8, 56, 61, + 62, 40, 40, 34, 56, 60, 8, 61, 62, 33, + 61, 62, 51, 51, 61, 62, 61, 62, 61, 62, + 8, 25, 8, 27, 40, 60, 29, 61, 8, 25, + -1, 27, 60, 60, 38, 51, 25, 15, 27, 60, + 60, 60, 38, 60, 25, 56, 27, 29, 15, 38, + 29, 7, 12, 29, 29, 8, 34, 38, 36, 61, + 62, 7, -1, 36, 8, -1, 15, 34, -1, 36, + -1, -1, 75, 61, 62, 61, 62, 25, 12, 27, + 12, 61, 62, 86, 8, 34, -1, 36, 61, 62, + 38, 61, 62, 75, 29, -1, 75, 57, 29, 75, + 75, 15, -1, 63, 86, 61, 62, 86, 61, 62, + 86, 86, -1, -1, -1, 61, 62, 61, 62, 29, + 34, 91, 36, 57, 29, 57, 15, 47, 29, 63, + -1, 63, 56, -1, 15, 66, 67, 68, -1, -1, + 75, 61, 62, 29, 33, 34, -1, 36, -1, -1, + -1, 86, 33, 34, 29, 36, 66, 67, 68, 29, + -1, 66, 67, 68, 29, 66, 67, 68, 29, -1, + -1, 91, 18, 19, 25, 29, 27, -1, -1, -1, + 66, 67, 68, 92, 93, 94, 95, 38, 18, 19, + 29, 66, 67, 68, 29, -1, 66, 67, 68, 45, + 46, 66, 67, 68, 29, 66, 67, 68, -1, 23, + 24, -1, 66, 67, 68, 45, 46, 29, 32, -1, + -1, 35, -1, 37, -1, -1, -1, 66, 67, 68, + 29, 66, 67, 68, -1, -1, -1, 36, -1, 29, + -1, 66, 67, 68, -1, -1, 36, 18, 19, 23, + 24, -1, -1, -1, 66, 67, 68, -1, 32, -1, + -1, 35, -1, 37, -1, -1, -1, 66, 67, 68, + -1, 23, 24, -1, 45, 46, 66, 67, 68, 31, + 32, 23, 24, 35, -1, 37, -1, -1, -1, 31, + 32, 23, 24, 35, -1, 37, -1, -1, -1, 31, + 32, 23, 24, 35, -1, 37, -1, -1, -1, 31, + 32, 23, 24, 35, 29, 37, -1, -1, -1, 31, + 32, -1, 29, 35, -1, 37, -1, 23, 24, -1, + 29, -1, -1, -1, -1, -1, 32, -1, 29, 35, + -1, 37, -1, -1, -1, -1, 61, 62, -1, -1, + -1, 66, 67, 68, 61, 62, -1, -1, -1, 66, + 67, 68, 61, 62, -1, -1, -1, 66, 67, 68, + 61, 62, 3, -1, -1, 66, 67, 68, -1, -1, + -1, -1, 13, -1, -1, -1, 17, -1, -1, -1, + -1, -1, -1, -1, -1, 26, -1, 28, -1, -1, + -1, -1, 29, -1, -1, -1, -1, -1, 39, -1, + 41, 42, -1, -1, -1, -1, -1, -1, 49, -1, + -1, 52, 53, -1, -1, -1, -1, 58, 3, -1, + -1, -1, -1, 64, 61, 62, -1, -1, 13, 66, + 67, 68, 17, -1, -1, -1, -1, -1, -1, 80, + -1, 26, -1, 28, -1, -1, 31, -1, -1, -1, + -1, -1, -1, -1, 39, -1, 41, 42, -1, 12, + 13, 3, -1, -1, 49, -1, -1, 52, 53, 22, + -1, 13, -1, 58, -1, 17, 29, -1, -1, 64, + 33, 34, -1, 36, 26, -1, 28, -1, -1, -1, + 43, -1, -1, -1, 47, 80, -1, 39, -1, 41, 42, -1, -1, -1, -1, -1, -1, 49, -1, -1, - 52, 53, -1, 12, 13, -1, 58, -1, -1, -1, - -1, -1, 64, 22, -1, -1, -1, -1, -1, -1, - 29, -1, -1, -1, 33, 34, -1, 36, 80, -1, - -1, -1, -1, -1, 43, -1, -1, -1, 47, -1, - -1, -1, -1, -1, -1, 12, 13, -1, -1, -1, - -1, -1, -1, -1, -1, 22, 65, 66, 67, 68, - -1, 70, 29, -1, -1, -1, 33, 34, -1, 36, - -1, -1, 81, 82, 83, -1, 43, -1, 87, -1, - 47, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -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, 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, -1, -1, - -1, -1, -1, -1, -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, 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, + 52, 53, 65, 66, 67, 68, 58, 70, -1, -1, + -1, -1, 64, -1, -1, -1, -1, -1, 81, 82, + 83, -1, -1, -1, 87, -1, -1, -1, 80, -1, + -1, -1, -1, -1, -1, -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, 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, + -1, -1, -1, -1, -1, -1, -1, -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, 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, 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, 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, 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, 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, @@ -746,68 +772,51 @@ const int QmlJSGrammar::action_check [] = { -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, 10, -1, 12, + -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, -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, 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, - 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, 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, 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, + 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, 11, 12, 13, -1, -1, -1, -1, -1, -1, -1, -1, 22, -1, -1, -1, - -1, -1, -1, 29, 30, -1, -1, 33, 34, -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, -1, -1, 65, - 66, 67, 68, -1, 70, -1, 72, -1, 74, -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, 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, 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, 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, 11, 12, 13, -1, -1, -1, -1, + -1, -1, -1, -1, 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, -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, 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, @@ -816,120 +825,130 @@ const int QmlJSGrammar::action_check [] = { -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, 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, 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, -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, 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, + 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, + 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, + 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, - 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, 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, 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, -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, 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, - 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, + -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, -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, 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, + 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, -1, 87, -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, 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, + 84, 85, 86, 87, -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, - 10, 12, 3, 12, 23, 8, 12, 23, 12, 3, - 2, 65, 12, 12, 3, 17, 3, 2, 23, 3, - 3, 19, 12, 3, 12, 2, 23, 3, 3, 3, - 23, 12, 2, 12, 12, 3, 2, 33, 33, 96, - 12, 12, 33, 2, 2, 12, 19, 33, 2, 12, - 19, 12, 3, 2, 2, 12, 3, 2, 2, 12, - 2, 79, 3, 91, 19, 79, 3, 3, 33, 33, - 94, 33, 3, 3, 34, 3, 2, 33, 3, 19, - 2, 33, 2, 33, 3, 12, 10, 33, 2, 12, - 33, 3, -1, -1, -1, 2, 29, 12, -1, -1, - 33, 33, 10, 42, 42, 13, 38, 42, 42, 47, - 44, 2, 10, 42, -1, 50, 3, 33, 12, 58, - 35, 42, 38, 44, 42, 42, 10, 56, 3, 47, - 47, 42, 42, 42, 44, 44, 47, 42, 42, 42, - 42, 39, 44, 47, 3, 42, 42, 52, 44, 46, - 42, 54, 44, 42, 66, 39, 42, 42, 47, 12, - 42, 47, 47, 45, 42, 42, 42, 45, 44, 42, - 47, 44, 42, 42, 97, 44, 42, 47, -1, 66, - 42, 42, 48, 44, 98, 42, 48, 44, 42, 83, - 42, 66, 44, 42, 48, 42, 10, 44, 10, 48, - 42, 13, 44, 42, 42, 44, 42, 66, 46, 42, - 46, 42, 103, 44, 47, 42, 42, 44, 42, -1, - -1, 47, 42, 47, 42, 39, 42, 47, -1, 47, - -1, 47, 85, 42, 42, 59, 42, 55, 47, 47, - 42, 47, -1, 49, 64, 47, 42, 10, 64, 57, - 13, 47, 42, 49, 12, 64, 42, 47, 42, 49, - -1, 47, 64, 47, -1, 51, 42, 10, -1, 53, - 33, 47, 15, 49, -1, 18, -1, 35, 36, 10, - -1, -1, -1, 26, 27, -1, -1, 18, 19, 20, - 21, 22, -1, 42, -1, -1, -1, -1, 47, -1, + 13, 94, 3, 19, 33, 23, 13, 3, 23, 3, + 13, 23, 3, 2, 23, 3, 3, 19, 2, 17, + 13, 65, 33, 13, 9, 11, 3, 2, 33, 2, + 13, 13, 13, 3, 34, 3, 33, 13, 3, 13, + 3, 13, 3, 2, 13, 3, 2, 2, 19, 3, + 3, 2, 2, 33, 33, 33, 2, 79, 3, 2, + 2, 13, 3, 2, 13, 79, 33, 33, 3, 13, + 96, 33, 19, 13, 2, 13, 33, 13, 2, 2, + 13, 3, 3, 3, 11, 33, 23, 91, 19, 2, + -1, 2, 2, -1, -1, -1, -1, -1, 13, 13, + -1, 33, -1, -1, 33, -1, 38, -1, 42, 38, + 3, -1, 42, 47, 44, 13, 42, 42, 44, -1, + 3, 35, 47, 42, 42, 42, 42, -1, 47, 47, + 42, 48, 48, 42, 42, 47, 44, 42, 42, 42, + 42, 44, 47, 47, 46, 42, 42, 44, 42, 58, + 46, 42, 42, 44, 42, 42, 42, 47, 42, 47, + 54, 47, 46, 11, 42, 52, 42, 42, 83, 47, + 42, 47, 44, 66, 42, 50, 44, 42, 42, 44, + 13, 42, 42, 66, 45, 45, 42, 98, 44, 11, + 103, 39, 56, 11, 3, 42, 42, 44, 42, 97, + 44, 42, 48, 44, 42, 42, 42, 44, 44, 29, + 48, 42, 42, 33, 44, 42, 47, 39, 42, 42, + 47, 39, -1, 47, 47, 42, 42, 11, 59, 11, + 47, 47, 14, -1, 42, 51, 18, 64, 13, 47, + 64, 64, 26, 27, 42, 53, -1, 64, 42, 47, + 42, 49, 85, 47, 42, 47, -1, 66, 3, 47, + 35, 36, -1, 57, 42, -1, -1, 55, 42, 47, + 4, 49, 64, 47, 42, 49, -1, 11, 4, 47, + 11, 49, -1, 14, -1, 11, -1, 18, 11, -1, + -1, -1, 26, 27, -1, 18, 19, 20, 21, 22, + 26, 27, 33, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 66, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 64, -1, -1, -1, -1, -1, -1, -1, -1, -1, -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, 10, -1, -1, -1, - -1, -1, -1, -1, 18, -1, -1, -1, -1, -1, - -1, -1, 26, 27, -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, @@ -937,5 +956,5 @@ const int 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}; diff --git a/src/declarative/qml/parser/qmljsgrammar_p.h b/src/declarative/qml/parser/qmljsgrammar_p.h index 57fcccc..7de77c0 100644 --- a/src/declarative/qml/parser/qmljsgrammar_p.h +++ b/src/declarative/qml/parser/qmljsgrammar_p.h @@ -59,8 +59,8 @@ class QmlJSGrammar public: enum { EOF_SYMBOL = 0, - REDUCE_HERE = 96, - SHIFT_THERE = 95, + REDUCE_HERE = 97, + SHIFT_THERE = 96, T_AND = 1, T_AND_AND = 2, T_AND_EQ = 3, @@ -86,8 +86,9 @@ public: T_EQ_EQ = 18, T_EQ_EQ_EQ = 19, T_FALSE = 83, - T_FEED_JS_EXPRESSION = 94, - T_FEED_JS_STATEMENT = 93, + T_FEED_JS_EXPRESSION = 95, + T_FEED_JS_STATEMENT = 94, + T_FEED_UI_OBJECT_MEMBER = 93, T_FEED_UI_PROGRAM = 92, T_FINALLY = 20, T_FOR = 21, @@ -156,15 +157,15 @@ public: T_XOR = 79, T_XOR_EQ = 80, - ACCEPT_STATE = 628, - RULE_COUNT = 339, - STATE_COUNT = 629, - TERMINAL_COUNT = 97, + ACCEPT_STATE = 630, + RULE_COUNT = 340, + STATE_COUNT = 631, + TERMINAL_COUNT = 98, NON_TERMINAL_COUNT = 105, - GOTO_INDEX_OFFSET = 629, - GOTO_INFO_OFFSET = 2539, - GOTO_CHECK_OFFSET = 2539 + GOTO_INDEX_OFFSET = 631, + GOTO_INFO_OFFSET = 2618, + GOTO_CHECK_OFFSET = 2618 }; static const char *const spell []; diff --git a/src/declarative/qml/parser/qmljsparser.cpp b/src/declarative/qml/parser/qmljsparser.cpp index c08e2af..e805ce5 100644 --- a/src/declarative/qml/parser/qmljsparser.cpp +++ b/src/declarative/qml/parser/qmljsparser.cpp @@ -211,33 +211,38 @@ case 2: { } break; case 3: { + sym(1).Node = sym(2).Node; + program = sym(1).Node; +} break; + +case 4: { sym(1).UiProgram = makeAstNode<AST::UiProgram> (driver->nodePool(), sym(1).UiImportList, sym(2).UiObjectMemberList->finish()); } break; -case 5: { +case 6: { sym(1).Node = sym(1).UiImportList->finish(); } break; -case 6: { +case 7: { sym(1).Node = makeAstNode<AST::UiImportList> (driver->nodePool(), sym(1).UiImport); } break; -case 7: { +case 8: { sym(1).Node = makeAstNode<AST::UiImportList> (driver->nodePool(), sym(1).UiImportList, sym(2).UiImport); } break; -case 10: { +case 11: { sym(1).UiImport->semicolonToken = loc(2); } break; -case 12: { +case 13: { sym(1).UiImport->versionToken = loc(2); sym(1).UiImport->semicolonToken = loc(3); } break; -case 14: { +case 15: { sym(1).UiImport->versionToken = loc(2); sym(1).UiImport->asToken = loc(3); sym(1).UiImport->importIdToken = loc(4); @@ -245,14 +250,14 @@ case 14: { sym(1).UiImport->semicolonToken = loc(5); } break; -case 16: { +case 17: { 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 17: { +case 18: { AST::UiImport *node = 0; if (AST::StringLiteral *importIdLiteral = AST::cast<AST::StringLiteral *>(sym(2).Expression)) { @@ -278,56 +283,56 @@ case 17: { } } break; -case 18: { +case 19: { sym(1).Node = 0; } break; -case 19: { +case 20: { sym(1).Node = makeAstNode<AST::UiObjectMemberList> (driver->nodePool(), sym(1).UiObjectMember); } break; -case 20: { +case 21: { sym(1).Node = makeAstNode<AST::UiObjectMemberList> (driver->nodePool(), sym(1).UiObjectMember); } break; -case 21: { +case 22: { AST::UiObjectMemberList *node = makeAstNode<AST:: UiObjectMemberList> (driver->nodePool(), sym(1).UiObjectMemberList, sym(2).UiObjectMember); sym(1).Node = node; } break; -case 22: { +case 23: { sym(1).Node = makeAstNode<AST::UiArrayMemberList> (driver->nodePool(), sym(1).UiObjectMember); } break; -case 23: { +case 24: { AST::UiArrayMemberList *node = makeAstNode<AST::UiArrayMemberList> (driver->nodePool(), sym(1).UiArrayMemberList, sym(3).UiObjectMember); node->commaToken = loc(2); sym(1).Node = node; } break; -case 24: { +case 25: { 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 25: { +case 26: { 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 26: { +case 27: { AST::UiObjectDefinition *node = makeAstNode<AST::UiObjectDefinition> (driver->nodePool(), sym(1).UiQualifiedId, sym(2).UiObjectInitializer); sym(1).Node = node; } break; -case 28: { +case 29: { AST::UiArrayBinding *node = makeAstNode<AST::UiArrayBinding> (driver->nodePool(), sym(1).UiQualifiedId, sym(4).UiArrayMemberList->finish()); node->colonToken = loc(2); @@ -336,13 +341,13 @@ case 28: { sym(1).Node = node; } break; -case 29: { +case 30: { 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 30:case 31:case 32:case 33: +case 31:case 32:case 33:case 34: { AST::UiScriptBinding *node = makeAstNode<AST::UiScriptBinding> (driver->nodePool(), sym(1).UiQualifiedId, sym(3).Statement); @@ -350,35 +355,35 @@ case 30:case 31:case 32:case 33: sym(1).Node = node; } break; -case 34: +case 35: -case 35: { +case 36: { sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount()); break; } -case 37: { +case 38: { sym(1).Node = 0; } break; -case 38: { +case 39: { sym(1).Node = sym(1).UiParameterList->finish (); } break; -case 39: { +case 40: { AST::UiParameterList *node = makeAstNode<AST::UiParameterList> (driver->nodePool(), sym(1).sval, sym(2).sval); node->identifierToken = loc(2); sym(1).Node = node; } break; -case 40: { +case 41: { 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 42: { +case 43: { AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval); node->type = AST::UiPublicMember::Signal; node->propertyToken = loc(1); @@ -389,7 +394,7 @@ case 42: { 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); @@ -399,7 +404,7 @@ case 44: { sym(1).Node = node; } break; -case 46: { +case 47: { AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(4).sval, sym(6).sval); node->typeModifier = sym(2).sval; node->propertyToken = loc(1); @@ -410,7 +415,7 @@ case 46: { sym(1).Node = node; } break; -case 48: { +case 49: { AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval); node->propertyToken = loc(1); node->typeToken = loc(2); @@ -419,7 +424,7 @@ case 48: { sym(1).Node = node; } break; -case 50: { +case 51: { AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval); node->isDefaultMember = true; node->defaultToken = loc(1); @@ -430,7 +435,7 @@ case 50: { sym(1).Node = node; } break; -case 52: { +case 53: { AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval, sym(5).Expression); node->propertyToken = loc(1); @@ -441,7 +446,7 @@ case 52: { sym(1).Node = node; } break; -case 54: { +case 55: { AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval, sym(6).Expression); node->isReadonlyMember = true; @@ -454,7 +459,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->isDefaultMember = true; @@ -467,75 +472,75 @@ case 56: { sym(1).Node = node; } break; -case 57: { +case 58: { sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node); } break; -case 58: { +case 59: { sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node); } break; -case 60: { +case 61: { QString s = QLatin1String(QmlJSGrammar::spell[T_PROPERTY]); sym(1).sval = driver->intern(s.constData(), s.length()); break; } -case 61: { +case 62: { QString s = QLatin1String(QmlJSGrammar::spell[T_SIGNAL]); sym(1).sval = driver->intern(s.constData(), s.length()); break; } -case 62: { +case 63: { QString s = QLatin1String(QmlJSGrammar::spell[T_READONLY]); sym(1).sval = driver->intern(s.constData(), s.length()); break; } -case 63: { +case 64: { AST::ThisExpression *node = makeAstNode<AST::ThisExpression> (driver->nodePool()); node->thisToken = loc(1); sym(1).Node = node; } break; -case 64: { +case 65: { AST::IdentifierExpression *node = makeAstNode<AST::IdentifierExpression> (driver->nodePool(), sym(1).sval); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 65: { +case 66: { AST::NullExpression *node = makeAstNode<AST::NullExpression> (driver->nodePool()); node->nullToken = loc(1); sym(1).Node = node; } break; -case 66: { +case 67: { AST::TrueLiteral *node = makeAstNode<AST::TrueLiteral> (driver->nodePool()); node->trueToken = loc(1); sym(1).Node = node; } break; -case 67: { +case 68: { AST::FalseLiteral *node = makeAstNode<AST::FalseLiteral> (driver->nodePool()); node->falseToken = loc(1); sym(1).Node = node; } break; -case 68: { +case 69: { AST::NumericLiteral *node = makeAstNode<AST::NumericLiteral> (driver->nodePool(), sym(1).dval); node->literalToken = loc(1); sym(1).Node = node; } break; -case 69: -case 70: { +case 70: +case 71: { AST::StringLiteral *node = makeAstNode<AST::StringLiteral> (driver->nodePool(), sym(1).sval); node->literalToken = loc(1); sym(1).Node = node; } break; -case 71: { +case 72: { bool rx = lexer->scanRegExp(Lexer::NoPrefix); if (!rx) { diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage())); @@ -546,7 +551,7 @@ case 71: { sym(1).Node = node; } break; -case 72: { +case 73: { bool rx = lexer->scanRegExp(Lexer::EqualPrefix); if (!rx) { diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage())); @@ -557,28 +562,28 @@ case 72: { sym(1).Node = node; } break; -case 73: { +case 74: { 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 74: { +case 75: { 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 75: { +case 76: { 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 76: { +case 77: { AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (), (AST::Elision *) 0); node->lbracketToken = loc(1); @@ -587,7 +592,7 @@ case 76: { sym(1).Node = node; } break; -case 77: { +case 78: { AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (), sym(4).Elision->finish()); node->lbracketToken = loc(1); @@ -596,7 +601,7 @@ case 77: { sym(1).Node = node; } break; -case 78: { +case 79: { AST::ObjectLiteral *node = 0; if (sym(2).Node) node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(), @@ -608,7 +613,7 @@ case 78: { sym(1).Node = node; } break; -case 79: { +case 80: { AST::ObjectLiteral *node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(), sym(2).PropertyNameAndValueList->finish ()); node->lbraceToken = loc(1); @@ -616,14 +621,14 @@ case 79: { sym(1).Node = node; } break; -case 80: { +case 81: { 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 81: { +case 82: { if (AST::ArrayMemberExpression *mem = AST::cast<AST::ArrayMemberExpression *>(sym(1).Expression)) { diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Warning, mem->lbracketToken, QLatin1String("Ignored annotation"))); @@ -643,48 +648,48 @@ case 81: { } } break; -case 82: { +case 83: { sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), (AST::Elision *) 0, sym(1).Expression); } break; -case 83: { +case 84: { sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).Elision->finish(), sym(2).Expression); } break; -case 84: { +case 85: { 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 85: { +case 86: { 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 86: { +case 87: { AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool()); node->commaToken = loc(1); sym(1).Node = node; } break; -case 87: { +case 88: { AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool(), sym(1).Elision); node->commaToken = loc(2); sym(1).Node = node; } break; -case 88: { +case 89: { AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(), sym(1).PropertyName, sym(3).Expression); node->colonToken = loc(2); sym(1).Node = node; } break; -case 89: { +case 90: { AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(), sym(1).PropertyNameAndValueList, sym(3).PropertyName, sym(5).Expression); node->commaToken = loc(2); @@ -692,38 +697,36 @@ case 89: { sym(1).Node = node; } break; -case 90: { +case 91: { AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval); node->propertyNameToken = loc(1); sym(1).Node = node; } break; -case 91: -case 92: { +case 92: +case 93: { AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount())); node->propertyNameToken = loc(1); sym(1).Node = node; } break; -case 93: { +case 94: { AST::StringLiteralPropertyName *node = makeAstNode<AST::StringLiteralPropertyName> (driver->nodePool(), sym(1).sval); node->propertyNameToken = loc(1); sym(1).Node = node; } break; -case 94: { +case 95: { AST::NumericLiteralPropertyName *node = makeAstNode<AST::NumericLiteralPropertyName> (driver->nodePool(), sym(1).dval); node->propertyNameToken = loc(1); sym(1).Node = node; } break; -case 95: { +case 96: { AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval); node->propertyNameToken = loc(1); sym(1).Node = node; } break; -case 96: - case 97: case 98: @@ -783,25 +786,27 @@ case 124: case 125: case 126: + +case 127: { sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount()); } break; -case 131: { +case 132: { 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 132: { +case 133: { 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 133: { +case 134: { AST::NewMemberExpression *node = makeAstNode<AST::NewMemberExpression> (driver->nodePool(), sym(2).Expression, sym(4).ArgumentList); node->newToken = loc(1); node->lparenToken = loc(3); @@ -809,384 +814,384 @@ case 133: { sym(1).Node = node; } break; -case 135: { +case 136: { AST::NewExpression *node = makeAstNode<AST::NewExpression> (driver->nodePool(), sym(2).Expression); node->newToken = loc(1); sym(1).Node = node; } break; -case 136: { +case 137: { 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 137: { +case 138: { 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 138: { +case 139: { 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 139: { +case 140: { 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 140: { +case 141: { sym(1).Node = 0; } break; -case 141: { +case 142: { sym(1).Node = sym(1).ArgumentList->finish(); } break; -case 142: { +case 143: { sym(1).Node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).Expression); } break; -case 143: { +case 144: { AST::ArgumentList *node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).ArgumentList, sym(3).Expression); node->commaToken = loc(2); sym(1).Node = node; } break; -case 147: { +case 148: { AST::PostIncrementExpression *node = makeAstNode<AST::PostIncrementExpression> (driver->nodePool(), sym(1).Expression); node->incrementToken = loc(2); sym(1).Node = node; } break; -case 148: { +case 149: { AST::PostDecrementExpression *node = makeAstNode<AST::PostDecrementExpression> (driver->nodePool(), sym(1).Expression); node->decrementToken = loc(2); sym(1).Node = node; } break; -case 150: { +case 151: { AST::DeleteExpression *node = makeAstNode<AST::DeleteExpression> (driver->nodePool(), sym(2).Expression); node->deleteToken = loc(1); sym(1).Node = node; } break; -case 151: { +case 152: { AST::VoidExpression *node = makeAstNode<AST::VoidExpression> (driver->nodePool(), sym(2).Expression); node->voidToken = loc(1); sym(1).Node = node; } break; -case 152: { +case 153: { AST::TypeOfExpression *node = makeAstNode<AST::TypeOfExpression> (driver->nodePool(), sym(2).Expression); node->typeofToken = loc(1); sym(1).Node = node; } break; -case 153: { +case 154: { AST::PreIncrementExpression *node = makeAstNode<AST::PreIncrementExpression> (driver->nodePool(), sym(2).Expression); node->incrementToken = loc(1); sym(1).Node = node; } break; -case 154: { +case 155: { AST::PreDecrementExpression *node = makeAstNode<AST::PreDecrementExpression> (driver->nodePool(), sym(2).Expression); node->decrementToken = loc(1); sym(1).Node = node; } break; -case 155: { +case 156: { AST::UnaryPlusExpression *node = makeAstNode<AST::UnaryPlusExpression> (driver->nodePool(), sym(2).Expression); node->plusToken = loc(1); sym(1).Node = node; } break; -case 156: { +case 157: { AST::UnaryMinusExpression *node = makeAstNode<AST::UnaryMinusExpression> (driver->nodePool(), sym(2).Expression); node->minusToken = loc(1); sym(1).Node = node; } break; -case 157: { +case 158: { AST::TildeExpression *node = makeAstNode<AST::TildeExpression> (driver->nodePool(), sym(2).Expression); node->tildeToken = loc(1); sym(1).Node = node; } break; -case 158: { +case 159: { AST::NotExpression *node = makeAstNode<AST::NotExpression> (driver->nodePool(), sym(2).Expression); node->notToken = loc(1); sym(1).Node = node; } break; -case 160: { +case 161: { 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 161: { +case 162: { 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 162: { +case 163: { 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 164: { +case 165: { 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 165: { +case 166: { 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 167: { +case 168: { 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 168: { +case 169: { 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 169: { +case 170: { 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 171: { +case 172: { 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 172: { +case 173: { 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 173: { +case 174: { 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 174: { +case 175: { 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 175: { +case 176: { 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 176: { +case 177: { 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 178: { +case 179: { 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 179: { +case 180: { 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 180: { +case 181: { 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 181: { +case 182: { 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 182: { +case 183: { 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 184: { +case 185: { 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 185: { +case 186: { 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 186: { +case 187: { 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 187: { +case 188: { 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 189: { +case 190: { 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 190: { +case 191: { 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 191: { +case 192: { 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 192: { +case 193: { 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 194: { +case 195: { 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 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::BitXor, 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::BitOr, 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::And, 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::Or, 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::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression, sym(5).Expression); node->questionToken = loc(2); @@ -1194,7 +1199,7 @@ case 214: { 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); @@ -1202,112 +1207,112 @@ case 216: { sym(1).Node = node; } break; -case 218: { +case 219: { 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 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 221: { +case 222: { sym(1).ival = QSOperator::Assign; } break; -case 222: { +case 223: { sym(1).ival = QSOperator::InplaceMul; } break; -case 223: { +case 224: { sym(1).ival = QSOperator::InplaceDiv; } break; -case 224: { +case 225: { sym(1).ival = QSOperator::InplaceMod; } break; -case 225: { +case 226: { sym(1).ival = QSOperator::InplaceAdd; } break; -case 226: { +case 227: { sym(1).ival = QSOperator::InplaceSub; } break; -case 227: { +case 228: { sym(1).ival = QSOperator::InplaceLeftShift; } break; -case 228: { +case 229: { sym(1).ival = QSOperator::InplaceRightShift; } break; -case 229: { +case 230: { sym(1).ival = QSOperator::InplaceURightShift; } break; -case 230: { +case 231: { sym(1).ival = QSOperator::InplaceAnd; } break; -case 231: { +case 232: { sym(1).ival = QSOperator::InplaceXor; } break; -case 232: { +case 233: { sym(1).ival = QSOperator::InplaceOr; } break; -case 234: { +case 235: { AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression); node->commaToken = loc(2); sym(1).Node = node; } break; -case 235: { +case 236: { sym(1).Node = 0; } break; -case 238: { +case 239: { AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression); node->commaToken = loc(2); sym(1).Node = node; } break; -case 239: { +case 240: { sym(1).Node = 0; } break; -case 256: { +case 257: { 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 257: { +case 258: { sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).Statement); } break; -case 258: { +case 259: { sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).StatementList, sym(2).Statement); } break; -case 259: { +case 260: { sym(1).Node = 0; } break; -case 260: { +case 261: { sym(1).Node = sym(1).StatementList->finish (); } break; -case 262: { +case 263: { AST::VariableStatement *node = makeAstNode<AST::VariableStatement> (driver->nodePool(), sym(2).VariableDeclarationList->finish (/*readOnly=*/sym(1).ival == T_CONST)); node->declarationKindToken = loc(1); @@ -1315,76 +1320,76 @@ case 262: { sym(1).Node = node; } break; -case 263: { +case 264: { sym(1).ival = T_CONST; } break; -case 264: { +case 265: { sym(1).ival = T_VAR; } break; -case 265: { +case 266: { sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration); } break; -case 266: { +case 267: { AST::VariableDeclarationList *node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclarationList, sym(3).VariableDeclaration); node->commaToken = loc(2); sym(1).Node = node; } break; -case 267: { +case 268: { sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration); } break; -case 268: { +case 269: { sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclarationList, sym(3).VariableDeclaration); } break; -case 269: { +case 270: { AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 270: { +case 271: { AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 271: { +case 272: { // ### TODO: AST for initializer sym(1) = sym(2); } break; -case 272: { +case 273: { sym(1).Node = 0; } break; -case 274: { +case 275: { // ### TODO: AST for initializer sym(1) = sym(2); } break; -case 275: { +case 276: { sym(1).Node = 0; } break; -case 277: { +case 278: { AST::EmptyStatement *node = makeAstNode<AST::EmptyStatement> (driver->nodePool()); node->semicolonToken = loc(1); sym(1).Node = node; } break; -case 279: { +case 280: { AST::ExpressionStatement *node = makeAstNode<AST::ExpressionStatement> (driver->nodePool(), sym(1).Expression); node->semicolonToken = loc(2); sym(1).Node = node; } break; -case 280: { +case 281: { 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); @@ -1393,7 +1398,7 @@ case 280: { sym(1).Node = node; } break; -case 281: { +case 282: { AST::IfStatement *node = makeAstNode<AST::IfStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement); node->ifToken = loc(1); node->lparenToken = loc(2); @@ -1401,7 +1406,7 @@ case 281: { sym(1).Node = node; } break; -case 283: { +case 284: { AST::DoWhileStatement *node = makeAstNode<AST::DoWhileStatement> (driver->nodePool(), sym(2).Statement, sym(5).Expression); node->doToken = loc(1); node->whileToken = loc(3); @@ -1411,7 +1416,7 @@ case 283: { sym(1).Node = node; } break; -case 284: { +case 285: { AST::WhileStatement *node = makeAstNode<AST::WhileStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement); node->whileToken = loc(1); node->lparenToken = loc(2); @@ -1419,7 +1424,7 @@ case 284: { sym(1).Node = node; } break; -case 285: { +case 286: { AST::ForStatement *node = makeAstNode<AST::ForStatement> (driver->nodePool(), sym(3).Expression, sym(5).Expression, sym(7).Expression, sym(9).Statement); node->forToken = loc(1); @@ -1430,7 +1435,7 @@ case 285: { sym(1).Node = node; } break; -case 286: { +case 287: { AST::LocalForStatement *node = makeAstNode<AST::LocalForStatement> (driver->nodePool(), sym(4).VariableDeclarationList->finish (/*readOnly=*/false), sym(6).Expression, sym(8).Expression, sym(10).Statement); @@ -1443,7 +1448,7 @@ case 286: { sym(1).Node = node; } break; -case 287: { +case 288: { AST:: ForEachStatement *node = makeAstNode<AST::ForEachStatement> (driver->nodePool(), sym(3).Expression, sym(5).Expression, sym(7).Statement); node->forToken = loc(1); @@ -1453,7 +1458,7 @@ case 287: { sym(1).Node = node; } break; -case 288: { +case 289: { AST::LocalForEachStatement *node = makeAstNode<AST::LocalForEachStatement> (driver->nodePool(), sym(4).VariableDeclaration, sym(6).Expression, sym(8).Statement); node->forToken = loc(1); @@ -1464,14 +1469,14 @@ case 288: { sym(1).Node = node; } break; -case 290: { +case 291: { AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool()); node->continueToken = loc(1); node->semicolonToken = loc(2); sym(1).Node = node; } break; -case 292: { +case 293: { AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool(), sym(2).sval); node->continueToken = loc(1); node->identifierToken = loc(2); @@ -1479,14 +1484,14 @@ case 292: { sym(1).Node = node; } break; -case 294: { +case 295: { AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool()); node->breakToken = loc(1); node->semicolonToken = loc(2); sym(1).Node = node; } break; -case 296: { +case 297: { AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool(), sym(2).sval); node->breakToken = loc(1); node->identifierToken = loc(2); @@ -1494,14 +1499,14 @@ case 296: { sym(1).Node = node; } break; -case 298: { +case 299: { 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 299: { +case 300: { AST::WithStatement *node = makeAstNode<AST::WithStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement); node->withToken = loc(1); node->lparenToken = loc(2); @@ -1509,7 +1514,7 @@ case 299: { sym(1).Node = node; } break; -case 300: { +case 301: { AST::SwitchStatement *node = makeAstNode<AST::SwitchStatement> (driver->nodePool(), sym(3).Expression, sym(5).CaseBlock); node->switchToken = loc(1); node->lparenToken = loc(2); @@ -1517,90 +1522,90 @@ case 300: { sym(1).Node = node; } break; -case 301: { +case 302: { 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 302: { +case 303: { 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 303: { +case 304: { sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClause); } break; -case 304: { +case 305: { sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClauses, sym(2).CaseClause); } break; -case 305: { +case 306: { sym(1).Node = 0; } break; -case 306: { +case 307: { sym(1).Node = sym(1).CaseClauses->finish (); } break; -case 307: { +case 308: { 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 308: { +case 309: { 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 309: -case 310: { +case 310: +case 311: { 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 311: { +case 312: { 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 313: { +case 314: { 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 314: { +case 315: { AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch); node->tryToken = loc(1); sym(1).Node = node; } break; -case 315: { +case 316: { AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Finally); node->tryToken = loc(1); sym(1).Node = node; } break; -case 316: { +case 317: { 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 317: { +case 318: { AST::Catch *node = makeAstNode<AST::Catch> (driver->nodePool(), sym(3).sval, sym(5).Block); node->catchToken = loc(1); node->lparenToken = loc(2); @@ -1609,20 +1614,20 @@ case 317: { sym(1).Node = node; } break; -case 318: { +case 319: { AST::Finally *node = makeAstNode<AST::Finally> (driver->nodePool(), sym(2).Block); node->finallyToken = loc(1); sym(1).Node = node; } break; -case 320: { +case 321: { AST::DebuggerStatement *node = makeAstNode<AST::DebuggerStatement> (driver->nodePool()); node->debuggerToken = loc(1); node->semicolonToken = loc(2); sym(1).Node = node; } break; -case 321: { +case 322: { 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); @@ -1633,7 +1638,7 @@ case 321: { sym(1).Node = node; } break; -case 322: { +case 323: { 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) @@ -1645,56 +1650,56 @@ case 322: { sym(1).Node = node; } break; -case 323: { +case 324: { AST::FormalParameterList *node = makeAstNode<AST::FormalParameterList> (driver->nodePool(), sym(1).sval); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 324: { +case 325: { 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 325: { +case 326: { sym(1).Node = 0; } break; -case 326: { +case 327: { sym(1).Node = sym(1).FormalParameterList->finish (); } break; -case 327: { +case 328: { sym(1).Node = 0; } break; -case 329: { +case 330: { sym(1).Node = makeAstNode<AST::FunctionBody> (driver->nodePool(), sym(1).SourceElements->finish ()); } break; -case 330: { +case 331: { sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElement); } break; -case 331: { +case 332: { sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElements, sym(2).SourceElement); } break; -case 332: { +case 333: { sym(1).Node = makeAstNode<AST::StatementSourceElement> (driver->nodePool(), sym(1).Statement); } break; -case 333: { +case 334: { sym(1).Node = makeAstNode<AST::FunctionSourceElement> (driver->nodePool(), sym(1).FunctionDeclaration); } break; -case 334: { +case 335: { sym(1).sval = 0; } break; -case 336: { +case 337: { sym(1).Node = 0; } break; diff --git a/src/declarative/qml/parser/qmljsparser_p.h b/src/declarative/qml/parser/qmljsparser_p.h index 46d5952..b35bec3 100644 --- a/src/declarative/qml/parser/qmljsparser_p.h +++ b/src/declarative/qml/parser/qmljsparser_p.h @@ -133,6 +133,7 @@ public: bool parse() { return parse(T_FEED_UI_PROGRAM); } bool parseStatement() { return parse(T_FEED_JS_STATEMENT); } bool parseExpression() { return parse(T_FEED_JS_EXPRESSION); } + bool parseUiObjectMember() { return parse(T_FEED_UI_OBJECT_MEMBER); } AST::UiProgram *ast() const { return AST::cast<AST::UiProgram *>(program); } @@ -153,6 +154,14 @@ public: return program->expressionCast(); } + AST::UiObjectMember *uiObjectMember() const + { + if (! program) + return 0; + + return program->uiObjectMemberCast(); + } + QList<DiagnosticMessage> diagnosticMessages() const { return diagnostic_messages; } @@ -222,9 +231,9 @@ protected: -#define J_SCRIPT_REGEXPLITERAL_RULE1 71 +#define J_SCRIPT_REGEXPLITERAL_RULE1 72 -#define J_SCRIPT_REGEXPLITERAL_RULE2 72 +#define J_SCRIPT_REGEXPLITERAL_RULE2 73 QT_QML_END_NAMESPACE diff --git a/src/declarative/qml/qmlboundsignal.cpp b/src/declarative/qml/qmlboundsignal.cpp index 08c3387..ce591e8 100644 --- a/src/declarative/qml/qmlboundsignal.cpp +++ b/src/declarative/qml/qmlboundsignal.cpp @@ -243,6 +243,9 @@ void QmlBoundSignalParameters::clearValues() int QmlBoundSignalParameters::metaCall(QMetaObject::Call c, int id, void **a) { + if (!values) + return -1; + if (c == QMetaObject::ReadProperty && id >= 1) { QmlMetaType::copy(types[id - 1], a[0], values[id]); return -1; diff --git a/src/declarative/util/qmlview.cpp b/src/declarative/util/qmlview.cpp index 805612e..f932e4a 100644 --- a/src/declarative/util/qmlview.cpp +++ b/src/declarative/util/qmlview.cpp @@ -538,7 +538,11 @@ void QmlView::resizeEvent(QResizeEvent *e) d->root->setWidth(width()); d->root->setHeight(height()); } - setSceneRect(rect()); + if (d->root) { + setSceneRect(QRectF(0, 0, d->root->width(), d->root->height())); + } else { + setSceneRect(rect()); + } QGraphicsView::resizeEvent(e); } diff --git a/tests/auto/declarative/qfxtextedit/data/navigation.qml b/tests/auto/declarative/qfxtextedit/data/navigation.qml new file mode 100644 index 0000000..5b8613f --- /dev/null +++ b/tests/auto/declarative/qfxtextedit/data/navigation.qml @@ -0,0 +1,23 @@ +import Qt 4.6 + +Rectangle { + property var myInput: Input + + width: 800; height: 600; color: "blue" + + Item { + id: FirstItem; + KeyNavigation.right: Input + } + + TextEdit { id: Input; focus: true + KeyNavigation.left: FirstItem + KeyNavigation.right: LastItem + KeyNavigation.up: FirstItem + KeyNavigation.down: LastItem + } + Item { + id: LastItem + KeyNavigation.left: Input + } +} diff --git a/tests/auto/declarative/qfxtextedit/qfxtextedit.pro b/tests/auto/declarative/qfxtextedit/qfxtextedit.pro index 59ab6e5..90546a4 100644 --- a/tests/auto/declarative/qfxtextedit/qfxtextedit.pro +++ b/tests/auto/declarative/qfxtextedit/qfxtextedit.pro @@ -1,3 +1,6 @@ load(qttest_p4) contains(QT_CONFIG,declarative): QT += declarative gui SOURCES += tst_qfxtextedit.cpp + +# Define SRCDIR equal to test's source directory +DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/declarative/qfxtextedit/tst_qfxtextedit.cpp b/tests/auto/declarative/qfxtextedit/tst_qfxtextedit.cpp index e38e0e7..7ab598f 100644 --- a/tests/auto/declarative/qfxtextedit/tst_qfxtextedit.cpp +++ b/tests/auto/declarative/qfxtextedit/tst_qfxtextedit.cpp @@ -1,4 +1,6 @@ #include <qtest.h> +#include "../../../shared/util.h" +#include <QFile> #include <QTextDocument> #include <QtDeclarative/qmlengine.h> #include <QtDeclarative/qmlcontext.h> @@ -6,6 +8,7 @@ #include <QtDeclarative/qmlcomponent.h> #include <QtDeclarative/qfxtextedit.h> #include <QFontMetrics> +#include <QmlView> class tst_qfxtextedit : public QObject @@ -27,8 +30,12 @@ private slots: void selection(); void cursorDelegate(); + void navigation(); private: + void simulateKey(QmlView *, int key); + QmlView *createView(const QString &filename); + QStringList standard; QStringList richText; @@ -424,7 +431,6 @@ void tst_qfxtextedit::selection() QVERIFY(textEditObject->selectedText().size() == 10); } -#include <QmlView> void tst_qfxtextedit::cursorDelegate() { QmlView* view = new QmlView(0); @@ -452,6 +458,54 @@ void tst_qfxtextedit::cursorDelegate() QVERIFY(!textEditObject->findChild<QFxItem*>("cursorInstance")); } +/* +TextEdit element should only handle left/right keys until the cursor reaches +the extent of the text, then they should ignore the keys. +*/ +void tst_qfxtextedit::navigation() +{ + QmlView *canvas = createView(SRCDIR "/data/navigation.qml"); + canvas->execute(); + canvas->show(); + + QVERIFY(canvas->root() != 0); + + QFxItem *input = qobject_cast<QFxItem *>(qvariant_cast<QObject *>(canvas->root()->property("myInput"))); + + QVERIFY(input != 0); + QTRY_VERIFY(input->hasFocus() == true); + simulateKey(canvas, Qt::Key_Left); + QVERIFY(input->hasFocus() == false); + simulateKey(canvas, Qt::Key_Right); + QVERIFY(input->hasFocus() == true); + simulateKey(canvas, Qt::Key_Right); + QVERIFY(input->hasFocus() == false); + simulateKey(canvas, Qt::Key_Left); + QVERIFY(input->hasFocus() == true); +} + +void tst_qfxtextedit::simulateKey(QmlView *view, int key) +{ + QKeyEvent press(QKeyEvent::KeyPress, key, 0); + QKeyEvent release(QKeyEvent::KeyRelease, key, 0); + + QApplication::sendEvent(view, &press); + QApplication::sendEvent(view, &release); +} + +QmlView *tst_qfxtextedit::createView(const QString &filename) +{ + QmlView *canvas = new QmlView(0); + + QFile file(filename); + file.open(QFile::ReadOnly); + QString xml = file.readAll(); + canvas->setQml(xml, filename); + + return canvas; +} + + QTEST_MAIN(tst_qfxtextedit) #include "tst_qfxtextedit.moc" diff --git a/tools/qmldebugger/engine.cpp b/tools/qmldebugger/engine.cpp index fedae6b..321f5e0 100644 --- a/tools/qmldebugger/engine.cpp +++ b/tools/qmldebugger/engine.cpp @@ -180,8 +180,9 @@ EnginePane::EnginePane(QmlDebugConnection *client, QWidget *parent) QObject::connect(m_engineView->root(), SIGNAL(engineClicked(int)), this, SLOT(engineSelected(int))); QObject::connect(m_engineView->root(), SIGNAL(refreshEngines()), - this, SLOT(queryEngines())); + this, SLOT(refreshEngines())); + m_engineView->setVisible(false); layout->addWidget(m_engineView); QSplitter *splitter = new QSplitter; @@ -421,11 +422,16 @@ void EnginePane::buildTree(const QmlDebugObjectReference &obj, QTreeWidgetItem * buildTree(obj.children().at(ii), item); } -void EnginePane::queryEngines() +void EnginePane::refreshEngines() { if (m_engines) return; + QList<QmlDebugWatch *> watches = m_watchTableModel->watches(); + for (int i=0; i<watches.count(); i++) + m_client.removeWatch(watches[i]); + qDeleteAll(watches); + m_engines = m_client.queryAvailableEngines(this); if (!m_engines->isWaiting()) enginesChanged(); @@ -442,11 +448,18 @@ void EnginePane::enginesChanged() QList<QmlDebugEngineReference> engines = m_engines->engines(); delete m_engines; m_engines = 0; + if (engines.isEmpty()) + qWarning("qmldebugger: no engines found!"); + for (int ii = 0; ii < engines.count(); ++ii) m_engineItems << new DebuggerEngineItem(engines.at(ii).name(), engines.at(ii).debugId()); m_engineView->rootContext()->setContextProperty("engines", qVariantFromValue(&m_engineItems)); + + m_engineView->setVisible(m_engineItems.count() > 1); + if (m_engineItems.count() == 1) + engineSelected(qobject_cast<DebuggerEngineItem*>(m_engineItems.at(0))->engineId()); } void EnginePane::fetchObject(int id) diff --git a/tools/qmldebugger/engine.h b/tools/qmldebugger/engine.h index 62fc6fb..c7707ed 100644 --- a/tools/qmldebugger/engine.h +++ b/tools/qmldebugger/engine.h @@ -32,8 +32,10 @@ Q_OBJECT public: EnginePane(QmlDebugConnection *, QWidget *parent = 0); +public slots: + void refreshEngines(); + private slots: - void queryEngines(); void enginesChanged(); void queryContext(int); diff --git a/tools/qmldebugger/main.cpp b/tools/qmldebugger/main.cpp index a37a437..7fabfb7 100644 --- a/tools/qmldebugger/main.cpp +++ b/tools/qmldebugger/main.cpp @@ -7,6 +7,7 @@ #include <QtCore/qdebug.h> #include <QtCore/qstringlist.h> #include <QtCore/qdatastream.h> +#include <QtCore/qtimer.h> #include "canvasframerate.h" #include "engine.h" #include <QVBoxLayout> @@ -35,6 +36,8 @@ private: QSpinBox *m_port; QPushButton *m_connectButton; QPushButton *m_disconnectButton; + + EnginePane *m_enginePane; }; Shell::Shell(QWidget *parent) @@ -74,8 +77,8 @@ Shell::Shell(QWidget *parent) CanvasFrameRate *cfr = new CanvasFrameRate(&client, this); tabs->addTab(cfr, tr("Frame Rate")); - EnginePane *ep = new EnginePane(&client, this); - tabs->addTab(ep, tr("QML Engine")); + m_enginePane = new EnginePane(&client, this); + tabs->addTab(m_enginePane, tr("QML Engine")); QObject::connect(&client, SIGNAL(stateChanged(QAbstractSocket::SocketState)), this, SLOT(connectionStateChanged())); connectionStateChanged(); @@ -104,6 +107,8 @@ void Shell::connectionStateChanged() m_connectionState->setText(tr("Connected")); m_connectButton->setEnabled(false); m_disconnectButton->setEnabled(true); + + QTimer::singleShot(0, m_enginePane, SLOT(refreshEngines())); break; case QAbstractSocket::ClosingState: m_connectionState->setText(tr("Closing")); diff --git a/tools/qmldebugger/watchtablemodel.cpp b/tools/qmldebugger/watchtablemodel.cpp index 2fed199..9d3ca1e 100644 --- a/tools/qmldebugger/watchtablemodel.cpp +++ b/tools/qmldebugger/watchtablemodel.cpp @@ -87,6 +87,14 @@ QmlDebugWatch *WatchTableModel::findWatch(int objectDebugId, const QString &prop return 0; } +QList<QmlDebugWatch *> WatchTableModel::watches() const +{ + QList<QmlDebugWatch *> watches; + for (int i=0; i<m_columns.count(); i++) + watches << m_columns[i].watch; + return watches; +} + int WatchTableModel::rowCount(const QModelIndex &) const { return m_values.count(); diff --git a/tools/qmldebugger/watchtablemodel.h b/tools/qmldebugger/watchtablemodel.h index ee99920..306b9d8 100644 --- a/tools/qmldebugger/watchtablemodel.h +++ b/tools/qmldebugger/watchtablemodel.h @@ -22,6 +22,8 @@ public: QmlDebugWatch *findWatch(int column) const; QmlDebugWatch *findWatch(int objectDebugId, const QString &property) const; + QList<QmlDebugWatch *> watches() const; + int rowCount(const QModelIndex &parent = QModelIndex()) const; int columnCount(const QModelIndex &parent = QModelIndex()) const; QVariant headerData(int section, Qt::Orientation orientation, int role) const; diff --git a/tools/qmlviewer/qmlviewer.cpp b/tools/qmlviewer/qmlviewer.cpp index 49b91af..b2884dd 100644 --- a/tools/qmlviewer/qmlviewer.cpp +++ b/tools/qmlviewer/qmlviewer.cpp @@ -586,7 +586,7 @@ void QmlViewer::reload() void QmlViewer::open() { - QString fileName = QFileDialog::getOpenFileName(this, tr("Open QML file"), "", tr("QML Files (*.qml)")); + QString fileName = QFileDialog::getOpenFileName(this, tr("Open QML file"), currentFileName, tr("QML Files (*.qml)")); if (!fileName.isEmpty()) { openQml(fileName); QTimer::singleShot(0, this, SLOT(reload())); @@ -649,6 +649,7 @@ void QmlViewer::openQml(const QString& fileName) qWarning() << "Wall startup time:" << t.elapsed(); if (!skin) { + canvas->updateGeometry(); canvas->resize(canvas->sizeHint()); resize(sizeHint()); } else { |