summaryrefslogtreecommitdiff
path: root/src/libs/qmljs
diff options
context:
space:
mode:
authorChristian Kamm <christian.d.kamm@nokia.com>2011-12-07 11:16:26 +0100
committerChristian Kamm <christian.d.kamm@nokia.com>2011-12-07 11:24:59 +0100
commit67dd062a318a731f88164e644a1ad38c831abb80 (patch)
tree3e28b88e2a015a0c4ea2a5e00a35f1d91c61e428 /src/libs/qmljs
parent72c06cb6fd16798771871ef38d32bcaaddb12beb (diff)
downloadqt-creator-67dd062a318a731f88164e644a1ad38c831abb80.tar.gz
QmlJS: Merge new parser from Qt 5.
Change-Id: I986df52b7ddb31e3bae1148eda881acc1829b102 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Diffstat (limited to 'src/libs/qmljs')
-rwxr-xr-xsrc/libs/qmljs/parser/gen-parser.sh2
-rw-r--r--src/libs/qmljs/parser/parser.pri2
-rw-r--r--src/libs/qmljs/parser/qmldirparser.cpp6
-rw-r--r--src/libs/qmljs/parser/qmldirparser_p.h4
-rw-r--r--src/libs/qmljs/parser/qmljs.g13
-rw-r--r--src/libs/qmljs/parser/qmljsast.cpp25
-rw-r--r--src/libs/qmljs/parser/qmljsast_p.h505
-rw-r--r--src/libs/qmljs/parser/qmljsastfwd_p.h3
-rw-r--r--src/libs/qmljs/parser/qmljsastvisitor_p.h6
-rw-r--r--src/libs/qmljs/parser/qmljsglobal_p.h7
-rw-r--r--src/libs/qmljs/parser/qmljsgrammar.cpp1650
-rw-r--r--src/libs/qmljs/parser/qmljsgrammar_p.h12
-rw-r--r--src/libs/qmljs/parser/qmljslexer.cpp10
-rw-r--r--src/libs/qmljs/parser/qmljslexer_p.h7
-rw-r--r--src/libs/qmljs/parser/qmljsparser.cpp399
-rw-r--r--src/libs/qmljs/parser/qmljsparser_p.h7
-rw-r--r--src/libs/qmljs/qmljsevaluate.cpp15
-rw-r--r--src/libs/qmljs/qmljsevaluate.h3
18 files changed, 1366 insertions, 1310 deletions
diff --git a/src/libs/qmljs/parser/gen-parser.sh b/src/libs/qmljs/parser/gen-parser.sh
index 62c17bfef2..1a25796c71 100755
--- a/src/libs/qmljs/parser/gen-parser.sh
+++ b/src/libs/qmljs/parser/gen-parser.sh
@@ -15,7 +15,7 @@ perl -p -0777 -i -e 's/QT_BEGIN_NAMESPACE\n\nclass QmlError;\nclass QmlDirParser
# export QmlJSGrammar
perl -p -0777 -i -e 's/#include <QtCore\/qglobal.h>\n\nQT_BEGIN_NAMESPACE\n\nclass QmlJSGrammar\n/#include "qmljsglobal_p.h"\n#include <QtCore\/qglobal.h>\n\nQT_BEGIN_NAMESPACE\n\nclass QML_PARSER_EXPORT QmlJSGrammar\n/' qmljsgrammar_p.h
# replace qmlglobal_p.h include with needed declaration
-perl -p -0777 -i -e 's/#include \<qmlglobal_p.h\>/bool Qml_isFileCaseCorrect(const QString &) { return true; }/' qmldirparser.cpp
+perl -p -0777 -i -e 's/#include \"qmlglobal_p.h\"/bool Qml_isFileCaseCorrect(const QString &) { return true; }/' qmldirparser.cpp
./changeLicense.py $me/../qmljs_global.h qml*.{cpp,h}
diff --git a/src/libs/qmljs/parser/parser.pri b/src/libs/qmljs/parser/parser.pri
index 1b8851fd62..966570d1e3 100644
--- a/src/libs/qmljs/parser/parser.pri
+++ b/src/libs/qmljs/parser/parser.pri
@@ -1,5 +1,3 @@
-INCLUDEPATH += $$PWD
-
HEADERS += \
$$PWD/qmljsast_p.h \
$$PWD/qmljsastfwd_p.h \
diff --git a/src/libs/qmljs/parser/qmldirparser.cpp b/src/libs/qmljs/parser/qmldirparser.cpp
index b03627cd1c..c7e753e1a3 100644
--- a/src/libs/qmljs/parser/qmldirparser.cpp
+++ b/src/libs/qmljs/parser/qmldirparser.cpp
@@ -177,7 +177,7 @@ bool QmlDirParser::parse()
QString::fromUtf8("internal types require 2 arguments, but %1 were provided").arg(sectionCount - 1));
continue;
}
- Component entry(sections[1].toUtf8(), sections[2], -1, -1);
+ Component entry(sections[1], sections[2], -1, -1);
entry.internal = true;
_components.append(entry);
} else if (sections[0] == QLatin1String("typeinfo")) {
@@ -193,7 +193,7 @@ bool QmlDirParser::parse()
} else if (sectionCount == 2) {
// No version specified (should only be used for relative qmldir files)
- const Component entry(sections[0].toUtf8(), sections[1], -1, -1);
+ const Component entry(sections[0], sections[1], -1, -1);
_components.append(entry);
} else if (sectionCount == 3) {
const QString &version = sections[1];
@@ -211,7 +211,7 @@ bool QmlDirParser::parse()
const int minorVersion = version.mid(dotIndex + 1).toInt(&validVersionNumber);
if (validVersionNumber) {
- const Component entry(sections[0].toUtf8(), sections[2], majorVersion, minorVersion);
+ const Component entry(sections[0], sections[2], majorVersion, minorVersion);
_components.append(entry);
}
diff --git a/src/libs/qmljs/parser/qmldirparser_p.h b/src/libs/qmljs/parser/qmldirparser_p.h
index fba6ebbef9..15996611af 100644
--- a/src/libs/qmljs/parser/qmldirparser_p.h
+++ b/src/libs/qmljs/parser/qmldirparser_p.h
@@ -91,11 +91,11 @@ public:
Component()
: majorVersion(0), minorVersion(0), internal(false) {}
- Component(const QByteArray &typeName, const QString &fileName, int majorVersion, int minorVersion)
+ Component(const QString &typeName, const QString &fileName, int majorVersion, int minorVersion)
: typeName(typeName), fileName(fileName), majorVersion(majorVersion), minorVersion(minorVersion),
internal(false) {}
- QByteArray typeName;
+ QString typeName;
QString fileName;
int majorVersion;
int minorVersion;
diff --git a/src/libs/qmljs/parser/qmljs.g b/src/libs/qmljs/parser/qmljs.g
index 832d7b15d1..784e47fc9e 100644
--- a/src/libs/qmljs/parser/qmljs.g
+++ b/src/libs/qmljs/parser/qmljs.g
@@ -246,9 +246,6 @@ public:
AST::UiObjectMemberList *UiObjectMemberList;
AST::UiArrayMemberList *UiArrayMemberList;
AST::UiQualifiedId *UiQualifiedId;
- AST::UiSignature *UiSignature;
- AST::UiFormalList *UiFormalList;
- AST::UiFormal *UiFormal;
};
public:
@@ -781,7 +778,10 @@ case $rule_number: {
UiScriptStatement: Block ;
UiScriptStatement: EmptyStatement ;
UiScriptStatement: ExpressionStatement ;
-UiScriptStatement: IfStatement ; --- ### do we really want if statement in a binding?
+UiScriptStatement: IfStatement ;
+UiScriptStatement: WithStatement ;
+UiScriptStatement: SwitchStatement ;
+UiScriptStatement: TryStatement ;
UiObjectMember: UiQualifiedId T_COLON UiScriptStatement ;
/.
@@ -816,6 +816,7 @@ UiParameterList: UiPropertyType JsIdentifier ;
/.
case $rule_number: {
AST::UiParameterList *node = new (pool) AST::UiParameterList(stringRef(1), stringRef(2));
+ node->propertyTypeToken = loc(1);
node->identifierToken = loc(2);
sym(1).Node = node;
} break;
@@ -1100,6 +1101,7 @@ case $rule_number: {
}
loc(1).length = lexer->tokenLength();
+ yylloc = loc(1); // adjust the location of the current token
AST::RegExpLiteral *node = new (pool) AST::RegExpLiteral(
driver->newStringRef(lexer->regExpPattern()), lexer->regExpFlags());
@@ -1121,6 +1123,7 @@ case $rule_number: {
}
loc(1).length = lexer->tokenLength();
+ yylloc = loc(1); // adjust the location of the current token
AST::RegExpLiteral *node = new (pool) AST::RegExpLiteral(
driver->newStringRef(lexer->regExpPattern()), lexer->regExpFlags());
@@ -2810,6 +2813,8 @@ case $rule_number: {
} break;
./
+Program: Empty ;
+
Program: SourceElements ;
/.
case $rule_number: {
diff --git a/src/libs/qmljs/parser/qmljsast.cpp b/src/libs/qmljs/parser/qmljsast.cpp
index 07cad8f740..b96b428adf 100644
--- a/src/libs/qmljs/parser/qmljsast.cpp
+++ b/src/libs/qmljs/parser/qmljsast.cpp
@@ -799,31 +799,6 @@ void UiProgram::accept0(Visitor *visitor)
visitor->endVisit(this);
}
-void UiSignature::accept0(Visitor *visitor)
-{
- if (visitor->visit(this)) {
- accept(formals, visitor);
- }
- visitor->endVisit(this);
-}
-
-void UiFormalList::accept0(Visitor *visitor)
-{
- if (visitor->visit(this)) {
- for (UiFormalList *it = this; it; it = it->next) {
- accept(it->formal, visitor);
- }
- }
- visitor->endVisit(this);
-}
-
-void UiFormal::accept0(Visitor *visitor)
-{
- if (visitor->visit(this)) {
- }
- visitor->endVisit(this);
-}
-
void UiPublicMember::accept0(Visitor *visitor)
{
if (visitor->visit(this)) {
diff --git a/src/libs/qmljs/parser/qmljsast_p.h b/src/libs/qmljs/parser/qmljsast_p.h
index b6fa65f4c6..6c40e0da3a 100644
--- a/src/libs/qmljs/parser/qmljsast_p.h
+++ b/src/libs/qmljs/parser/qmljsast_p.h
@@ -207,10 +207,7 @@ public:
Kind_UiPublicMember,
Kind_UiQualifiedId,
Kind_UiScriptBinding,
- Kind_UiSourceElement,
- Kind_UiFormal,
- Kind_UiFormalList,
- Kind_UiSignature
+ Kind_UiSourceElement
};
inline Node()
@@ -233,6 +230,8 @@ public:
{ return accept(node, visitor); } // ### remove
virtual void accept0(Visitor *visitor) = 0;
+ virtual SourceLocation firstSourceLocation() const = 0;
+ virtual SourceLocation lastSourceLocation() const = 0;
// attributes
int kind;
@@ -244,9 +243,6 @@ public:
ExpressionNode() {}
virtual ExpressionNode *expressionCast();
-
- virtual SourceLocation firstSourceLocation() const = 0;
- virtual SourceLocation lastSourceLocation() const = 0;
};
class QML_PARSER_EXPORT Statement: public Node
@@ -255,92 +251,6 @@ public:
Statement() {}
virtual Statement *statementCast();
-
- virtual SourceLocation firstSourceLocation() const = 0;
- virtual SourceLocation lastSourceLocation() const = 0;
-};
-
-class QML_PARSER_EXPORT UiFormal: public Node
-{
-public:
- QMLJS_DECLARE_AST_NODE(UiFormal)
-
- UiFormal(const QStringRef &name, const QStringRef &alias)
- : name(name), alias(alias)
- { }
-
- virtual SourceLocation firstSourceLocation() const
- { return SourceLocation(); }
-
- virtual SourceLocation lastSourceLocation() const
- { return SourceLocation(); }
-
- virtual void accept0(Visitor *visitor);
-
-// attributes
- QStringRef name;
- QStringRef alias;
- SourceLocation identifierToken;
- SourceLocation asToken;
- SourceLocation aliasToken;
-};
-
-class QML_PARSER_EXPORT UiFormalList: public Node
-{
-public:
- QMLJS_DECLARE_AST_NODE(UiFormalList)
-
- UiFormalList(UiFormal *formal)
- : formal(formal), next(this) {}
-
- UiFormalList(UiFormalList *previous, UiFormal *formal)
- : formal(formal)
- {
- next = previous->next;
- previous->next = this;
- }
-
- UiFormalList *finish()
- {
- UiFormalList *head = next;
- next = 0;
- return head;
- }
-
- virtual SourceLocation firstSourceLocation() const
- { return SourceLocation(); }
-
- virtual SourceLocation lastSourceLocation() const
- { return SourceLocation(); }
-
- virtual void accept0(Visitor *visitor);
-
-// attributes
- UiFormal *formal;
- UiFormalList *next;
-};
-
-class QML_PARSER_EXPORT UiSignature: public Node
-{
-public:
- QMLJS_DECLARE_AST_NODE(UiSignature)
-
- UiSignature(UiFormalList *formals = 0)
- : formals(formals)
- { }
-
- virtual SourceLocation firstSourceLocation() const
- { return SourceLocation(); }
-
- virtual SourceLocation lastSourceLocation() const
- { return SourceLocation(); }
-
- virtual void accept0(Visitor *visitor);
-
-// attributes
- SourceLocation lparenToken;
- UiFormalList *formals;
- SourceLocation rparenToken;
};
class QML_PARSER_EXPORT NestedExpression: public ExpressionNode
@@ -585,6 +495,41 @@ public:
SourceLocation rbraceToken;
};
+class QML_PARSER_EXPORT Elision: public Node
+{
+public:
+ QMLJS_DECLARE_AST_NODE(Elision)
+
+ Elision():
+ next (this) { kind = K; }
+
+ Elision(Elision *previous)
+ {
+ kind = K;
+ next = previous->next;
+ previous->next = this;
+ }
+
+ virtual void accept0(Visitor *visitor);
+
+ virtual SourceLocation firstSourceLocation() const
+ { return commaToken; }
+
+ virtual SourceLocation lastSourceLocation() const
+ { return next ? next->lastSourceLocation() : commaToken; }
+
+ inline Elision *finish ()
+ {
+ Elision *front = next;
+ next = 0;
+ return front;
+ }
+
+// attributes
+ Elision *next;
+ SourceLocation commaToken;
+};
+
class QML_PARSER_EXPORT ElementList: public Node
{
public:
@@ -611,6 +556,20 @@ public:
virtual void accept0(Visitor *visitor);
+ virtual SourceLocation firstSourceLocation() const
+ {
+ if (elision)
+ return elision->firstSourceLocation();
+ return expression->firstSourceLocation();
+ }
+
+ virtual SourceLocation lastSourceLocation() const
+ {
+ if (next)
+ return next->lastSourceLocation();
+ return expression->lastSourceLocation();
+ }
+
// attributes
Elision *elision;
ExpressionNode *expression;
@@ -618,33 +577,21 @@ public:
SourceLocation commaToken;
};
-class QML_PARSER_EXPORT Elision: public Node
+class QML_PARSER_EXPORT PropertyName: public Node
{
public:
- QMLJS_DECLARE_AST_NODE(Elision)
-
- Elision():
- next (this) { kind = K; }
+ QMLJS_DECLARE_AST_NODE(PropertyName)
- Elision(Elision *previous)
- {
- kind = K;
- next = previous->next;
- previous->next = this;
- }
+ PropertyName() { kind = K; }
- virtual void accept0(Visitor *visitor);
+ virtual SourceLocation firstSourceLocation() const
+ { return propertyNameToken; }
- inline Elision *finish ()
- {
- Elision *front = next;
- next = 0;
- return front;
- }
+ virtual SourceLocation lastSourceLocation() const
+ { return propertyNameToken; }
// attributes
- Elision *next;
- SourceLocation commaToken;
+ SourceLocation propertyNameToken;
};
class QML_PARSER_EXPORT PropertyNameAndValueList: public Node
@@ -666,6 +613,16 @@ public:
virtual void accept0(Visitor *visitor);
+ virtual SourceLocation firstSourceLocation() const
+ { return name->firstSourceLocation(); }
+
+ virtual SourceLocation lastSourceLocation() const
+ {
+ if (next)
+ return next->lastSourceLocation();
+ return value->lastSourceLocation();
+ }
+
inline PropertyNameAndValueList *finish ()
{
PropertyNameAndValueList *front = next;
@@ -681,17 +638,6 @@ public:
SourceLocation commaToken;
};
-class QML_PARSER_EXPORT PropertyName: public Node
-{
-public:
- QMLJS_DECLARE_AST_NODE(PropertyName)
-
- PropertyName() { kind = K; }
-
-// attributes
- SourceLocation propertyNameToken;
-};
-
class QML_PARSER_EXPORT IdentifierPropertyName: public PropertyName
{
public:
@@ -871,6 +817,16 @@ public:
virtual void accept0(Visitor *visitor);
+ virtual SourceLocation firstSourceLocation() const
+ { return expression->firstSourceLocation(); }
+
+ virtual SourceLocation lastSourceLocation() const
+ {
+ if (next)
+ return next->lastSourceLocation();
+ return expression->lastSourceLocation();
+ }
+
inline ArgumentList *finish ()
{
ArgumentList *front = next;
@@ -1229,6 +1185,12 @@ public:
virtual void accept0(Visitor *visitor);
+ virtual SourceLocation firstSourceLocation() const
+ { return statement->firstSourceLocation(); }
+
+ virtual SourceLocation lastSourceLocation() const
+ { return next ? next->lastSourceLocation() : statement->lastSourceLocation(); }
+
inline StatementList *finish ()
{
StatementList *front = next;
@@ -1275,6 +1237,12 @@ public:
virtual void accept0(Visitor *visitor);
+ virtual SourceLocation firstSourceLocation() const
+ { return identifierToken; }
+
+ virtual SourceLocation lastSourceLocation() const
+ { return expression ? expression->lastSourceLocation() : identifierToken; }
+
// attributes
QStringRef name;
ExpressionNode *expression;
@@ -1301,6 +1269,16 @@ public:
virtual void accept0(Visitor *visitor);
+ virtual SourceLocation firstSourceLocation() const
+ { return declaration->firstSourceLocation(); }
+
+ virtual SourceLocation lastSourceLocation() const
+ {
+ if (next)
+ return next->lastSourceLocation();
+ return declaration->lastSourceLocation();
+ }
+
inline VariableDeclarationList *finish (bool readOnly)
{
VariableDeclarationList *front = next;
@@ -1661,6 +1639,12 @@ public:
virtual void accept0(Visitor *visitor);
+ virtual SourceLocation firstSourceLocation() const
+ { return lbraceToken; }
+
+ virtual SourceLocation lastSourceLocation() const
+ { return rbraceToken; }
+
// attributes
CaseClauses *clauses;
DefaultClause *defaultClause;
@@ -1694,6 +1678,30 @@ public:
SourceLocation rparenToken;
};
+class QML_PARSER_EXPORT CaseClause: public Node
+{
+public:
+ QMLJS_DECLARE_AST_NODE(CaseClause)
+
+ CaseClause(ExpressionNode *e, StatementList *slist):
+ expression (e), statements (slist)
+ { kind = K; }
+
+ virtual void accept0(Visitor *visitor);
+
+ virtual SourceLocation firstSourceLocation() const
+ { return caseToken; }
+
+ virtual SourceLocation lastSourceLocation() const
+ { return statements ? statements->lastSourceLocation() : colonToken; }
+
+// attributes
+ ExpressionNode *expression;
+ StatementList *statements;
+ SourceLocation caseToken;
+ SourceLocation colonToken;
+};
+
class QML_PARSER_EXPORT CaseClauses: public Node
{
public:
@@ -1713,6 +1721,12 @@ public:
virtual void accept0(Visitor *visitor);
+ virtual SourceLocation firstSourceLocation() const
+ { return clause->firstSourceLocation(); }
+
+ virtual SourceLocation lastSourceLocation() const
+ { return next ? next->lastSourceLocation() : clause->lastSourceLocation(); }
+
inline CaseClauses *finish ()
{
CaseClauses *front = next;
@@ -1725,24 +1739,6 @@ public:
CaseClauses *next;
};
-class QML_PARSER_EXPORT CaseClause: public Node
-{
-public:
- QMLJS_DECLARE_AST_NODE(CaseClause)
-
- CaseClause(ExpressionNode *e, StatementList *slist):
- expression (e), statements (slist)
- { kind = K; }
-
- virtual void accept0(Visitor *visitor);
-
-// attributes
- ExpressionNode *expression;
- StatementList *statements;
- SourceLocation caseToken;
- SourceLocation colonToken;
-};
-
class QML_PARSER_EXPORT DefaultClause: public Node
{
public:
@@ -1754,6 +1750,12 @@ public:
virtual void accept0(Visitor *visitor);
+ virtual SourceLocation firstSourceLocation() const
+ { return defaultToken; }
+
+ virtual SourceLocation lastSourceLocation() const
+ { return statements ? statements->lastSourceLocation() : colonToken; }
+
// attributes
StatementList *statements;
SourceLocation defaultToken;
@@ -1817,6 +1819,12 @@ public:
virtual void accept0(Visitor *visitor);
+ virtual SourceLocation firstSourceLocation() const
+ { return catchToken; }
+
+ virtual SourceLocation lastSourceLocation() const
+ { return statement->lastSourceLocation(); }
+
// attributes
QStringRef name;
Block *statement;
@@ -1837,6 +1845,12 @@ public:
virtual void accept0(Visitor *visitor);
+ virtual SourceLocation firstSourceLocation() const
+ { return finallyToken; }
+
+ virtual SourceLocation lastSourceLocation() const
+ { return statement ? statement->lastSourceLocation() : finallyToken; }
+
// attributes
Block *statement;
SourceLocation finallyToken;
@@ -1941,6 +1955,12 @@ public:
virtual void accept0(Visitor *visitor);
+ virtual SourceLocation firstSourceLocation() const
+ { return identifierToken; }
+
+ virtual SourceLocation lastSourceLocation() const
+ { return next ? next->lastSourceLocation() : identifierToken; }
+
inline FormalParameterList *finish ()
{
FormalParameterList *front = next;
@@ -1955,34 +1975,13 @@ public:
SourceLocation identifierToken;
};
-class QML_PARSER_EXPORT FunctionBody: public Node
-{
-public:
- QMLJS_DECLARE_AST_NODE(FunctionBody)
-
- FunctionBody(SourceElements *elts):
- elements (elts)
- { kind = K; }
-
- virtual void accept0(Visitor *visitor);
-
-// attributes
- SourceElements *elements;
-};
-
-class QML_PARSER_EXPORT Program: public Node
+class QML_PARSER_EXPORT SourceElement: public Node
{
public:
- QMLJS_DECLARE_AST_NODE(Program)
+ QMLJS_DECLARE_AST_NODE(SourceElement)
- Program(SourceElements *elts):
- elements (elts)
+ inline SourceElement()
{ kind = K; }
-
- virtual void accept0(Visitor *visitor);
-
-// attributes
- SourceElements *elements;
};
class QML_PARSER_EXPORT SourceElements: public Node
@@ -2004,6 +2003,12 @@ public:
virtual void accept0(Visitor *visitor);
+ virtual SourceLocation firstSourceLocation() const
+ { return element->firstSourceLocation(); }
+
+ virtual SourceLocation lastSourceLocation() const
+ { return next ? next->lastSourceLocation() : element->lastSourceLocation(); }
+
inline SourceElements *finish ()
{
SourceElements *front = next;
@@ -2016,13 +2021,46 @@ public:
SourceElements *next;
};
-class QML_PARSER_EXPORT SourceElement: public Node
+class QML_PARSER_EXPORT FunctionBody: public Node
{
public:
- QMLJS_DECLARE_AST_NODE(SourceElement)
+ QMLJS_DECLARE_AST_NODE(FunctionBody)
- inline SourceElement()
+ FunctionBody(SourceElements *elts):
+ elements (elts)
+ { kind = K; }
+
+ virtual void accept0(Visitor *visitor);
+
+ virtual SourceLocation firstSourceLocation() const
+ { return elements ? elements->firstSourceLocation() : SourceLocation(); }
+
+ virtual SourceLocation lastSourceLocation() const
+ { return elements ? elements->lastSourceLocation() : SourceLocation(); }
+
+// attributes
+ SourceElements *elements;
+};
+
+class QML_PARSER_EXPORT Program: public Node
+{
+public:
+ QMLJS_DECLARE_AST_NODE(Program)
+
+ Program(SourceElements *elts):
+ elements (elts)
{ kind = K; }
+
+ virtual void accept0(Visitor *visitor);
+
+ virtual SourceLocation firstSourceLocation() const
+ { return elements ? elements->firstSourceLocation() : SourceLocation(); }
+
+ virtual SourceLocation lastSourceLocation() const
+ { return elements ? elements->lastSourceLocation() : SourceLocation(); }
+
+// attributes
+ SourceElements *elements;
};
class QML_PARSER_EXPORT FunctionSourceElement: public SourceElement
@@ -2036,6 +2074,12 @@ public:
virtual void accept0(Visitor *visitor);
+ virtual SourceLocation firstSourceLocation() const
+ { return declaration->firstSourceLocation(); }
+
+ virtual SourceLocation lastSourceLocation() const
+ { return declaration->lastSourceLocation(); }
+
// attributes
FunctionDeclaration *declaration;
};
@@ -2051,6 +2095,12 @@ public:
virtual void accept0(Visitor *visitor);
+ virtual SourceLocation firstSourceLocation() const
+ { return statement->firstSourceLocation(); }
+
+ virtual SourceLocation lastSourceLocation() const
+ { return statement->lastSourceLocation(); }
+
// attributes
Statement *statement;
};
@@ -2076,22 +2126,6 @@ public:
SourceLocation semicolonToken;
};
-class QML_PARSER_EXPORT UiProgram: public Node
-{
-public:
- QMLJS_DECLARE_AST_NODE(UiProgram)
-
- UiProgram(UiImportList *imports, UiObjectMemberList *members)
- : imports(imports), members(members)
- { kind = K; }
-
- virtual void accept0(Visitor *visitor);
-
-// attributes
- UiImportList *imports;
- UiObjectMemberList *members;
-};
-
class QML_PARSER_EXPORT UiQualifiedId: public Node
{
public:
@@ -2118,6 +2152,12 @@ public:
virtual void accept0(Visitor *visitor);
+ virtual SourceLocation firstSourceLocation() const
+ { return identifierToken; }
+
+ virtual SourceLocation lastSourceLocation() const
+ { return next ? next->lastSourceLocation() : identifierToken; }
+
// attributes
UiQualifiedId *next;
QStringRef name;
@@ -2137,14 +2177,14 @@ public:
: importUri(uri)
{ kind = K; }
+ virtual void accept0(Visitor *visitor);
+
virtual SourceLocation firstSourceLocation() const
{ return importToken; }
virtual SourceLocation lastSourceLocation() const
{ return semicolonToken; }
- virtual void accept0(Visitor *visitor);
-
// attributes
QStringRef fileName;
UiQualifiedId *importUri;
@@ -2175,21 +2215,6 @@ public:
previous->next = this;
}
- virtual SourceLocation firstSourceLocation() const
- {
- if (import) return import->firstSourceLocation();
- else return SourceLocation();
- }
-
- virtual SourceLocation lastSourceLocation() const
- {
- for (const UiImportList *it = this; it; it = it->next)
- if (!it->next && it->import)
- return it->import->lastSourceLocation();
-
- return SourceLocation();
- }
-
UiImportList *finish()
{
UiImportList *head = next;
@@ -2199,6 +2224,12 @@ public:
virtual void accept0(Visitor *visitor);
+ virtual SourceLocation firstSourceLocation() const
+ { return import->firstSourceLocation(); }
+
+ virtual SourceLocation lastSourceLocation() const
+ { return next ? next->lastSourceLocation() : import->lastSourceLocation(); }
+
// attributes
UiImport *import;
UiImportList *next;
@@ -2232,6 +2263,12 @@ public:
virtual void accept0(Visitor *visitor);
+ virtual SourceLocation firstSourceLocation() const
+ { return member->firstSourceLocation(); }
+
+ virtual SourceLocation lastSourceLocation() const
+ { return next ? next->lastSourceLocation() : member->lastSourceLocation(); }
+
UiObjectMemberList *finish()
{
UiObjectMemberList *head = next;
@@ -2244,6 +2281,40 @@ public:
UiObjectMember *member;
};
+class QML_PARSER_EXPORT UiProgram: public Node
+{
+public:
+ QMLJS_DECLARE_AST_NODE(UiProgram)
+
+ UiProgram(UiImportList *imports, UiObjectMemberList *members)
+ : imports(imports), members(members)
+ { kind = K; }
+
+ virtual void accept0(Visitor *visitor);
+
+ virtual SourceLocation firstSourceLocation() const
+ {
+ if (imports)
+ return imports->firstSourceLocation();
+ else if (members)
+ return members->firstSourceLocation();
+ return SourceLocation();
+ }
+
+ virtual SourceLocation lastSourceLocation() const
+ {
+ if (members)
+ return members->lastSourceLocation();
+ else if (imports)
+ return imports->lastSourceLocation();
+ return SourceLocation();
+ }
+
+// attributes
+ UiImportList *imports;
+ UiObjectMemberList *members;
+};
+
class QML_PARSER_EXPORT UiArrayMemberList: public Node
{
public:
@@ -2263,6 +2334,12 @@ public:
virtual void accept0(Visitor *visitor);
+ virtual SourceLocation firstSourceLocation() const
+ { return member->firstSourceLocation(); }
+
+ virtual SourceLocation lastSourceLocation() const
+ { return next ? next->lastSourceLocation() : member->lastSourceLocation(); }
+
UiArrayMemberList *finish()
{
UiArrayMemberList *head = next;
@@ -2287,6 +2364,12 @@ public:
virtual void accept0(Visitor *visitor);
+ virtual SourceLocation firstSourceLocation() const
+ { return lbraceToken; }
+
+ virtual SourceLocation lastSourceLocation() const
+ { return rbraceToken; }
+
// attributes
SourceLocation lbraceToken;
UiObjectMemberList *members;
@@ -2312,6 +2395,12 @@ public:
virtual void accept0(Visitor *) {}
+ virtual SourceLocation firstSourceLocation() const
+ { return propertyTypeToken; }
+
+ virtual SourceLocation lastSourceLocation() const
+ { return next ? next->lastSourceLocation() : identifierToken; }
+
inline UiParameterList *finish ()
{
UiParameterList *front = next;
@@ -2324,6 +2413,7 @@ public:
QStringRef name;
UiParameterList *next;
SourceLocation commaToken;
+ SourceLocation propertyTypeToken;
SourceLocation identifierToken;
};
@@ -2343,6 +2433,8 @@ public:
: type(Property), memberType(memberType), name(name), statement(statement), binding(0), isDefaultMember(false), isReadonlyMember(false), parameters(0)
{ kind = K; }
+ virtual void accept0(Visitor *visitor);
+
virtual SourceLocation firstSourceLocation() const
{
if (defaultToken.isValid())
@@ -2363,8 +2455,6 @@ public:
return semicolonToken;
}
- virtual void accept0(Visitor *visitor);
-
// attributes
enum { Signal, Property } type;
QStringRef typeModifier;
@@ -2395,14 +2485,14 @@ public:
: qualifiedTypeNameId(qualifiedTypeNameId), initializer(initializer)
{ kind = K; }
+ virtual void accept0(Visitor *visitor);
+
virtual SourceLocation firstSourceLocation() const
{ return qualifiedTypeNameId->identifierToken; }
virtual SourceLocation lastSourceLocation() const
{ return initializer->rbraceToken; }
- virtual void accept0(Visitor *visitor);
-
// attributes
UiQualifiedId *qualifiedTypeNameId;
UiObjectInitializer *initializer;
@@ -2437,9 +2527,9 @@ public:
return SourceLocation();
}
-
virtual void accept0(Visitor *visitor);
+
// attributes
Node *sourceElement;
};
@@ -2471,6 +2561,7 @@ public:
virtual void accept0(Visitor *visitor);
+
// attributes
UiQualifiedId *qualifiedId;
UiQualifiedId *qualifiedTypeNameId;
diff --git a/src/libs/qmljs/parser/qmljsastfwd_p.h b/src/libs/qmljs/parser/qmljsastfwd_p.h
index 31040d152d..a60ab8dd24 100644
--- a/src/libs/qmljs/parser/qmljsastfwd_p.h
+++ b/src/libs/qmljs/parser/qmljsastfwd_p.h
@@ -169,9 +169,6 @@ class UiObjectMember;
class UiObjectMemberList;
class UiArrayMemberList;
class UiQualifiedId;
-class UiFormalList;
-class UiFormal;
-class UiSignature;
} } // namespace AST
diff --git a/src/libs/qmljs/parser/qmljsastvisitor_p.h b/src/libs/qmljs/parser/qmljsastvisitor_p.h
index 7c3f83df4e..bac1fdd8ec 100644
--- a/src/libs/qmljs/parser/qmljsastvisitor_p.h
+++ b/src/libs/qmljs/parser/qmljsastvisitor_p.h
@@ -74,9 +74,6 @@ public:
virtual bool visit(UiObjectMemberList *) { return true; }
virtual bool visit(UiArrayMemberList *) { return true; }
virtual bool visit(UiQualifiedId *) { return true; }
- virtual bool visit(UiSignature *) { return true; }
- virtual bool visit(UiFormalList *) { return true; }
- virtual bool visit(UiFormal *) { return true; }
virtual void endVisit(UiProgram *) {}
virtual void endVisit(UiImportList *) {}
@@ -91,9 +88,6 @@ public:
virtual void endVisit(UiObjectMemberList *) {}
virtual void endVisit(UiArrayMemberList *) {}
virtual void endVisit(UiQualifiedId *) {}
- virtual void endVisit(UiSignature *) {}
- virtual void endVisit(UiFormalList *) {}
- virtual void endVisit(UiFormal *) {}
// QmlJS
virtual bool visit(ThisExpression *) { return true; }
diff --git a/src/libs/qmljs/parser/qmljsglobal_p.h b/src/libs/qmljs/parser/qmljsglobal_p.h
index bbbf8bf2f7..ca89864939 100644
--- a/src/libs/qmljs/parser/qmljsglobal_p.h
+++ b/src/libs/qmljs/parser/qmljsglobal_p.h
@@ -49,7 +49,12 @@
#else // !QT_CREATOR
# define QT_QML_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
# define QT_QML_END_NAMESPACE QT_END_NAMESPACE
-# define QML_PARSER_EXPORT Q_AUTOTEST_EXPORT
+# if defined(QT_BUILD_QMLDEVTOOLS_LIB) || defined(QT_QMLDEVTOOLS_LIB)
+ // QmlDevTools is a static library
+# define QML_PARSER_EXPORT
+# else
+# define QML_PARSER_EXPORT Q_AUTOTEST_EXPORT
+# endif
#endif // QT_CREATOR
#endif // QMLJSGLOBAL_P_H
diff --git a/src/libs/qmljs/parser/qmljsgrammar.cpp b/src/libs/qmljs/parser/qmljsgrammar.cpp
index 9edb4da634..40d6c6c23e 100644
--- a/src/libs/qmljs/parser/qmljsgrammar.cpp
+++ b/src/libs/qmljs/parser/qmljsgrammar.cpp
@@ -52,453 +52,471 @@ const short QmlJSGrammar::lhs [] = {
102, 102, 102, 102, 102, 102, 103, 109, 109, 112,
112, 114, 113, 113, 113, 113, 113, 113, 113, 113,
116, 111, 110, 119, 119, 120, 120, 121, 121, 118,
- 107, 107, 107, 107, 123, 123, 123, 123, 107, 128,
- 128, 128, 129, 129, 130, 130, 107, 107, 107, 107,
+ 107, 107, 107, 107, 123, 123, 123, 123, 123, 123,
+ 123, 107, 131, 131, 131, 132, 132, 133, 133, 107,
107, 107, 107, 107, 107, 107, 107, 107, 107, 107,
- 107, 107, 107, 117, 117, 117, 117, 117, 133, 133,
- 133, 133, 133, 133, 133, 133, 133, 133, 133, 133,
- 133, 133, 133, 133, 133, 133, 122, 135, 135, 135,
- 135, 134, 134, 137, 137, 139, 139, 139, 139, 139,
- 139, 140, 140, 140, 140, 140, 140, 140, 140, 140,
- 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
- 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
- 140, 140, 141, 141, 115, 115, 115, 115, 115, 144,
- 144, 145, 145, 145, 145, 143, 143, 146, 146, 147,
- 147, 148, 148, 148, 149, 149, 149, 149, 149, 149,
- 149, 149, 149, 149, 150, 150, 150, 150, 151, 151,
- 151, 152, 152, 152, 152, 153, 153, 153, 153, 153,
- 153, 153, 154, 154, 154, 154, 154, 154, 155, 155,
- 155, 155, 155, 156, 156, 156, 156, 156, 157, 157,
- 158, 158, 159, 159, 160, 160, 161, 161, 162, 162,
- 163, 163, 164, 164, 165, 165, 166, 166, 167, 167,
- 168, 168, 138, 138, 169, 169, 170, 170, 170, 170,
- 170, 170, 170, 170, 170, 170, 170, 170, 105, 105,
- 171, 171, 172, 172, 173, 173, 104, 104, 104, 104,
+ 107, 107, 107, 107, 107, 107, 117, 117, 117, 117,
+ 117, 136, 136, 136, 136, 136, 136, 136, 136, 136,
+ 136, 136, 136, 136, 136, 136, 136, 136, 136, 122,
+ 138, 138, 138, 138, 137, 137, 140, 140, 142, 142,
+ 142, 142, 142, 142, 143, 143, 143, 143, 143, 143,
+ 143, 143, 143, 143, 143, 143, 143, 143, 143, 143,
+ 143, 143, 143, 143, 143, 143, 143, 143, 143, 143,
+ 143, 143, 143, 143, 143, 144, 144, 115, 115, 115,
+ 115, 115, 147, 147, 148, 148, 148, 148, 146, 146,
+ 149, 149, 150, 150, 151, 151, 151, 152, 152, 152,
+ 152, 152, 152, 152, 152, 152, 152, 153, 153, 153,
+ 153, 154, 154, 154, 155, 155, 155, 155, 156, 156,
+ 156, 156, 156, 156, 156, 157, 157, 157, 157, 157,
+ 157, 158, 158, 158, 158, 158, 159, 159, 159, 159,
+ 159, 160, 160, 161, 161, 162, 162, 163, 163, 164,
+ 164, 165, 165, 166, 166, 167, 167, 168, 168, 169,
+ 169, 170, 170, 171, 171, 141, 141, 172, 172, 173,
+ 173, 173, 173, 173, 173, 173, 173, 173, 173, 173,
+ 173, 105, 105, 174, 174, 175, 175, 176, 176, 104,
104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 124, 185, 185, 184, 184, 132, 132, 186, 186,
- 187, 187, 189, 189, 188, 190, 193, 191, 191, 194,
- 192, 192, 125, 126, 126, 127, 127, 174, 174, 174,
- 174, 174, 174, 174, 175, 175, 175, 175, 176, 176,
- 176, 176, 177, 177, 178, 180, 195, 195, 198, 198,
- 196, 196, 199, 197, 179, 179, 179, 181, 181, 182,
- 182, 182, 200, 201, 183, 183, 131, 142, 205, 205,
- 202, 202, 203, 203, 206, 108, 207, 207, 106, 106,
- 204, 204, 136, 136, 208};
+ 104, 104, 104, 104, 124, 185, 185, 184, 184, 135,
+ 135, 186, 186, 187, 187, 189, 189, 188, 190, 193,
+ 191, 191, 194, 192, 192, 125, 126, 126, 127, 127,
+ 177, 177, 177, 177, 177, 177, 177, 178, 178, 178,
+ 178, 179, 179, 179, 179, 180, 180, 128, 129, 195,
+ 195, 198, 198, 196, 196, 199, 197, 181, 181, 181,
+ 182, 182, 130, 130, 130, 200, 201, 183, 183, 134,
+ 145, 205, 205, 202, 202, 203, 203, 206, 108, 108,
+ 207, 207, 106, 106, 204, 204, 139, 139, 208};
const short QmlJSGrammar::rhs [] = {
2, 2, 2, 2, 2, 2, 2, 1, 1, 1,
2, 1, 2, 2, 3, 3, 5, 5, 4, 4,
2, 0, 1, 1, 2, 1, 3, 2, 3, 2,
- 1, 5, 4, 4, 1, 1, 1, 1, 3, 1,
- 1, 1, 0, 1, 2, 4, 6, 6, 3, 3,
- 7, 7, 4, 4, 5, 5, 5, 6, 6, 10,
- 6, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 2, 3,
- 3, 4, 5, 3, 4, 3, 1, 1, 2, 3,
- 4, 1, 2, 3, 5, 1, 1, 1, 1, 1,
+ 1, 5, 4, 4, 1, 1, 1, 1, 1, 1,
+ 1, 3, 1, 1, 1, 0, 1, 2, 4, 6,
+ 6, 3, 3, 7, 7, 4, 4, 5, 5, 5,
+ 6, 6, 10, 6, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 2, 3, 3, 4, 5, 3, 4, 3, 1,
+ 1, 2, 3, 4, 1, 2, 3, 5, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 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, 1, 2, 1, 1,
- 0, 1, 0, 1, 2};
+ 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, 1,
+ 1, 2, 1, 1, 0, 1, 0, 1, 2};
const short QmlJSGrammar::action_default [] = {
- 0, 0, 0, 0, 0, 0, 22, 0, 172, 239,
- 203, 211, 207, 151, 223, 199, 3, 136, 70, 152,
- 215, 219, 140, 169, 150, 155, 135, 189, 176, 0,
- 77, 78, 73, 341, 64, 343, 0, 0, 0, 0,
- 75, 0, 0, 71, 74, 68, 0, 0, 65, 67,
- 66, 76, 69, 0, 72, 0, 0, 165, 0, 0,
- 152, 171, 154, 153, 0, 0, 0, 167, 168, 166,
- 170, 0, 200, 0, 0, 0, 0, 190, 0, 0,
- 0, 0, 0, 0, 180, 0, 0, 0, 174, 175,
- 173, 178, 182, 181, 179, 177, 192, 191, 193, 0,
- 208, 0, 204, 0, 0, 146, 133, 145, 134, 102,
- 103, 104, 129, 105, 130, 106, 107, 108, 109, 110,
- 111, 112, 113, 114, 115, 116, 117, 118, 131, 119,
- 120, 121, 122, 123, 124, 125, 126, 127, 128, 132,
- 0, 0, 144, 240, 147, 0, 148, 0, 149, 143,
- 0, 236, 229, 227, 234, 235, 233, 232, 238, 231,
- 230, 228, 237, 224, 0, 212, 0, 0, 216, 0,
- 0, 220, 0, 0, 146, 138, 0, 137, 0, 142,
- 156, 0, 342, 331, 332, 0, 329, 0, 330, 0,
- 333, 247, 254, 253, 261, 249, 0, 250, 334, 0,
- 340, 251, 252, 257, 255, 337, 335, 339, 258, 0,
- 269, 0, 0, 0, 0, 341, 64, 0, 343, 65,
- 241, 283, 66, 0, 0, 0, 270, 0, 0, 259,
- 260, 0, 248, 256, 284, 285, 328, 338, 0, 299,
- 300, 301, 302, 0, 295, 296, 297, 298, 325, 326,
- 0, 0, 0, 0, 0, 288, 289, 245, 243, 205,
- 213, 209, 225, 201, 246, 0, 152, 217, 221, 194,
- 183, 0, 0, 202, 0, 0, 0, 0, 195, 0,
- 0, 0, 0, 0, 187, 185, 188, 186, 184, 197,
- 196, 198, 0, 210, 0, 206, 0, 244, 152, 0,
- 226, 241, 242, 0, 241, 0, 0, 291, 0, 0,
- 0, 293, 0, 214, 0, 0, 218, 0, 0, 222,
- 281, 0, 273, 282, 276, 0, 280, 0, 241, 274,
- 0, 241, 0, 0, 292, 0, 0, 0, 294, 342,
- 331, 0, 0, 333, 0, 327, 0, 317, 0, 0,
- 0, 287, 0, 286, 0, 344, 0, 101, 263, 266,
- 0, 102, 269, 105, 130, 107, 108, 73, 112, 113,
- 64, 114, 117, 71, 74, 65, 241, 66, 76, 120,
- 69, 122, 72, 124, 125, 270, 127, 128, 132, 0,
- 94, 0, 0, 96, 100, 98, 85, 97, 99, 0,
- 95, 84, 264, 262, 140, 141, 146, 0, 139, 0,
- 316, 0, 303, 304, 0, 315, 0, 0, 0, 306,
- 311, 309, 312, 0, 0, 310, 311, 0, 307, 0,
- 308, 265, 314, 0, 265, 313, 0, 318, 319, 0,
- 265, 320, 321, 0, 0, 322, 0, 0, 0, 323,
- 324, 158, 157, 0, 0, 0, 290, 0, 0, 0,
- 305, 278, 271, 0, 279, 275, 0, 277, 267, 0,
- 268, 272, 88, 0, 0, 92, 79, 0, 81, 90,
- 0, 82, 91, 93, 83, 89, 80, 0, 86, 162,
- 160, 164, 161, 159, 163, 6, 336, 4, 2, 62,
- 87, 0, 0, 65, 67, 66, 31, 5, 0, 63,
- 0, 42, 41, 40, 0, 0, 55, 0, 56, 35,
- 36, 37, 38, 59, 0, 42, 0, 0, 0, 0,
- 0, 51, 0, 52, 0, 0, 26, 0, 0, 60,
- 27, 0, 30, 28, 24, 0, 29, 25, 0, 53,
- 0, 54, 140, 0, 57, 61, 0, 0, 0, 0,
- 58, 0, 49, 43, 50, 44, 0, 0, 0, 0,
- 46, 0, 47, 48, 45, 0, 0, 140, 265, 0,
- 0, 39, 102, 269, 105, 130, 107, 108, 73, 112,
- 113, 64, 114, 117, 71, 74, 65, 241, 66, 76,
- 120, 69, 122, 72, 124, 125, 270, 127, 128, 132,
- 0, 32, 33, 0, 34, 8, 0, 10, 0, 9,
- 0, 1, 21, 12, 0, 13, 0, 14, 0, 19,
- 20, 0, 15, 16, 0, 17, 18, 11, 23, 7,
- 345};
+ 0, 0, 22, 0, 0, 0, 22, 0, 175, 242,
+ 206, 214, 210, 154, 226, 202, 3, 139, 73, 155,
+ 218, 222, 143, 172, 153, 158, 138, 192, 179, 0,
+ 80, 81, 76, 345, 67, 347, 0, 0, 0, 0,
+ 78, 0, 0, 74, 77, 71, 0, 0, 68, 70,
+ 69, 79, 72, 0, 75, 0, 0, 168, 0, 0,
+ 155, 174, 157, 156, 0, 0, 0, 170, 171, 169,
+ 173, 0, 203, 0, 0, 0, 0, 193, 0, 0,
+ 0, 0, 0, 0, 183, 0, 0, 0, 177, 178,
+ 176, 181, 185, 184, 182, 180, 195, 194, 196, 0,
+ 211, 0, 207, 0, 0, 149, 136, 148, 137, 105,
+ 106, 107, 132, 108, 133, 109, 110, 111, 112, 113,
+ 114, 115, 116, 117, 118, 119, 120, 121, 134, 122,
+ 123, 124, 125, 126, 127, 128, 129, 130, 131, 135,
+ 0, 0, 147, 243, 150, 0, 151, 0, 152, 146,
+ 0, 239, 232, 230, 237, 238, 236, 235, 241, 234,
+ 233, 231, 240, 227, 0, 215, 0, 0, 219, 0,
+ 0, 223, 0, 0, 149, 141, 0, 140, 0, 145,
+ 159, 0, 346, 334, 335, 0, 332, 0, 333, 0,
+ 336, 250, 257, 256, 264, 252, 0, 253, 337, 0,
+ 344, 254, 255, 260, 258, 341, 338, 343, 261, 0,
+ 272, 0, 0, 0, 0, 345, 67, 0, 347, 68,
+ 244, 286, 69, 0, 0, 0, 273, 0, 0, 262,
+ 263, 0, 251, 259, 287, 288, 331, 342, 0, 302,
+ 303, 304, 305, 0, 298, 299, 300, 301, 328, 329,
+ 0, 0, 0, 0, 0, 291, 292, 248, 246, 208,
+ 216, 212, 228, 204, 249, 0, 155, 220, 224, 197,
+ 186, 0, 0, 205, 0, 0, 0, 0, 198, 0,
+ 0, 0, 0, 0, 190, 188, 191, 189, 187, 200,
+ 199, 201, 0, 213, 0, 209, 0, 247, 155, 0,
+ 229, 244, 245, 0, 244, 0, 0, 294, 0, 0,
+ 0, 296, 0, 217, 0, 0, 221, 0, 0, 225,
+ 284, 0, 276, 285, 279, 0, 283, 0, 244, 277,
+ 0, 244, 0, 0, 295, 0, 0, 0, 297, 346,
+ 334, 0, 0, 336, 0, 330, 0, 320, 0, 0,
+ 0, 290, 0, 289, 0, 348, 0, 104, 266, 269,
+ 0, 105, 272, 108, 133, 110, 111, 76, 115, 116,
+ 67, 117, 120, 74, 77, 68, 244, 69, 79, 123,
+ 72, 125, 75, 127, 128, 273, 130, 131, 135, 0,
+ 97, 0, 0, 99, 103, 101, 88, 100, 102, 0,
+ 98, 87, 267, 265, 143, 144, 149, 0, 142, 0,
+ 319, 0, 306, 307, 0, 318, 0, 0, 0, 309,
+ 314, 312, 315, 0, 0, 313, 314, 0, 310, 0,
+ 311, 268, 317, 0, 268, 316, 0, 321, 322, 0,
+ 268, 323, 324, 0, 0, 325, 0, 0, 0, 326,
+ 327, 161, 160, 0, 0, 0, 293, 0, 0, 0,
+ 308, 281, 274, 0, 282, 278, 0, 280, 270, 0,
+ 271, 275, 91, 0, 0, 95, 82, 0, 84, 93,
+ 0, 85, 94, 96, 86, 92, 83, 0, 89, 165,
+ 163, 167, 164, 162, 166, 339, 6, 340, 4, 2,
+ 65, 90, 0, 0, 68, 70, 69, 31, 5, 0,
+ 66, 0, 45, 44, 43, 0, 0, 58, 0, 59,
+ 35, 36, 37, 38, 40, 41, 62, 39, 0, 45,
+ 0, 0, 0, 0, 0, 54, 0, 55, 0, 0,
+ 26, 0, 0, 63, 27, 0, 30, 28, 24, 0,
+ 29, 25, 0, 56, 0, 57, 143, 0, 60, 64,
+ 0, 0, 0, 0, 61, 0, 52, 46, 53, 47,
+ 0, 0, 0, 0, 49, 0, 50, 51, 48, 0,
+ 0, 143, 268, 0, 0, 42, 105, 272, 108, 133,
+ 110, 111, 76, 115, 116, 67, 117, 120, 74, 77,
+ 68, 244, 69, 79, 123, 72, 125, 75, 127, 128,
+ 273, 130, 131, 135, 0, 32, 33, 0, 34, 8,
+ 0, 10, 0, 9, 0, 1, 21, 12, 0, 13,
+ 0, 14, 0, 19, 20, 0, 15, 16, 0, 17,
+ 18, 11, 23, 7, 349};
const short QmlJSGrammar::goto_default [] = {
- 7, 621, 207, 196, 205, 507, 495, 620, 639, 615,
- 619, 617, 622, 22, 618, 18, 506, 545, 535, 542,
- 537, 523, 191, 195, 197, 201, 526, 566, 565, 200,
- 232, 26, 474, 473, 356, 355, 9, 354, 357, 107,
- 17, 145, 24, 13, 144, 19, 25, 57, 23, 8,
- 28, 27, 269, 15, 263, 10, 259, 12, 261, 11,
- 260, 20, 267, 21, 268, 14, 262, 258, 299, 411,
- 264, 265, 202, 193, 192, 204, 233, 203, 208, 229,
- 230, 194, 360, 359, 231, 463, 462, 321, 322, 465,
+ 7, 625, 207, 196, 205, 508, 496, 624, 643, 495,
+ 623, 621, 626, 22, 622, 18, 507, 549, 539, 546,
+ 541, 526, 191, 195, 197, 201, 233, 208, 230, 530,
+ 570, 569, 200, 232, 26, 474, 473, 356, 355, 9,
+ 354, 357, 107, 17, 145, 24, 13, 144, 19, 25,
+ 57, 23, 8, 28, 27, 269, 15, 263, 10, 259,
+ 12, 261, 11, 260, 20, 267, 21, 268, 14, 262,
+ 258, 299, 411, 264, 265, 202, 193, 192, 204, 203,
+ 229, 194, 360, 359, 231, 463, 462, 321, 322, 465,
324, 464, 323, 419, 423, 426, 422, 421, 441, 442,
185, 199, 181, 184, 198, 206, 0};
const short QmlJSGrammar::action_index [] = {
- 360, 1286, 2520, 2520, 2422, 1011, 52, 96, 132, -102,
- 104, 69, 66, 177, -102, 283, 80, -102, -102, 649,
- 71, 120, 160, 169, -102, -102, -102, 444, 325, 1286,
- -102, -102, -102, 324, -102, 2226, 2030, 1286, 1286, 1286,
- -102, 801, 1286, -102, -102, -102, 1286, 1286, -102, -102,
- -102, -102, -102, 1286, -102, 1286, 1286, -102, 1286, 1286,
- 87, 190, -102, -102, 1286, 1286, 1286, -102, -102, -102,
- 187, 1286, 251, 1286, 1286, 1286, 1286, 471, 1286, 1286,
- 1286, 1286, 1286, 1286, 325, 1286, 1286, 1286, 128, 113,
- 127, 182, 168, 159, 325, 325, 454, 406, 416, 1286,
- -7, 1286, 76, 2128, 1286, 1286, -102, -102, -102, -102,
+ 404, 1275, 2411, 2411, 2509, 1000, 68, 92, 90, -102,
+ 88, 62, 60, 256, -102, 298, 86, -102, -102, 638,
+ 83, 134, 172, 219, -102, -102, -102, 454, 194, 1275,
+ -102, -102, -102, 381, -102, 2215, 1555, 1275, 1275, 1275,
+ -102, 790, 1275, -102, -102, -102, 1275, 1275, -102, -102,
+ -102, -102, -102, 1275, -102, 1275, 1275, -102, 1275, 1275,
+ 102, 217, -102, -102, 1275, 1275, 1275, -102, -102, -102,
+ 204, 1275, 304, 1275, 1275, 1275, 1275, 539, 1275, 1275,
+ 1275, 1275, 1275, 1275, 308, 1275, 1275, 1275, 103, 131,
+ 135, 308, 210, 225, 216, 308, 444, 390, 434, 1275,
+ 82, 1275, 100, 2117, 1275, 1275, -102, -102, -102, -102,
-102, -102, -102, -102, -102, -102, -102, -102, -102, -102,
-102, -102, -102, -102, -102, -102, -102, -102, -102, -102,
-102, -102, -102, -102, -102, -102, -102, -102, -102, -102,
- 107, 1286, -102, -102, 68, 44, -102, 1286, -102, -102,
- 1286, -102, -102, -102, -102, -102, -102, -102, -102, -102,
- -102, -102, -102, -102, 1286, 32, 1286, 1286, 88, 86,
- 1286, -102, 2128, 1286, 1286, -102, 103, -102, 56, -102,
- -102, 65, -102, 398, 89, 63, -102, 274, -102, 62,
- 2520, -102, -102, -102, -102, -102, 248, -102, -102, 47,
- -102, -102, -102, -102, -102, -102, 2520, -102, -102, 467,
- -102, 470, 73, 2422, 53, 398, 91, 67, 2716, 154,
- 1286, -102, 64, 43, 1286, 41, -102, 39, 34, -102,
- -102, 398, -102, -102, -102, -102, -102, -102, 82, -102,
- -102, -102, -102, 90, -102, -102, -102, -102, -102, -102,
- -8, 51, 1286, 100, 77, -102, -102, 1472, -102, 84,
- 38, 5, -102, 266, 70, 33, 555, 79, 74, 477,
- 234, 320, 1286, 281, 1286, 1286, 1286, 1286, 311, 1286,
- 1286, 1286, 1286, 1286, 230, 189, 213, 208, 325, 371,
- 386, 396, 1286, 35, 1286, 81, 1286, -102, 649, 1286,
- -102, 1286, 60, 1, 1286, 31, 2422, -102, 1286, 140,
- 2422, -102, 1286, 72, 1286, 1286, 97, 93, 1286, -102,
- 50, 149, 61, -102, -102, 1286, -102, 310, 1286, -102,
- 58, 1286, -25, 2422, -102, 1286, 125, 2422, -102, -35,
- 292, -56, -31, 2520, -39, -102, 2422, -102, 1286, 141,
- 2422, -5, 2422, -102, 6, 0, -33, -102, -102, 2422,
- -43, 550, 7, 478, 115, 1286, 2422, -1, -27, 451,
- 8, -18, 627, 14, 16, -102, 1381, -102, 12, -19,
- 3, 1286, 59, -30, 1286, -2, 1286, -29, -36, 1286,
- -102, 2324, 18, -102, -102, -102, -102, -102, -102, 1286,
- -102, -102, -102, -102, 203, -102, 1286, -10, -102, 2422,
- -102, 94, -102, -102, 2422, -102, 1286, 102, 20, -102,
- 40, -102, 46, 99, 1286, -102, 55, 57, -102, 28,
- -102, 2422, -102, 114, 2422, -102, 161, -102, -102, 121,
- 2422, 37, -102, -12, -4, -102, 398, -34, -6, -102,
- -102, -102, -102, 1286, 98, 2422, -102, 1286, 105, 2422,
- -102, 19, -102, 181, -102, -102, 1286, -102, -102, 288,
- -102, -102, -102, 110, 1657, -102, -102, 1842, -102, -102,
- 1936, -102, -102, -102, -102, -102, -102, 122, -102, -102,
- -102, -102, -102, -102, -102, -102, 2520, -102, -102, -102,
- 92, -26, 829, 142, -28, 4, -102, -102, 191, -102,
- 202, -102, -102, -102, 398, 218, -102, 1563, -102, -102,
- -102, -102, -102, -102, 237, 2, 368, 207, 17, 398,
- 205, -102, 10, -102, 919, 124, -102, 13, 919, -102,
- -102, 1103, -102, -102, -102, 1195, -102, -102, 214, -102,
- 1563, -102, 271, 9, -102, -102, 174, 307, 30, 1563,
- -102, 228, -102, 212, -102, 26, -32, 301, 179, 265,
- -102, 75, -102, -102, -102, 1748, 919, 280, 2618, 2030,
- -3, -102, 459, 25, 486, 85, 1286, 2422, 24, 11,
- 378, 36, 27, 711, 48, 49, -102, 1381, -102, 54,
- 29, 45, 1286, 59, 15, 1286, 42, 1286, 23, 22,
- 117, -102, -102, 21, -102, -102, 739, -102, 201, -70,
- 919, -102, -102, 116, 398, -102, 143, -102, 129, -102,
- -102, 252, -102, -102, 126, -102, -102, -102, -102, -102,
- -102,
+ 139, 1275, -102, -102, 91, 10, -102, 1275, -102, -102,
+ 1275, -102, -102, -102, -102, -102, -102, -102, -102, -102,
+ -102, -102, -102, -102, 1275, 26, 1275, 1275, 69, 66,
+ 1275, -102, 2117, 1275, 1275, -102, 97, -102, 44, -102,
+ -102, 67, -102, 297, 78, 24, -102, 291, -102, 36,
+ 2411, -102, -102, -102, -102, -102, 234, -102, -102, 12,
+ -102, -102, -102, -102, -102, -102, 2411, -102, -102, 464,
+ -102, 461, 115, 2509, 42, 381, 58, 46, 2705, 70,
+ 1275, -102, 74, 57, 1275, 65, -102, 59, 61, -102,
+ -102, 367, -102, -102, -102, -102, -102, -102, 106, -102,
+ -102, -102, -102, 87, -102, -102, -102, -102, -102, -102,
+ 56, 55, 1275, 99, 84, -102, -102, 1461, -102, 75,
+ 48, 52, -102, 306, 72, 53, 579, 77, 110, 370,
+ 230, 381, 1275, 286, 1275, 1275, 1275, 1275, 380, 1275,
+ 1275, 1275, 1275, 1275, 184, 169, 166, 190, 198, 460,
+ 363, 353, 1275, 50, 1275, 63, 1275, -102, 638, 1275,
+ -102, 1275, 64, 39, 1275, 30, 2509, -102, 1275, 173,
+ 2509, -102, 1275, 79, 1275, 1275, 81, 80, 1275, -102,
+ 71, 149, 32, -102, -102, 1275, -102, 381, 1275, -102,
+ 73, 1275, 76, 2509, -102, 1275, 142, 2509, -102, -16,
+ 381, -42, -12, 2411, -39, -102, 2509, -102, 1275, 154,
+ 2509, 14, 2509, -102, 20, 16, -32, -102, -102, 2509,
+ -51, 519, -4, 511, 136, 1275, 2509, -2, -35, 395,
+ -1, -27, 908, 4, 6, -102, 1370, -102, 0, -36,
+ 27, 1275, 47, 22, 1275, 45, 1275, 21, 17, 1275,
+ -102, 2313, 144, -102, -102, -102, -102, -102, -102, 1275,
+ -102, -102, -102, -102, 274, -102, 1275, -21, -102, 2509,
+ -102, 138, -102, -102, 2509, -102, 1275, 132, 5, -102,
+ 40, -102, 41, 101, 1275, -102, 38, 34, -102, -38,
+ -102, 2509, -102, 105, 2509, -102, 245, -102, -102, 96,
+ 2509, 11, -102, -7, -11, -102, 352, 8, 18, -102,
+ -102, -102, -102, 1275, 129, 2509, -102, 1275, 130, 2509,
+ -102, 49, -102, 226, -102, -102, 1275, -102, -102, 362,
+ -102, -102, -102, 107, 1837, -102, -102, 1649, -102, -102,
+ 1743, -102, -102, -102, -102, -102, -102, 114, -102, -102,
+ -102, -102, -102, -102, -102, -102, -102, 2411, -102, -102,
+ -102, 94, 9, 818, 189, -10, 31, -102, -102, 223,
+ -102, 191, -102, -102, -102, 300, 178, -102, 1928, -102,
+ -102, -102, -102, -102, -102, -102, -102, -102, 257, -25,
+ 381, 195, -22, 305, 240, -102, -6, -102, 818, 127,
+ -102, -18, 818, -102, -102, 1184, -102, -102, -102, 1092,
+ -102, -102, 237, -102, 1928, -102, 294, -8, -102, -102,
+ 176, 381, 19, 1928, -102, 165, -102, 174, -102, 2,
+ -52, 381, 183, 381, -102, 117, -102, -102, -102, 2019,
+ 880, 285, 2607, 1555, 3, -102, 522, 35, 453, 108,
+ 1275, 2509, 51, 23, 475, 54, -17, 700, 7, 43,
+ -102, 1370, -102, 28, -3, 33, 1275, 37, 15, 1275,
+ 25, 1275, 1, 13, 124, -102, -102, 29, -102, -102,
+ 728, -102, 250, -43, 627, -102, -102, 231, 372, -102,
+ 222, -102, 111, -102, -102, 381, -102, -102, 104, -102,
+ -102, -102, -102, -102, -102,
- -107, 25, -75, 27, 30, 272, -107, -107, -107, -107,
- -107, -107, -107, -107, -107, -107, -107, -107, -107, -42,
- -107, -107, -107, -107, -107, -107, -107, -107, -107, 95,
- -107, -107, -107, 31, -107, -107, 1, 37, 91, 80,
- -107, 89, 167, -107, -107, -107, 175, 181, -107, -107,
- -107, -107, -107, 137, -107, 130, 129, -107, 144, 152,
- -107, -107, -107, -107, 140, 133, 149, -107, -107, -107,
- -107, 157, -107, 182, 179, 170, 70, -107, 66, 78,
- 55, 94, 100, 114, -107, 120, 109, 104, -107, -107,
- -107, -107, -107, -107, -107, -107, -107, -107, -107, 172,
- -107, 128, -107, 122, 58, 34, -107, -107, -107, -107,
+ -107, 9, -103, 2, 5, 266, 1, -107, -107, -107,
+ -107, -107, -107, -107, -107, -107, -107, -107, -107, -39,
+ -107, -107, -107, -107, -107, -107, -107, -107, -107, 86,
+ -107, -107, -107, 8, -107, -107, -22, 19, 71, 174,
+ -107, 186, 171, -107, -107, -107, 184, 178, -107, -107,
+ -107, -107, -107, 144, -107, 124, 150, -107, 165, 161,
+ -107, -107, -107, -107, 156, 160, 157, -107, -107, -107,
+ -107, 147, -107, 142, 135, 179, 166, -107, 177, 170,
+ 117, 72, 134, 92, -107, 75, 94, 66, -107, -107,
+ -107, -107, -107, -107, -107, -107, -107, -107, -107, 181,
+ -107, 106, -107, 143, 78, 55, -107, -107, -107, -107,
+ -107, -107, -107, -107, -107, -107, -107, -107, -107, -107,
-107, -107, -107, -107, -107, -107, -107, -107, -107, -107,
-107, -107, -107, -107, -107, -107, -107, -107, -107, -107,
+ -107, -5, -107, -107, -107, -107, -107, 54, -107, -107,
+ 51, -107, -107, -107, -107, -107, -107, -107, -107, -107,
+ -107, -107, -107, -107, 114, -107, 113, 38, -107, -107,
+ 41, -107, 231, 63, 112, -107, -107, -107, -107, -107,
+ -107, -107, -107, 30, -107, -107, -107, 52, -107, -107,
-107, -107, -107, -107, -107, -107, -107, -107, -107, -107,
- -107, 51, -107, -107, -107, -107, -107, 36, -107, -107,
- 47, -107, -107, -107, -107, -107, -107, -107, -107, -107,
- -107, -107, -107, -107, 154, -107, 158, -35, -107, -107,
- 13, -107, 248, 42, 115, -107, -107, -107, -107, -107,
- -107, -107, -107, 20, -107, -107, -107, 2, -107, -107,
+ -107, -107, -107, -107, -107, -107, 36, -107, -107, 45,
+ -107, 42, -107, 40, -107, 80, -107, -107, 77, -107,
+ 88, -107, -107, -107, 83, 74, -107, -107, -107, -107,
+ -107, -10, -107, -107, -107, -107, -107, -107, -107, -107,
-107, -107, -107, -107, -107, -107, -107, -107, -107, -107,
- -107, -107, -107, -107, -107, -107, 61, -107, -107, 67,
- -107, 64, -107, 76, -107, 43, -107, -107, 57, -107,
- 60, -107, -107, -107, 85, 69, -107, -107, -107, -107,
- -107, -5, -107, -107, -107, -107, -107, -107, -107, -107,
+ -107, -107, 23, -107, -107, -107, -107, 100, -107, -107,
-107, -107, -107, -107, -107, -107, -107, -107, -107, -107,
- -107, -107, 24, -107, -107, -107, -107, 148, -107, -107,
+ -107, 4, 223, -107, 230, 236, 222, 205, -107, 127,
+ 125, 115, 96, 102, -107, -107, -107, -107, -107, -107,
+ -107, -107, 234, -107, 215, -107, 199, -107, -107, 197,
+ -107, 190, -107, -107, 163, -107, 90, -107, 0, -107,
+ -1, -107, 203, -107, 189, 211, -107, -107, 195, -107,
+ -107, -107, -107, -107, -107, 191, -107, 98, 119, -107,
+ -107, 95, -107, 81, -107, 79, -107, 82, -107, -107,
+ 101, -107, -107, -16, -107, -107, 53, -107, 46, -107,
+ 57, -107, 59, -107, -107, -107, -107, -107, -107, 35,
+ -107, 33, -107, 39, -107, 89, 67, -107, -107, 58,
+ -107, -107, 84, -107, -107, -107, 73, -107, -107, -107,
+ -107, 65, -107, 43, 93, -107, 109, -107, -107, 49,
+ -107, 47, -107, -107, -107, -107, -107, -107, -107, 50,
+ -107, -107, -107, -107, -107, -107, 108, -107, -107, 61,
+ -107, -107, -107, -107, 62, -107, 68, -107, -107, -107,
+ -107, -107, -23, -107, 69, -107, -19, -107, -107, -107,
+ -107, 97, -107, -107, 99, -107, -107, -107, -107, -107,
+ 60, -61, -107, -107, 34, -107, 37, -107, 29, -107,
+ -107, -107, -107, 32, -107, 76, -107, 44, -107, 56,
+ -107, -107, -107, -107, -107, -107, 31, -107, -107, 116,
+ -107, -107, -107, -107, -6, -107, -107, 70, -107, -107,
+ 64, -107, -107, -107, -107, -107, -107, -107, -107, -107,
+ -107, -107, -107, -107, -107, -107, -107, 193, -107, -107,
+ -107, -107, -107, 7, -107, -107, -107, -107, -107, -107,
+ -107, -20, -107, -107, -107, -7, -107, -107, 290, -107,
-107, -107, -107, -107, -107, -107, -107, -107, -107, -107,
- -107, 9, 186, -107, 196, 221, 220, 212, -107, 102,
- 98, 96, 116, 118, -107, -107, -107, -107, -107, -107,
- -107, -107, 230, -107, 199, -107, 193, -107, -107, 211,
- -107, 132, -107, -107, 126, -107, 14, -107, 5, -107,
- 10, -107, 208, -107, 189, 202, -107, -107, 209, -107,
- -107, -107, -107, -107, -107, 200, -107, 103, 121, -107,
- -107, 168, -107, 50, -107, 54, -107, 62, -107, -107,
- 88, -107, -107, -21, -107, -107, 184, -107, 63, -107,
- 65, -107, 74, -107, -107, -107, -107, -107, -107, 92,
- -107, 35, -107, 45, -107, 171, 75, -107, -107, 56,
- -107, -107, 166, -107, -107, -107, 90, -107, -107, -107,
- -107, 39, -107, 32, 159, -107, 178, -107, -107, -3,
- -107, -17, -107, -107, -107, -107, -107, -107, -107, 3,
- -107, -107, -107, -107, -107, -107, 68, -107, -107, 79,
- -107, -107, -107, -107, 16, -107, 11, -107, -107, -107,
- -107, -107, -8, -107, 59, -107, -41, -107, -107, -107,
- -107, 99, -107, -107, 160, -107, -107, -107, -107, -107,
- 93, -7, -107, -107, 77, -107, 40, -107, 46, -107,
- -107, -107, -107, 53, -107, 83, -107, 72, -107, 71,
- -107, -107, -107, -107, -107, -107, 48, -107, -107, 81,
- -107, -107, -107, -107, 38, -107, -107, 173, -107, -107,
- 33, -107, -107, -107, -107, -107, -107, -107, -107, -107,
- -107, -107, -107, -107, -107, -107, 86, -107, -107, -107,
- -107, -107, 73, -107, -107, -107, -107, -107, -107, -107,
- 22, -107, -107, -107, -10, -107, -107, 259, -107, -107,
- -107, -107, -107, -107, -107, -107, -6, -15, -107, -2,
- -107, -107, -107, -107, 101, -107, -107, -107, 106, -107,
- -107, 290, -107, -107, -107, 294, -107, -107, -107, -107,
- 318, -107, -107, -4, -107, -107, -19, -13, -107, 364,
- -107, -107, -107, -26, -107, -107, -107, -11, -20, -12,
- -107, -107, -107, -107, -107, 305, 278, -107, 17, 261,
- 4, -107, 28, -107, 26, -107, 87, 19, -107, -107,
- 23, -107, -107, 84, -107, -107, -107, 44, -107, -107,
- -107, -107, 41, -107, 29, 125, -107, 110, -107, -107,
- -107, -107, -107, 15, -107, -107, 12, -107, -107, 18,
- 97, -107, -107, -107, 7, -107, -107, -107, -107, -107,
- -107, 21, -107, -107, -107, -107, -107, -107, -107, -107,
- -107};
+ -2, -25, -107, -15, -107, -107, -107, -107, 172, -107,
+ -107, -107, 287, -107, -107, 288, -107, -107, -107, 291,
+ -107, -107, -107, -107, 336, -107, -107, 20, -107, -107,
+ 15, 3, -107, 304, -107, -107, -107, 24, -107, -107,
+ -107, 28, 21, 26, -107, -107, -107, -107, -107, 320,
+ 104, -107, 13, 381, -3, -107, 6, -107, 10, -107,
+ 167, 22, -107, -107, 12, -107, -107, 87, -107, -107,
+ -107, 25, -107, -107, -107, -107, 11, -107, 14, 85,
+ -107, 121, -107, -107, -107, -107, -107, 27, -107, -107,
+ 17, -107, -107, 18, 91, -107, -107, -107, 16, -107,
+ -107, -107, -107, -107, -107, -4, -107, -107, -107, -107,
+ -107, -107, -107, -107, -107};
const short QmlJSGrammar::action_info [] = {
- 457, 340, 343, 440, 342, -126, -110, 453, 391, 257,
- -121, 352, 403, 389, -129, 346, 345, 416, 348, -99,
- 616, -118, 401, -100, 446, 399, 448, 440, 571, 440,
- 541, -110, -129, 561, 568, 333, 466, 559, 556, 527,
- 510, 529, 541, 346, 534, 424, 541, 257, 440, -126,
- 408, 424, -121, 420, 541, -118, -100, 444, 457, 453,
- 424, -99, 304, 348, 431, 416, -123, 325, 141, 251,
- 457, 414, 101, 164, 440, 453, 147, 71, 296, 416,
- 99, 312, 272, 430, 294, 272, 292, 252, 141, 257,
- 164, 306, 335, 170, 301, 190, 640, 187, 346, 312,
- 318, 183, 236, 348, 149, 71, 141, 172, 141, 427,
- 141, 141, 0, 141, 294, 141, 179, 99, 477, 331,
- 292, 434, 141, 189, 314, 538, 173, 443, 315, 62,
- 141, 172, 538, 141, 249, 248, 573, 572, 256, 255,
- 63, 444, 616, 242, 241, 101, 249, 248, 141, 141,
- 173, 247, 246, 58, 428, 413, 412, 327, 455, 177,
- 254, 409, 418, 142, 59, 459, 478, 58, 58, 141,
- 166, 525, 58, 611, 167, 172, 249, 248, 59, 59,
- 539, 64, 488, 59, 85, 337, 86, 636, 635, 469,
- 630, 629, 103, 85, 173, 86, 174, 87, 575, 64,
- 310, 350, 64, 511, 633, 632, 87, 85, 511, 86,
- 328, 104, 532, 105, 85, 0, 86, 513, 172, 0,
- 87, 550, 438, 437, 541, 517, 65, 87, 512, 0,
- 0, 511, 66, 85, 631, 86, 511, 173, 85, 406,
- 86, 511, 470, 468, 65, 0, 87, 65, 626, 513,
- 66, 87, 172, 66, 513, 85, 141, 86, 0, 85,
- 512, 86, 627, 625, 563, 512, 533, 531, 87, 73,
- 74, 173, 87, 406, 0, 551, 549, 513, 0, 518,
- 516, 34, 513, 576, 274, 275, 172, 513, 512, 564,
- 562, 0, 624, 512, 34, 172, 75, 76, 512, 274,
- 275, 73, 74, 34, -87, 173, 0, 174, 0, 235,
- 234, 276, 277, -87, 173, 0, 174, 34, 48, 50,
- 49, 34, 0, 0, 0, 0, 276, 277, 75, 76,
- 34, 48, 50, 49, 279, 280, 34, 0, 0, 34,
- 48, 50, 49, 281, 45, 0, 282, 0, 283, 34,
- 85, 0, 86, 34, 48, 50, 49, 45, 48, 50,
- 49, 0, 0, 87, 0, 0, 45, 48, 50, 49,
+ 416, 257, 533, -132, 403, -113, 346, -102, 575, 348,
+ 572, -121, 531, -103, -121, 545, 345, 430, 342, 348,
+ 340, 343, 440, 401, 391, 545, 563, 389, 538, 446,
+ 352, 444, -129, 416, -124, -102, 545, 453, 420, 408,
+ -124, 431, -132, 424, -126, 424, 424, 620, 440, 457,
+ -103, 440, -129, 457, -126, 440, 560, 453, -113, 257,
+ 565, 346, 545, 335, 272, 346, 466, 236, 448, 190,
+ 149, 164, 141, 170, 99, 511, 272, 409, 257, 312,
+ 296, 414, 348, 312, 189, 164, 187, 318, 325, 71,
+ 306, 252, 644, 416, 141, 453, 292, 457, 440, 147,
+ 304, 71, 443, 183, 179, 141, 0, 141, 0, 172,
+ 99, 427, 434, 141, 301, 477, 444, 0, 0, 0,
+ 0, 0, 141, 0, 0, 0, 0, 292, 173, 294,
+ 58, 294, 542, 251, 331, 542, 333, 141, 141, 101,
+ 141, 59, 0, 58, 62, 256, 255, 141, 247, 246,
+ 141, 399, 0, 177, 59, 63, 428, 327, 620, 254,
+ 314, 101, 141, 478, 315, 640, 639, 242, 241, 249,
+ 248, 58, 634, 633, 488, 58, 249, 248, 577, 576,
+ 615, 141, 59, 543, 166, 518, 59, 172, 167, 455,
+ 459, 85, 418, 86, 85, 142, 86, 249, 248, 413,
+ 412, 567, 337, 512, 87, 512, 173, 87, 174, 85,
+ 328, 86, 512, 0, 350, 85, 64, 86, 529, 85,
+ 512, 86, 87, 85, 512, 86, 568, 566, 87, 64,
+ 579, 64, 87, 310, 469, 85, 87, 86, 0, 519,
+ 517, 85, 141, 86, 554, 0, 172, 536, 87, 514,
+ 85, 514, 86, 141, 87, 85, 545, 86, 514, 0,
+ 513, 65, 513, 87, 514, 173, 514, 66, 87, 513,
+ 514, 103, 172, 0, 65, 513, 65, 513, 0, 0,
+ 66, 513, 66, 637, 636, 0, 0, 470, 468, 172,
+ 104, 173, 105, 406, 0, 235, 234, 630, 555, 553,
+ 172, 537, 535, 0, 274, 275, 438, 437, 173, 172,
+ 406, 631, 629, 635, 0, 580, 73, 74, -90, 173,
+ 34, 174, 73, 74, 274, 275, 34, -90, 173, 34,
+ 174, 276, 277, 85, 34, 86, 0, 0, 0, 0,
+ 0, 628, 0, 75, 76, 0, 87, 0, 0, 75,
+ 76, 276, 277, 0, 0, 0, 0, 48, 50, 49,
0, 0, 0, 48, 50, 49, 48, 50, 49, 0,
- 45, 0, 0, 0, 45, 0, 48, 50, 49, 0,
- 48, 50, 49, 45, 279, 280, 0, 34, 0, 45,
- 0, 0, 45, 281, 0, 0, 282, 34, 283, 279,
- 280, 0, 45, 0, -341, 0, 45, 0, 281, 279,
- 280, 282, 0, 283, 0, 0, 0, 34, 281, 78,
- 79, 282, 0, 283, 48, 50, 49, 80, 81, 78,
- 79, 82, 0, 83, 48, 50, 49, 80, 81, 0,
- 0, 82, 0, 83, 6, 5, 4, 1, 3, 2,
- 45, 0, 0, 0, 48, 50, 49, 78, 79, 0,
- 45, 0, 0, 0, 0, 80, 81, 78, 79, 82,
- 34, 83, 0, 0, 0, 80, 81, -341, 34, 82,
- 45, 83, 0, 0, 78, 79, 34, 0, 0, 34,
- 279, 280, 80, 81, 0, 0, 82, 34, 83, 281,
- 0, 0, 282, 0, 283, 34, 0, 48, 50, 49,
- 240, 239, 0, 0, 0, 48, 50, 49, 240, 239,
- 0, 245, 244, 48, 50, 49, 48, 50, 49, 245,
- 244, 0, 0, 45, 48, 50, 49, 245, 244, 0,
- 0, 45, 48, 50, 49, 0, 0, 0, 151, 45,
- 0, 0, 45, 0, 0, 0, 0, 0, 152, 0,
- 45, 0, 153, 0, 0, 0, 0, 0, 45, 34,
- 0, 154, 0, 155, 0, 0, 308, 0, 0, 0,
- 0, 0, 0, 0, 156, 0, 157, 62, 0, 0,
- 0, 0, 0, 0, 158, 0, 0, 159, 63, 0,
- 0, 240, 239, 160, 0, 0, 48, 50, 49, 161,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 162, 0, 0, 0, 30,
- 31, 0, 45, 0, 0, 0, 0, 0, 0, 33,
- 0, 0, 151, 0, 0, 0, 34, 0, 0, 0,
- 35, 36, 152, 37, 0, 0, 153, 0, 0, 0,
- 41, 0, 0, 0, 44, 154, 0, 155, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 156, 0,
- 157, 62, 51, 48, 50, 49, 0, 52, 158, 0,
- 0, 159, 63, 0, 0, 0, 0, 160, 43, 54,
- 32, 0, 0, 161, 40, 0, 0, 0, 0, 45,
- 0, 0, 0, 30, 31, 0, 0, 0, 0, 162,
- 0, 0, 0, 33, 0, 0, 0, 0, 0, 0,
- 34, 0, 0, 0, 35, 36, 0, 37, 0, 0,
- 0, 30, 31, 0, 41, 0, 0, 0, 44, 0,
- 0, 33, 0, 0, 0, 0, 0, 0, 34, 0,
- 0, 0, 35, 36, 0, 37, 51, 48, 50, 49,
- 0, 52, 502, 0, 0, 0, 44, 0, 0, 0,
- 0, 0, 43, 54, 32, 0, 0, 0, 40, 0,
- 0, 0, 0, 45, 51, 48, 50, 49, 0, 52,
- 0, 0, 0, 30, 31, 0, 0, 0, 0, 0,
- 43, 54, 32, 33, 0, 0, 40, 0, 0, 0,
- 34, 45, 0, 0, 35, 36, 0, 37, 0, 0,
- 0, 30, 31, 0, 41, 0, 0, 0, 44, 0,
- 0, 33, 0, 0, 0, 0, 0, 0, 34, 0,
- 0, 0, 35, 36, 0, 37, 51, 48, 50, 49,
- 0, 52, 502, 0, 0, 0, 44, 0, 0, 0,
- 0, 0, 43, 54, 32, 0, 0, 0, 40, 0,
- 0, 0, 0, 45, 51, 48, 50, 49, 0, 52,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 43, 54, 32, 0, 0, 0, 40, 0, 0, 0,
- 0, 45, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 30, 31, 0, 0, 0, 0, 0, 0, 0,
- 0, 33, 0, 0, 0, 0, 0, 0, 34, 0,
- 0, 0, 35, 36, 0, 37, 0, 0, 0, 0,
- 0, 0, 502, 0, 0, 0, 44, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 51, 48, 50, 49, 0, 52,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 43, 54, 32, 0, 0, 0, 40, 0, 0, 0,
- 0, 45, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 501, 0, 30, 31, 0, 0, 0, 0, 0,
- 0, 0, 0, 215, 0, 0, 0, 0, 0, 0,
- 34, 0, 0, 0, 35, 36, 0, 37, 0, 0,
- 0, 0, 0, 0, 502, 0, 0, 0, 44, 0,
+ 0, 48, 50, 49, 0, 0, 279, 280, 0, 0,
+ 0, 34, 0, 45, 0, 281, 279, 280, 282, 45,
+ 283, 34, 45, 279, 280, 281, 34, 45, 282, 0,
+ 283, 34, 281, 279, 280, 282, 0, 283, 0, 0,
+ 34, 0, 281, 78, 79, 282, 0, 283, 48, 50,
+ 49, 80, 81, 0, 34, 82, 0, 83, 48, 50,
+ 49, -345, 0, 48, 50, 49, 0, 0, 48, 50,
+ 49, 0, 0, 0, 45, 0, 0, 48, 50, 49,
+ 0, 0, 0, 0, 45, 0, 0, 78, 79, 45,
+ 0, 48, 50, 49, 45, 80, 81, 78, 79, 82,
+ 0, 83, 0, 45, 0, 80, 81, 78, 79, 82,
+ 0, 83, 34, 279, 280, 80, 81, 45, 0, 82,
+ 34, 83, 281, 34, 0, 282, 0, 283, 6, 5,
+ 4, 1, 3, 2, 34, 0, 0, 0, 0, 0,
+ 0, -345, 0, 0, 245, 244, 0, 0, 0, 48,
+ 50, 49, 245, 244, 0, 240, 239, 48, 50, 49,
+ 48, 50, 49, 0, 0, 0, 0, 0, 0, 0,
+ 34, 48, 50, 49, 0, 45, 0, 0, 34, 0,
+ 0, 34, 0, 45, 0, 0, 45, 0, 0, 0,
+ 0, 0, 78, 79, 0, 0, 0, 45, 0, 0,
+ 80, 81, 245, 244, 82, 0, 83, 48, 50, 49,
+ 240, 239, 151, 240, 239, 48, 50, 49, 48, 50,
+ 49, 0, 152, 0, 0, 0, 153, 0, 0, 0,
+ 0, 0, 0, 45, 0, 154, 0, 155, 0, 0,
+ 308, 45, 0, 0, 45, 0, 0, 0, 156, 0,
+ 157, 62, 0, 0, 0, 0, 0, 0, 158, 0,
+ 0, 159, 63, 0, 0, 0, 0, 160, 0, 30,
+ 31, 151, 0, 161, 0, 0, 0, 0, 0, 33,
+ 0, 152, 0, 0, 0, 153, 34, 0, 0, 162,
+ 35, 36, 0, 37, 154, 0, 155, 0, 0, 0,
+ 503, 0, 0, 0, 44, 0, 0, 156, 0, 157,
+ 62, 0, 0, 0, 0, 0, 0, 158, 0, 0,
+ 159, 63, 51, 48, 50, 49, 160, 52, 0, 0,
+ 0, 0, 161, 0, 0, 0, 0, 0, 43, 54,
+ 32, 0, 30, 31, 40, 0, 0, 0, 162, 45,
+ 0, 0, 33, 0, 0, 0, 0, 0, 0, 34,
+ 0, 0, 0, 35, 36, 0, 37, 0, 0, 0,
+ 30, 31, 0, 41, 0, 0, 0, 44, 0, 0,
+ 33, 0, 0, 0, 0, 0, 0, 34, 0, 0,
+ 0, 35, 36, 0, 37, 51, 48, 50, 49, 0,
+ 52, 503, 0, 0, 0, 44, 0, 0, 0, 0,
+ 0, 43, 54, 32, 0, 0, 0, 40, 0, 0,
+ 0, 0, 45, 51, 48, 50, 49, 0, 52, 0,
+ 0, 0, 30, 31, 0, 0, 0, 0, 0, 43,
+ 54, 32, 33, 0, 0, 40, 0, 0, 0, 34,
+ 45, 0, 0, 35, 36, 0, 37, 0, 0, 0,
+ 30, 31, 0, 41, 0, 0, 0, 44, 0, 0,
+ 33, 0, 0, 0, 0, 0, 0, 34, 0, 0,
+ 0, 35, 36, 0, 37, 51, 48, 50, 49, 0,
+ 52, 503, 0, 0, 0, 44, 0, 0, 0, 0,
+ 0, 43, 54, 32, 0, 0, 0, 40, 0, 0,
+ 0, 0, 45, 51, 48, 50, 49, 0, 52, 0,
+ 0, 0, 30, 31, 0, 0, 0, 0, 0, 43,
+ 54, 32, 33, 0, 0, 40, 0, 0, 0, 34,
+ 45, 0, 0, 35, 36, 0, 37, 0, 0, 0,
+ 30, 31, 0, 503, 0, 0, 0, 44, 0, 0,
+ 33, 0, 0, 0, 0, 0, 0, 34, 0, 0,
+ 0, 35, 36, 0, 37, 51, 48, 50, 49, 0,
+ 52, 41, 0, 0, 0, 44, 0, 0, 0, 0,
+ 0, 43, 54, 32, 0, 0, 0, 40, 0, 0,
+ 0, 0, 45, 51, 48, 50, 49, 0, 52, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 43,
+ 54, 32, 0, 0, 0, 40, 0, 0, 0, 0,
+ 45, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 502, 0, 30, 31, 0, 0, 0, 0, 0, 0,
+ 0, 0, 215, 0, 0, 0, 0, 0, 0, 34,
+ 0, 0, 0, 35, 36, 0, 37, 0, 0, 0,
+ 0, 0, 0, 503, 0, 0, 0, 44, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 51, 503, 505, 504,
- 0, 52, 0, 0, 0, 0, 226, 0, 0, 0,
- 0, 0, 43, 54, 32, 210, 0, 0, 40, 0,
- 0, 0, 0, 45, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 501, 0, 30, 31, 0, 0, 0,
- 0, 0, 0, 0, 0, 215, 0, 0, 0, 0,
- 0, 0, 34, 0, 0, 0, 35, 36, 0, 37,
- 0, 0, 0, 0, 0, 0, 502, 0, 0, 0,
- 44, 0, 0, 0, 0, 0, 0, 0, 543, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 51, 503,
- 505, 504, 0, 52, 0, 0, 0, 0, 226, 0,
- 0, 0, 0, 0, 43, 54, 32, 210, 0, 0,
- 40, 0, 0, 0, 0, 45, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 501, 0, 30, 31, 0,
- 0, 0, 0, 0, 0, 0, 0, 215, 0, 0,
+ 0, 0, 0, 0, 0, 51, 504, 506, 505, 0,
+ 52, 0, 0, 0, 0, 226, 0, 0, 0, 0,
+ 0, 43, 54, 32, 210, 0, 0, 40, 0, 0,
+ 0, 0, 45, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 502, 0, 30, 31, 0, 0, 0, 0,
+ 0, 0, 0, 0, 215, 0, 0, 0, 0, 0,
+ 0, 34, 0, 0, 0, 35, 36, 0, 37, 0,
+ 0, 0, 0, 0, 0, 503, 0, 0, 0, 44,
+ 0, 0, 0, 0, 0, 0, 0, 550, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 51, 504, 506,
+ 505, 0, 52, 0, 0, 0, 0, 226, 0, 0,
+ 0, 0, 0, 43, 54, 32, 210, 0, 0, 40,
+ 0, 0, 0, 0, 45, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 502, 0, 30, 31, 0, 0,
+ 0, 0, 0, 0, 0, 0, 215, 0, 0, 0,
+ 0, 0, 0, 34, 0, 0, 0, 35, 36, 0,
+ 37, 0, 0, 0, 0, 0, 0, 503, 0, 0,
+ 0, 44, 0, 0, 0, 0, 0, 0, 0, 547,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 51,
+ 504, 506, 505, 0, 52, 0, 0, 0, 0, 226,
+ 0, 0, 0, 0, 0, 43, 54, 32, 210, 0,
+ 0, 40, 0, 0, 0, 0, 45, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 29, 30, 31, 0,
+ 0, 0, 0, 0, 0, 0, 0, 33, 0, 0,
0, 0, 0, 0, 34, 0, 0, 0, 35, 36,
- 0, 37, 0, 0, 0, 0, 0, 0, 502, 0,
- 0, 0, 44, 0, 0, 0, 0, 0, 0, 0,
- 546, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 51, 503, 505, 504, 0, 52, 0, 0, 0, 0,
- 226, 0, 0, 0, 0, 0, 43, 54, 32, 210,
- 0, 0, 40, 0, 0, 0, 0, 45, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 29, 30, 31,
- 0, 0, 0, 0, 0, 0, 0, 0, 33, 0,
- 0, 0, 0, 0, 0, 34, 0, 0, 0, 35,
- 36, 0, 37, 0, 0, 0, 38, 0, 39, 41,
- 42, 0, 0, 44, 0, 0, 0, 46, 0, 47,
+ 0, 37, 0, 0, 0, 38, 0, 39, 41, 42,
+ 0, 0, 44, 0, 0, 0, 46, 0, 47, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 51, 48, 50, 49, 0, 52, 0, 53, 0,
- 55, 0, 56, 0, 0, 0, 0, 43, 54, 32,
- 0, 0, 0, 40, 0, 0, 0, 0, 45, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, -119, 0,
+ 51, 48, 50, 49, 0, 52, 0, 53, 0, 55,
+ 0, 56, 0, 0, 0, 0, 43, 54, 32, 0,
+ 0, 0, 40, 0, 0, 0, 0, 45, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, -122, 0, 0,
+ 0, 29, 30, 31, 0, 0, 0, 0, 0, 0,
+ 0, 0, 33, 0, 0, 0, 0, 0, 0, 34,
+ 0, 0, 0, 35, 36, 0, 37, 0, 0, 0,
+ 38, 0, 39, 41, 42, 0, 0, 44, 0, 0,
+ 0, 46, 0, 47, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 51, 48, 50, 49, 0,
+ 52, 0, 53, 0, 55, 0, 56, 0, 0, 0,
+ 0, 43, 54, 32, 0, 0, 0, 40, 0, 0,
+ 0, 0, 45, 0, 0, 0, 0, 0, 0, 0,
0, 0, 29, 30, 31, 0, 0, 0, 0, 0,
0, 0, 0, 33, 0, 0, 0, 0, 0, 0,
34, 0, 0, 0, 35, 36, 0, 37, 0, 0,
0, 38, 0, 39, 41, 42, 0, 0, 44, 0,
0, 0, 46, 0, 47, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 51, 48, 50, 49,
- 0, 52, 0, 53, 0, 55, 0, 56, 0, 0,
+ 0, 52, 0, 53, 0, 55, 271, 56, 0, 0,
0, 0, 43, 54, 32, 0, 0, 0, 40, 0,
0, 0, 0, 45, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 29, 30, 31, 0, 0, 0, 0,
- 0, 0, 0, 0, 33, 0, 0, 0, 0, 0,
- 0, 34, 0, 0, 0, 35, 36, 0, 37, 0,
- 0, 0, 38, 0, 39, 41, 42, 0, 0, 44,
- 0, 0, 0, 46, 0, 47, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 51, 48, 50,
- 49, 0, 52, 0, 53, 0, 55, 271, 56, 0,
- 0, 0, 0, 43, 54, 32, 0, 0, 0, 40,
- 0, 0, 0, 0, 45, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 29, 30, 31, 0, 0, 0,
+ 0, 0, 0, 475, 0, 0, 29, 30, 31, 0,
+ 0, 0, 0, 0, 0, 0, 0, 33, 0, 0,
+ 0, 0, 0, 0, 34, 0, 0, 0, 35, 36,
+ 0, 37, 0, 0, 0, 38, 0, 39, 41, 42,
+ 0, 0, 44, 0, 0, 0, 46, 0, 47, 0,
+ 0, 476, 0, 0, 0, 0, 0, 0, 0, 0,
+ 51, 48, 50, 49, 0, 52, 0, 53, 0, 55,
+ 0, 56, 0, 0, 0, 0, 43, 54, 32, 0,
+ 0, 0, 40, 0, 0, 0, 0, 45, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 475, 0, 0,
+ 29, 30, 31, 0, 0, 0, 0, 0, 0, 0,
+ 0, 33, 0, 0, 0, 0, 0, 0, 34, 0,
+ 0, 0, 35, 36, 0, 37, 0, 0, 0, 38,
+ 0, 39, 41, 42, 0, 0, 44, 0, 0, 0,
+ 46, 0, 47, 0, 0, 481, 0, 0, 0, 0,
+ 0, 0, 0, 0, 51, 48, 50, 49, 0, 52,
+ 0, 53, 0, 55, 0, 56, 0, 0, 0, 0,
+ 43, 54, 32, 0, 0, 0, 40, 0, 0, 0,
+ 0, 45, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 483, 0, 0, 29, 30, 31, 0, 0, 0,
0, 0, 0, 0, 0, 33, 0, 0, 0, 0,
- 0, 0, 34, 217, 0, 0, 218, 36, 0, 37,
+ 0, 0, 34, 0, 0, 0, 35, 36, 0, 37,
0, 0, 0, 38, 0, 39, 41, 42, 0, 0,
- 44, 0, 0, 0, 46, 0, 47, 0, 0, 0,
- 0, 0, 0, 0, 221, 0, 0, 0, 51, 48,
+ 44, 0, 0, 0, 46, 0, 47, 0, 0, 484,
+ 0, 0, 0, 0, 0, 0, 0, 0, 51, 48,
50, 49, 0, 52, 0, 53, 0, 55, 0, 56,
0, 0, 0, 0, 43, 54, 32, 0, 0, 0,
40, 0, 0, 0, 0, 45, 0, 0, 0, 0,
@@ -514,324 +532,324 @@ const short QmlJSGrammar::action_info [] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 29,
30, 31, 0, 0, 0, 0, 0, 0, 0, 0,
33, 0, 0, 0, 0, 0, 0, 34, 217, 0,
- 0, 578, 579, 0, 37, 0, 0, 0, 38, 0,
+ 0, 218, 36, 0, 37, 0, 0, 0, 38, 0,
39, 41, 42, 0, 0, 44, 0, 0, 0, 46,
0, 47, 0, 0, 0, 0, 0, 0, 0, 221,
- 0, 0, 0, 51, 48, 50, 49, 0, 52, 0,
- 53, 0, 55, 0, 56, 0, 0, 0, 0, 43,
+ 0, 0, 0, 51, 48, 50, 49, 223, 52, 0,
+ 53, 225, 55, 0, 56, 0, 228, 0, 0, 43,
54, 32, 0, 0, 0, 40, 0, 0, 0, 0,
45, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 475, 0, 0, 29, 30, 31, 0, 0, 0, 0,
- 0, 0, 0, 0, 33, 0, 0, 0, 0, 0,
- 0, 34, 0, 0, 0, 35, 36, 0, 37, 0,
- 0, 0, 38, 0, 39, 41, 42, 0, 0, 44,
- 0, 0, 0, 46, 0, 47, 0, 0, 481, 0,
- 0, 0, 0, 0, 0, 0, 0, 51, 48, 50,
- 49, 0, 52, 0, 53, 0, 55, 0, 56, 0,
- 0, 0, 0, 43, 54, 32, 0, 0, 0, 40,
- 0, 0, 0, 0, 45, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 483, 0, 0, 29, 30, 31,
- 0, 0, 0, 0, 0, 0, 0, 0, 33, 0,
- 0, 0, 0, 0, 0, 34, 0, 0, 0, 35,
- 36, 0, 37, 0, 0, 0, 38, 0, 39, 41,
- 42, 0, 0, 44, 0, 0, 0, 46, 0, 47,
- 0, 0, 484, 0, 0, 0, 0, 0, 0, 0,
- 0, 51, 48, 50, 49, 0, 52, 0, 53, 0,
- 55, 0, 56, 0, 0, 0, 0, 43, 54, 32,
- 0, 0, 0, 40, 0, 0, 0, 0, 45, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 475, 0,
- 0, 29, 30, 31, 0, 0, 0, 0, 0, 0,
- 0, 0, 33, 0, 0, 0, 0, 0, 0, 34,
- 0, 0, 0, 35, 36, 0, 37, 0, 0, 0,
- 38, 0, 39, 41, 42, 0, 0, 44, 0, 0,
- 0, 46, 0, 47, 0, 0, 476, 0, 0, 0,
- 0, 0, 0, 0, 0, 51, 48, 50, 49, 0,
- 52, 0, 53, 0, 55, 0, 56, 0, 0, 0,
- 0, 43, 54, 32, 0, 0, 0, 40, 0, 0,
- 0, 0, 45, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 109, 110, 111, 0, 0, 113, 115, 116,
- 0, 0, 117, 0, 118, 0, 0, 0, 120, 121,
- 122, 0, 0, 0, 0, 0, 0, 34, 123, 124,
- 125, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 126, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 129, 0, 0,
- 0, 0, 0, 0, 48, 50, 49, 130, 131, 132,
- 0, 134, 135, 136, 137, 138, 139, 0, 0, 127,
- 133, 119, 112, 114, 128, 0, 0, 0, 0, 0,
- 45, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 109, 110, 111, 0, 0, 113, 115, 116, 0, 0,
- 117, 0, 118, 0, 0, 0, 120, 121, 122, 0,
- 0, 0, 0, 0, 0, 393, 123, 124, 125, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 126,
- 0, 0, 0, 394, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 129, 0, 0, 0, 0,
- 0, 398, 395, 397, 0, 130, 131, 132, 0, 134,
- 135, 136, 137, 138, 139, 0, 0, 127, 133, 119,
- 112, 114, 128, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 109, 110,
- 111, 0, 0, 113, 115, 116, 0, 0, 117, 0,
- 118, 0, 0, 0, 120, 121, 122, 0, 0, 0,
- 0, 0, 0, 393, 123, 124, 125, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 126, 0, 0,
- 0, 394, 0, 0, 0, 0, 0, 0, 0, 396,
- 0, 0, 0, 129, 0, 0, 0, 0, 0, 398,
- 395, 397, 0, 130, 131, 132, 0, 134, 135, 136,
- 137, 138, 139, 0, 0, 127, 133, 119, 112, 114,
- 128, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 209, 0, 0, 0,
- 0, 211, 0, 29, 30, 31, 213, 0, 0, 0,
- 0, 0, 0, 214, 33, 0, 0, 0, 0, 0,
- 0, 216, 217, 0, 0, 218, 36, 0, 37, 0,
- 0, 0, 38, 0, 39, 41, 42, 0, 0, 44,
- 0, 0, 0, 46, 0, 47, 0, 0, 0, 0,
- 0, 220, 0, 221, 0, 0, 0, 51, 219, 222,
- 49, 223, 52, 224, 53, 225, 55, 226, 56, 227,
- 228, 0, 0, 43, 54, 32, 210, 212, 0, 40,
- 0, 0, 0, 0, 45, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 209, 0, 0, 0, 0, 211,
- 0, 29, 30, 31, 213, 0, 0, 0, 0, 0,
- 0, 214, 215, 0, 0, 0, 0, 0, 0, 216,
- 217, 0, 0, 218, 36, 0, 37, 0, 0, 0,
- 38, 0, 39, 41, 42, 0, 0, 44, 0, 0,
- 0, 46, 0, 47, 0, 0, 0, 0, 0, 220,
- 0, 221, 0, 0, 0, 51, 219, 222, 49, 223,
- 52, 224, 53, 225, 55, 226, 56, 227, 228, 0,
- 0, 43, 54, 32, 210, 212, 0, 40, 0, 0,
- 0, 0, 45, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 582, 110, 111, 0, 0, 584, 115, 586,
- 30, 31, 587, 0, 118, 0, 0, 0, 120, 589,
- 590, 0, 0, 0, 0, 0, 0, 591, 592, 124,
- 125, 218, 36, 0, 37, 0, 0, 0, 38, 0,
- 39, 593, 42, 0, 0, 595, 0, 0, 0, 46,
- 0, 47, 0, 0, 0, 0, 0, 597, 0, 221,
- 0, 0, 0, 599, 596, 598, 49, 600, 601, 602,
- 53, 604, 605, 606, 607, 608, 609, 0, 0, 594,
- 603, 588, 583, 585, 128, 40, 0, 0, 0, 0,
- 45, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 361, 110, 111, 0, 0, 363, 115, 365, 30, 31,
- 366, 0, 118, 0, 0, 0, 120, 368, 369, 0,
- 0, 0, 0, 0, 0, 370, 371, 124, 125, 218,
- 36, 0, 37, 0, 0, 0, 38, 0, 39, 372,
- 42, 0, 0, 374, 0, 0, 0, 46, 0, 47,
- 0, -265, 0, 0, 0, 376, 0, 221, 0, 0,
- 0, 378, 375, 377, 49, 379, 380, 381, 53, 383,
- 384, 385, 386, 387, 388, 0, 0, 373, 382, 367,
- 362, 364, 128, 40, 0, 0, 0, 0, 45, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
-
- 567, 169, 558, 570, 574, 515, 569, 557, 309, 548,
- 461, 528, 311, 530, 417, 555, 307, 188, 415, 358,
- 392, 250, 628, 612, 320, 623, 150, 253, 16, 637,
- 496, 497, 498, 390, 614, 186, 634, 472, 182, 400,
- 487, 243, 436, 238, 436, 176, 182, 302, 514, 171,
- 238, 439, 334, 429, 439, 447, 454, 336, 339, 358,
- 243, 140, 433, 302, 338, 237, 349, 351, 449, 482,
- 146, 182, 148, 460, 485, 458, 353, 250, 250, 243,
- 344, 410, 238, 163, 467, 456, 524, 143, 436, 425,
- 237, 439, 445, 302, 402, 358, 461, 404, 0, 450,
- 60, 358, 404, 186, 146, 92, 0, 0, 0, 407,
- 500, 60, 0, 638, 500, 60, 84, 536, 320, 500,
- 0, 98, 540, 60, 302, 60, 405, 490, 91, 302,
- 0, 405, 60, 0, 180, 302, 60, 106, 489, 60,
- 60, 60, 180, 60, 93, 60, 286, 60, 285, 60,
- 94, 146, 284, 90, 60, 60, 178, 452, 89, 60,
- 108, 60, 358, 60, 95, 60, 287, 471, 288, 88,
- 60, 302, 451, 60, 60, 60, 452, 451, 60, 404,
- 68, 432, 60, 102, 494, 60, 347, 67, 341, 60,
- 330, 329, 61, 266, 60, 305, 69, 60, 270, 60,
- 70, 303, 60, 60, 60, 480, 451, 0, 405, 479,
- 72, 0, 60, 165, 491, 60, 60, 60, 180, 168,
- 60, 97, 492, 60, 60, 452, 60, 60, 493, 100,
- 96, 60, 0, 77, 60, 0, 270, 332, 298, 270,
- 273, 60, 435, 270, 60, 298, 270, 298, 278, 270,
- 270, 316, 270, 60, 298, 295, 298, 60, 270, 270,
- 297, 270, 270, 106, 291, 60, 60, 326, 313, 317,
- 270, 270, 290, 289, 552, 60, 319, 536, 300, 610,
- 270, 519, 520, 521, 522, 500, 108, 175, 293, 0,
- 0, 500, 508, 0, 0, 544, 0, 472, 613, 547,
- 0, 499, 509, 500, 0, 0, 0, 500, 0, 0,
- 508, 0, 0, 0, 508, 0, 0, 0, 577, 499,
- 509, 0, 0, 499, 509, 580, 581, 519, 520, 521,
- 522, 552, 0, 0, 0, 0, 0, 0, 553, 554,
- 519, 520, 521, 522, 0, 0, 0, 0, 0, 0,
+ 29, 30, 31, 0, 0, 0, 0, 0, 0, 0,
+ 0, 33, 0, 0, 0, 0, 0, 0, 34, 217,
+ 0, 0, 582, 583, 0, 37, 0, 0, 0, 38,
+ 0, 39, 41, 42, 0, 0, 44, 0, 0, 0,
+ 46, 0, 47, 0, 0, 0, 0, 0, 0, 0,
+ 221, 0, 0, 0, 51, 48, 50, 49, 223, 52,
+ 0, 53, 225, 55, 0, 56, 0, 228, 0, 0,
+ 43, 54, 32, 0, 0, 0, 40, 0, 0, 0,
+ 0, 45, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 109, 110, 111, 0, 0, 113, 115, 116, 0,
+ 0, 117, 0, 118, 0, 0, 0, 120, 121, 122,
+ 0, 0, 0, 0, 0, 0, 34, 123, 124, 125,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 126, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 129, 0, 0, 0,
+ 0, 0, 0, 48, 50, 49, 130, 131, 132, 0,
+ 134, 135, 136, 137, 138, 139, 0, 0, 127, 133,
+ 119, 112, 114, 128, 0, 0, 0, 0, 0, 45,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 109,
+ 110, 111, 0, 0, 113, 115, 116, 0, 0, 117,
+ 0, 118, 0, 0, 0, 120, 121, 122, 0, 0,
+ 0, 0, 0, 0, 393, 123, 124, 125, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 126, 0,
+ 0, 0, 394, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 129, 0, 0, 0, 0, 0,
+ 398, 395, 397, 0, 130, 131, 132, 0, 134, 135,
+ 136, 137, 138, 139, 0, 0, 127, 133, 119, 112,
+ 114, 128, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 109, 110, 111,
+ 0, 0, 113, 115, 116, 0, 0, 117, 0, 118,
+ 0, 0, 0, 120, 121, 122, 0, 0, 0, 0,
+ 0, 0, 393, 123, 124, 125, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 126, 0, 0, 0,
+ 394, 0, 0, 0, 0, 0, 0, 0, 396, 0,
+ 0, 0, 129, 0, 0, 0, 0, 0, 398, 395,
+ 397, 0, 130, 131, 132, 0, 134, 135, 136, 137,
+ 138, 139, 0, 0, 127, 133, 119, 112, 114, 128,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 209, 0, 0, 0, 0,
+ 211, 0, 29, 30, 31, 213, 0, 0, 0, 0,
+ 0, 0, 214, 215, 0, 0, 0, 0, 0, 0,
+ 216, 217, 0, 0, 218, 36, 0, 37, 0, 0,
+ 0, 38, 0, 39, 41, 42, 0, 0, 44, 0,
+ 0, 0, 46, 0, 47, 0, 0, 0, 0, 0,
+ 220, 0, 221, 0, 0, 0, 51, 219, 222, 49,
+ 223, 52, 224, 53, 225, 55, 226, 56, 227, 228,
+ 0, 0, 43, 54, 32, 210, 212, 0, 40, 0,
+ 0, 0, 0, 45, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 209, 0, 0, 0, 0, 211, 0,
+ 29, 30, 31, 213, 0, 0, 0, 0, 0, 0,
+ 214, 33, 0, 0, 0, 0, 0, 0, 216, 217,
+ 0, 0, 218, 36, 0, 37, 0, 0, 0, 38,
+ 0, 39, 41, 42, 0, 0, 44, 0, 0, 0,
+ 46, 0, 47, 0, 0, 0, 0, 0, 220, 0,
+ 221, 0, 0, 0, 51, 219, 222, 49, 223, 52,
+ 224, 53, 225, 55, 226, 56, 227, 228, 0, 0,
+ 43, 54, 32, 210, 212, 0, 40, 0, 0, 0,
+ 0, 45, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 586, 110, 111, 0, 0, 588, 115, 590, 30,
+ 31, 591, 0, 118, 0, 0, 0, 120, 593, 594,
+ 0, 0, 0, 0, 0, 0, 595, 596, 124, 125,
+ 218, 36, 0, 37, 0, 0, 0, 38, 0, 39,
+ 597, 42, 0, 0, 599, 0, 0, 0, 46, 0,
+ 47, 0, 0, 0, 0, 0, 601, 0, 221, 0,
+ 0, 0, 603, 600, 602, 49, 604, 605, 606, 53,
+ 608, 609, 610, 611, 612, 613, 0, 0, 598, 607,
+ 592, 587, 589, 128, 40, 0, 0, 0, 0, 45,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 361,
+ 110, 111, 0, 0, 363, 115, 365, 30, 31, 366,
+ 0, 118, 0, 0, 0, 120, 368, 369, 0, 0,
+ 0, 0, 0, 0, 370, 371, 124, 125, 218, 36,
+ 0, 37, 0, 0, 0, 38, 0, 39, 372, 42,
+ 0, 0, 374, 0, 0, 0, 46, 0, 47, 0,
+ -268, 0, 0, 0, 376, 0, 221, 0, 0, 0,
+ 378, 375, 377, 49, 379, 380, 381, 53, 383, 384,
+ 385, 386, 387, 388, 0, 0, 373, 382, 367, 362,
+ 364, 128, 40, 0, 0, 0, 0, 45, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0,
+
+ 534, 311, 497, 309, 532, 461, 498, 499, 516, 515,
+ 619, 638, 16, 552, 436, 358, 616, 472, 562, 320,
+ 528, 238, 487, 182, 250, 243, 253, 182, 302, 641,
+ 627, 632, 150, 485, 143, 454, 439, 402, 445, 559,
+ 237, 574, 250, 578, 561, 186, 618, 458, 238, 349,
+ 573, 449, 447, 571, 243, 347, 450, 243, 460, 351,
+ 238, 353, 358, 410, 415, 439, 176, 188, 436, 250,
+ 467, 417, 433, 182, 425, 429, 302, 169, 456, 358,
+ 171, 140, 336, 334, 338, 344, 436, 392, 390, 400,
+ 163, 302, 307, 148, 146, 339, 439, 404, 302, 358,
+ 404, 358, 0, 482, 501, 480, 0, 642, 0, 479,
+ 0, 0, 0, 320, 60, 0, 186, 501, 90, 60,
+ 60, 489, 302, 60, 617, 93, 0, 88, 0, 405,
+ 0, 461, 405, 60, 60, 451, 180, 60, 0, 180,
+ 60, 60, 60, 451, 60, 95, 89, 146, 266, 287,
+ 60, 146, 407, 270, 60, 288, 178, 60, 106, 452,
+ 0, 60, 60, 60, 102, 60, 302, 332, 286, 60,
+ 92, 452, 60, 60, 451, 60, 165, 168, 285, 432,
+ 284, 435, 60, 60, 108, 501, 329, 94, 540, 96,
+ 60, 330, 60, 302, 494, 60, 77, 237, 60, 404,
+ 452, 341, 471, 72, 60, 60, 67, 69, 60, 60,
+ 68, 0, 70, 60, 60, 60, 61, 180, 60, 60,
+ 98, 491, 60, 91, 490, 60, 60, 60, 493, 60,
+ 84, 405, 60, 97, 492, 305, 0, 60, 0, 298,
+ 0, 100, 270, 298, 270, 298, 106, 298, 270, 0,
+ 270, 60, 270, 60, 316, 0, 270, 0, 270, 298,
+ 291, 326, 303, 60, 270, 319, 313, 300, 270, 297,
+ 60, 60, 108, 175, 295, 270, 270, 290, 60, 501,
+ 273, 317, 60, 270, 60, 278, 509, 270, 0, 270,
+ 0, 289, 0, 548, 0, 293, 551, 0, 500, 510,
+ 501, 501, 0, 544, 501, 0, 0, 0, 509, 0,
+ 0, 509, 520, 521, 522, 523, 527, 524, 525, 0,
+ 500, 510, 0, 500, 510, 564, 520, 521, 522, 523,
+ 527, 524, 525, 581, 0, 0, 0, 0, 0, 0,
+ 584, 585, 520, 521, 522, 523, 527, 524, 525, 556,
+ 0, 0, 0, 0, 0, 0, 557, 558, 520, 521,
+ 522, 523, 527, 524, 525, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 560, 519, 520, 521, 522,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 556, 0, 0, 540, 0, 614,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 472, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0};
+ 0, 0, 0, 0, 0, 0, 0, 0};
const short QmlJSGrammar::action_check [] = {
- 36, 36, 33, 33, 60, 7, 7, 36, 8, 36,
- 7, 16, 55, 7, 7, 7, 55, 36, 36, 7,
- 90, 7, 55, 7, 36, 7, 60, 33, 60, 33,
- 33, 7, 7, 29, 8, 60, 17, 7, 66, 37,
- 66, 24, 33, 7, 34, 5, 33, 36, 33, 7,
- 60, 5, 7, 33, 33, 7, 7, 20, 36, 36,
- 5, 7, 61, 36, 7, 36, 7, 17, 8, 77,
- 36, 7, 79, 2, 33, 36, 8, 1, 8, 36,
- 48, 2, 1, 55, 79, 1, 48, 36, 8, 36,
- 2, 60, 31, 7, 61, 33, 0, 8, 7, 2,
- 7, 36, 55, 36, 60, 1, 8, 15, 8, 10,
- 8, 8, -1, 8, 79, 8, 60, 48, 8, 61,
- 48, 7, 8, 60, 50, 8, 34, 6, 54, 42,
- 8, 15, 8, 8, 61, 62, 61, 62, 61, 62,
- 53, 20, 90, 61, 62, 79, 61, 62, 8, 8,
- 34, 61, 62, 40, 55, 61, 62, 8, 60, 56,
- 60, 7, 60, 56, 51, 60, 56, 40, 40, 8,
- 50, 29, 40, 56, 54, 15, 61, 62, 51, 51,
- 56, 12, 60, 51, 25, 60, 27, 61, 62, 8,
- 61, 62, 15, 25, 34, 27, 36, 38, 7, 12,
- 60, 60, 12, 29, 61, 62, 38, 25, 29, 27,
- 61, 34, 7, 36, 25, -1, 27, 75, 15, -1,
- 38, 7, 61, 62, 33, 7, 57, 38, 86, -1,
- -1, 29, 63, 25, 91, 27, 29, 34, 25, 36,
- 27, 29, 61, 62, 57, -1, 38, 57, 47, 75,
- 63, 38, 15, 63, 75, 25, 8, 27, -1, 25,
- 86, 27, 61, 62, 36, 86, 61, 62, 38, 18,
- 19, 34, 38, 36, -1, 61, 62, 75, -1, 61,
- 62, 29, 75, 92, 18, 19, 15, 75, 86, 61,
- 62, -1, 91, 86, 29, 15, 45, 46, 86, 18,
- 19, 18, 19, 29, 33, 34, -1, 36, -1, 61,
- 62, 45, 46, 33, 34, -1, 36, 29, 66, 67,
- 68, 29, -1, -1, -1, -1, 45, 46, 45, 46,
- 29, 66, 67, 68, 23, 24, 29, -1, -1, 29,
- 66, 67, 68, 32, 92, -1, 35, -1, 37, 29,
- 25, -1, 27, 29, 66, 67, 68, 92, 66, 67,
- 68, -1, -1, 38, -1, -1, 92, 66, 67, 68,
+ 36, 36, 24, 7, 55, 7, 7, 7, 60, 36,
+ 8, 7, 37, 7, 7, 33, 55, 55, 60, 36,
+ 36, 33, 33, 55, 8, 33, 7, 7, 34, 36,
+ 16, 20, 7, 36, 7, 7, 33, 36, 33, 60,
+ 7, 7, 7, 5, 7, 5, 5, 90, 33, 36,
+ 7, 33, 7, 36, 7, 33, 66, 36, 7, 36,
+ 29, 7, 33, 31, 1, 7, 17, 55, 60, 33,
+ 60, 2, 8, 7, 48, 66, 1, 7, 36, 2,
+ 8, 7, 36, 2, 60, 2, 8, 7, 17, 1,
+ 60, 36, 0, 36, 8, 36, 48, 36, 33, 8,
+ 61, 1, 6, 36, 60, 8, -1, 8, -1, 15,
+ 48, 10, 7, 8, 61, 8, 20, -1, -1, -1,
+ -1, -1, 8, -1, -1, -1, -1, 48, 34, 79,
+ 40, 79, 8, 77, 61, 8, 60, 8, 8, 79,
+ 8, 51, -1, 40, 42, 61, 62, 8, 61, 62,
+ 8, 7, -1, 56, 51, 53, 55, 8, 90, 60,
+ 50, 79, 8, 56, 54, 61, 62, 61, 62, 61,
+ 62, 40, 61, 62, 60, 40, 61, 62, 61, 62,
+ 56, 8, 51, 56, 50, 7, 51, 15, 54, 60,
+ 60, 25, 60, 27, 25, 56, 27, 61, 62, 61,
+ 62, 36, 60, 29, 38, 29, 34, 38, 36, 25,
+ 61, 27, 29, -1, 60, 25, 12, 27, 29, 25,
+ 29, 27, 38, 25, 29, 27, 61, 62, 38, 12,
+ 7, 12, 38, 60, 8, 25, 38, 27, -1, 61,
+ 62, 25, 8, 27, 7, -1, 15, 7, 38, 75,
+ 25, 75, 27, 8, 38, 25, 33, 27, 75, -1,
+ 86, 57, 86, 38, 75, 34, 75, 63, 38, 86,
+ 75, 15, 15, -1, 57, 86, 57, 86, -1, -1,
+ 63, 86, 63, 61, 62, -1, -1, 61, 62, 15,
+ 34, 34, 36, 36, -1, 61, 62, 47, 61, 62,
+ 15, 61, 62, -1, 18, 19, 61, 62, 34, 15,
+ 36, 61, 62, 91, -1, 92, 18, 19, 33, 34,
+ 29, 36, 18, 19, 18, 19, 29, 33, 34, 29,
+ 36, 45, 46, 25, 29, 27, -1, -1, -1, -1,
+ -1, 91, -1, 45, 46, -1, 38, -1, -1, 45,
+ 46, 45, 46, -1, -1, -1, -1, 66, 67, 68,
-1, -1, -1, 66, 67, 68, 66, 67, 68, -1,
- 92, -1, -1, -1, 92, -1, 66, 67, 68, -1,
- 66, 67, 68, 92, 23, 24, -1, 29, -1, 92,
- -1, -1, 92, 32, -1, -1, 35, 29, 37, 23,
- 24, -1, 92, -1, 36, -1, 92, -1, 32, 23,
- 24, 35, -1, 37, -1, -1, -1, 29, 32, 23,
- 24, 35, -1, 37, 66, 67, 68, 31, 32, 23,
- 24, 35, -1, 37, 66, 67, 68, 31, 32, -1,
- -1, 35, -1, 37, 94, 95, 96, 97, 98, 99,
- 92, -1, -1, -1, 66, 67, 68, 23, 24, -1,
- 92, -1, -1, -1, -1, 31, 32, 23, 24, 35,
- 29, 37, -1, -1, -1, 31, 32, 36, 29, 35,
- 92, 37, -1, -1, 23, 24, 29, -1, -1, 29,
- 23, 24, 31, 32, -1, -1, 35, 29, 37, 32,
- -1, -1, 35, -1, 37, 29, -1, 66, 67, 68,
- 61, 62, -1, -1, -1, 66, 67, 68, 61, 62,
- -1, 61, 62, 66, 67, 68, 66, 67, 68, 61,
- 62, -1, -1, 92, 66, 67, 68, 61, 62, -1,
- -1, 92, 66, 67, 68, -1, -1, -1, 3, 92,
- -1, -1, 92, -1, -1, -1, -1, -1, 13, -1,
- 92, -1, 17, -1, -1, -1, -1, -1, 92, 29,
- -1, 26, -1, 28, -1, -1, 31, -1, -1, -1,
- -1, -1, -1, -1, 39, -1, 41, 42, -1, -1,
- -1, -1, -1, -1, 49, -1, -1, 52, 53, -1,
- -1, 61, 62, 58, -1, -1, 66, 67, 68, 64,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 80, -1, -1, -1, 12,
- 13, -1, 92, -1, -1, -1, -1, -1, -1, 22,
- -1, -1, 3, -1, -1, -1, 29, -1, -1, -1,
- 33, 34, 13, 36, -1, -1, 17, -1, -1, -1,
- 43, -1, -1, -1, 47, 26, -1, 28, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 39, -1,
- 41, 42, 65, 66, 67, 68, -1, 70, 49, -1,
- -1, 52, 53, -1, -1, -1, -1, 58, 81, 82,
- 83, -1, -1, 64, 87, -1, -1, -1, -1, 92,
- -1, -1, -1, 12, 13, -1, -1, -1, -1, 80,
- -1, -1, -1, 22, -1, -1, -1, -1, -1, -1,
- 29, -1, -1, -1, 33, 34, -1, 36, -1, -1,
- -1, 12, 13, -1, 43, -1, -1, -1, 47, -1,
- -1, 22, -1, -1, -1, -1, -1, -1, 29, -1,
- -1, -1, 33, 34, -1, 36, 65, 66, 67, 68,
- -1, 70, 43, -1, -1, -1, 47, -1, -1, -1,
- -1, -1, 81, 82, 83, -1, -1, -1, 87, -1,
- -1, -1, -1, 92, 65, 66, 67, 68, -1, 70,
- -1, -1, -1, 12, 13, -1, -1, -1, -1, -1,
- 81, 82, 83, 22, -1, -1, 87, -1, -1, -1,
- 29, 92, -1, -1, 33, 34, -1, 36, -1, -1,
- -1, 12, 13, -1, 43, -1, -1, -1, 47, -1,
- -1, 22, -1, -1, -1, -1, -1, -1, 29, -1,
- -1, -1, 33, 34, -1, 36, 65, 66, 67, 68,
- -1, 70, 43, -1, -1, -1, 47, -1, -1, -1,
- -1, -1, 81, 82, 83, -1, -1, -1, 87, -1,
- -1, -1, -1, 92, 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, 92, -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, 92, -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, 66, 67, 68, -1, -1, 23, 24, -1, -1,
+ -1, 29, -1, 92, -1, 32, 23, 24, 35, 92,
+ 37, 29, 92, 23, 24, 32, 29, 92, 35, -1,
+ 37, 29, 32, 23, 24, 35, -1, 37, -1, -1,
+ 29, -1, 32, 23, 24, 35, -1, 37, 66, 67,
+ 68, 31, 32, -1, 29, 35, -1, 37, 66, 67,
+ 68, 36, -1, 66, 67, 68, -1, -1, 66, 67,
+ 68, -1, -1, -1, 92, -1, -1, 66, 67, 68,
+ -1, -1, -1, -1, 92, -1, -1, 23, 24, 92,
+ -1, 66, 67, 68, 92, 31, 32, 23, 24, 35,
+ -1, 37, -1, 92, -1, 31, 32, 23, 24, 35,
+ -1, 37, 29, 23, 24, 31, 32, 92, -1, 35,
+ 29, 37, 32, 29, -1, 35, -1, 37, 94, 95,
+ 96, 97, 98, 99, 29, -1, -1, -1, -1, -1,
+ -1, 36, -1, -1, 61, 62, -1, -1, -1, 66,
+ 67, 68, 61, 62, -1, 61, 62, 66, 67, 68,
+ 66, 67, 68, -1, -1, -1, -1, -1, -1, -1,
+ 29, 66, 67, 68, -1, 92, -1, -1, 29, -1,
+ -1, 29, -1, 92, -1, -1, 92, -1, -1, -1,
+ -1, -1, 23, 24, -1, -1, -1, 92, -1, -1,
+ 31, 32, 61, 62, 35, -1, 37, 66, 67, 68,
+ 61, 62, 3, 61, 62, 66, 67, 68, 66, 67,
+ 68, -1, 13, -1, -1, -1, 17, -1, -1, -1,
+ -1, -1, -1, 92, -1, 26, -1, 28, -1, -1,
+ 31, 92, -1, -1, 92, -1, -1, -1, 39, -1,
+ 41, 42, -1, -1, -1, -1, -1, -1, 49, -1,
+ -1, 52, 53, -1, -1, -1, -1, 58, -1, 12,
+ 13, 3, -1, 64, -1, -1, -1, -1, -1, 22,
+ -1, 13, -1, -1, -1, 17, 29, -1, -1, 80,
+ 33, 34, -1, 36, 26, -1, 28, -1, -1, -1,
+ 43, -1, -1, -1, 47, -1, -1, 39, -1, 41,
+ 42, -1, -1, -1, -1, -1, -1, 49, -1, -1,
+ 52, 53, 65, 66, 67, 68, 58, 70, -1, -1,
+ -1, -1, 64, -1, -1, -1, -1, -1, 81, 82,
+ 83, -1, 12, 13, 87, -1, -1, -1, 80, 92,
+ -1, -1, 22, -1, -1, -1, -1, -1, -1, 29,
+ -1, -1, -1, 33, 34, -1, 36, -1, -1, -1,
+ 12, 13, -1, 43, -1, -1, -1, 47, -1, -1,
+ 22, -1, -1, -1, -1, -1, -1, 29, -1, -1,
+ -1, 33, 34, -1, 36, 65, 66, 67, 68, -1,
+ 70, 43, -1, -1, -1, 47, -1, -1, -1, -1,
+ -1, 81, 82, 83, -1, -1, -1, 87, -1, -1,
+ -1, -1, 92, 65, 66, 67, 68, -1, 70, -1,
+ -1, -1, 12, 13, -1, -1, -1, -1, -1, 81,
+ 82, 83, 22, -1, -1, 87, -1, -1, -1, 29,
+ 92, -1, -1, 33, 34, -1, 36, -1, -1, -1,
+ 12, 13, -1, 43, -1, -1, -1, 47, -1, -1,
+ 22, -1, -1, -1, -1, -1, -1, 29, -1, -1,
+ -1, 33, 34, -1, 36, 65, 66, 67, 68, -1,
+ 70, 43, -1, -1, -1, 47, -1, -1, -1, -1,
+ -1, 81, 82, 83, -1, -1, -1, 87, -1, -1,
+ -1, -1, 92, 65, 66, 67, 68, -1, 70, -1,
+ -1, -1, 12, 13, -1, -1, -1, -1, -1, 81,
+ 82, 83, 22, -1, -1, 87, -1, -1, -1, 29,
+ 92, -1, -1, 33, 34, -1, 36, -1, -1, -1,
+ 12, 13, -1, 43, -1, -1, -1, 47, -1, -1,
+ 22, -1, -1, -1, -1, -1, -1, 29, -1, -1,
+ -1, 33, 34, -1, 36, 65, 66, 67, 68, -1,
+ 70, 43, -1, -1, -1, 47, -1, -1, -1, -1,
+ -1, 81, 82, 83, -1, -1, -1, 87, -1, -1,
+ -1, -1, 92, 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,
+ 92, -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, -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, 92, -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, 92, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 10, -1, 12, 13, -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, 92, -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, 92, -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, 92, -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, -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, 92, -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, 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,
- -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, 92, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 7, -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, 92, -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, 92, -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, 70, -1, 72, -1, 74, 75, 76, -1, -1,
-1, -1, 81, 82, 83, -1, -1, -1, 87, -1,
-1, -1, -1, 92, -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, 92, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 11, 12, 13, -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, 92, -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, 92, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 8, -1, -1, 11, 12, 13, -1, -1, -1,
-1, -1, -1, -1, -1, 22, -1, -1, -1, -1,
- -1, -1, 29, 30, -1, -1, 33, 34, -1, 36,
+ -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,
+ 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, 92, -1, -1, -1, -1,
@@ -850,155 +868,137 @@ const short QmlJSGrammar::action_check [] = {
-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,
+ -1, -1, -1, 65, 66, 67, 68, 69, 70, -1,
+ 72, 73, 74, -1, 76, -1, 78, -1, -1, 81,
82, 83, -1, -1, -1, 87, -1, -1, -1, -1,
92, -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, 92, -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, 92, -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, 92, -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,
- 92, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 4, 5, 6, -1, -1, 9, 10, 11, -1, -1,
- 14, -1, 16, -1, -1, -1, 20, 21, 22, -1,
- -1, -1, -1, -1, -1, 29, 30, 31, 32, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 43,
- -1, -1, -1, 47, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 59, -1, -1, -1, -1,
- -1, 65, 66, 67, -1, 69, 70, 71, -1, 73,
- 74, 75, 76, 77, 78, -1, -1, 81, 82, 83,
- 84, 85, 86, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 4, 5,
- 6, -1, -1, 9, 10, 11, -1, -1, 14, -1,
- 16, -1, -1, -1, 20, 21, 22, -1, -1, -1,
- -1, -1, -1, 29, 30, 31, 32, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 43, -1, -1,
- -1, 47, -1, -1, -1, -1, -1, -1, -1, 55,
- -1, -1, -1, 59, -1, -1, -1, -1, -1, 65,
- 66, 67, -1, 69, 70, 71, -1, 73, 74, 75,
- 76, 77, 78, -1, -1, 81, 82, 83, 84, 85,
- 86, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -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, 92, -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, 92, -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,
- 92, -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, 92, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
-
- 26, 36, 15, 15, 15, 15, 26, 26, 3, 15,
- 15, 26, 2, 15, 3, 19, 2, 15, 2, 2,
- 37, 2, 15, 19, 15, 13, 68, 3, 3, 11,
- 105, 4, 2, 36, 19, 15, 15, 36, 15, 36,
- 3, 15, 3, 15, 3, 3, 15, 3, 26, 36,
- 15, 22, 2, 94, 22, 15, 3, 3, 15, 2,
- 15, 3, 3, 3, 2, 4, 3, 2, 22, 36,
- 36, 15, 36, 2, 36, 3, 2, 2, 2, 15,
- 101, 2, 15, 36, 36, 2, 13, 36, 3, 97,
- 4, 22, 99, 3, 2, 2, 15, 13, -1, 22,
- 45, 2, 13, 15, 36, 50, -1, -1, -1, 41,
- 13, 45, -1, 16, 13, 45, 50, 16, 15, 13,
- -1, 51, 16, 45, 3, 45, 42, 47, 50, 3,
- -1, 42, 45, -1, 47, 3, 45, 15, 47, 45,
- 45, 45, 47, 45, 50, 45, 50, 45, 50, 45,
- 50, 36, 50, 49, 45, 45, 41, 47, 49, 45,
- 38, 45, 2, 45, 50, 45, 50, 86, 50, 49,
- 45, 3, 47, 45, 45, 45, 47, 47, 45, 13,
- 47, 82, 45, 55, 47, 45, 2, 47, 100, 45,
- 69, 88, 48, 45, 45, 69, 47, 45, 50, 45,
- 48, 69, 45, 45, 45, 32, 47, -1, 42, 36,
- 53, -1, 45, 59, 47, 45, 45, 45, 47, 61,
- 45, 51, 47, 45, 45, 47, 45, 45, 47, 57,
- 51, 45, -1, 51, 45, -1, 50, 69, 45, 50,
- 54, 45, 82, 50, 45, 45, 50, 45, 52, 50,
- 50, 62, 50, 45, 45, 56, 45, 45, 50, 50,
- 67, 50, 50, 15, 52, 45, 45, 67, 60, 67,
- 50, 50, 52, 52, 13, 45, 67, 16, 67, 18,
- 50, 22, 23, 24, 25, 13, 38, 39, 58, -1,
- -1, 13, 20, -1, -1, 5, -1, 36, 20, 5,
- -1, 29, 30, 13, -1, -1, -1, 13, -1, -1,
- 20, -1, -1, -1, 20, -1, -1, -1, 13, 29,
- 30, -1, -1, 29, 30, 20, 21, 22, 23, 24,
- 25, 13, -1, -1, -1, -1, -1, -1, 20, 21,
- 22, 23, 24, 25, -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, 69, 70,
+ -1, 72, 73, 74, -1, 76, -1, 78, -1, -1,
+ 81, 82, 83, -1, -1, -1, 87, -1, -1, -1,
+ -1, 92, -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, 92,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 4,
+ 5, 6, -1, -1, 9, 10, 11, -1, -1, 14,
+ -1, 16, -1, -1, -1, 20, 21, 22, -1, -1,
+ -1, -1, -1, -1, 29, 30, 31, 32, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 43, -1,
+ -1, -1, 47, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 59, -1, -1, -1, -1, -1,
+ 65, 66, 67, -1, 69, 70, 71, -1, 73, 74,
+ 75, 76, 77, 78, -1, -1, 81, 82, 83, 84,
+ 85, 86, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 4, 5, 6,
+ -1, -1, 9, 10, 11, -1, -1, 14, -1, 16,
+ -1, -1, -1, 20, 21, 22, -1, -1, -1, -1,
+ -1, -1, 29, 30, 31, 32, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 43, -1, -1, -1,
+ 47, -1, -1, -1, -1, -1, -1, -1, 55, -1,
+ -1, -1, 59, -1, -1, -1, -1, -1, 65, 66,
+ 67, -1, 69, 70, 71, -1, 73, 74, 75, 76,
+ 77, 78, -1, -1, 81, 82, 83, 84, 85, 86,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -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, 92, -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, 92, -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, 92,
+ -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, 92, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1,
+
+ 15, 2, 105, 3, 29, 15, 4, 2, 15, 29,
+ 9, 15, 3, 15, 3, 2, 19, 39, 15, 15,
+ 13, 15, 3, 15, 2, 15, 3, 15, 3, 11,
+ 13, 15, 71, 39, 39, 3, 22, 2, 99, 19,
+ 4, 15, 2, 15, 29, 15, 19, 3, 15, 3,
+ 29, 22, 15, 29, 15, 2, 22, 15, 2, 2,
+ 15, 2, 2, 2, 2, 22, 3, 15, 3, 2,
+ 39, 3, 3, 15, 97, 94, 3, 39, 2, 2,
+ 39, 3, 3, 2, 2, 101, 3, 40, 39, 39,
+ 39, 3, 2, 39, 39, 15, 22, 13, 3, 2,
+ 13, 2, -1, 39, 13, 35, -1, 16, -1, 39,
+ -1, -1, -1, 15, 48, -1, 15, 13, 52, 48,
+ 48, 50, 3, 48, 20, 53, -1, 52, -1, 45,
+ -1, 15, 45, 48, 48, 50, 50, 48, -1, 50,
+ 48, 48, 48, 50, 48, 53, 52, 39, 48, 53,
+ 48, 39, 44, 53, 48, 53, 44, 48, 15, 50,
+ -1, 48, 48, 48, 58, 48, 3, 72, 53, 48,
+ 53, 50, 48, 48, 50, 48, 62, 64, 53, 82,
+ 53, 82, 48, 48, 41, 13, 88, 53, 16, 54,
+ 48, 72, 48, 3, 50, 48, 54, 4, 48, 13,
+ 50, 100, 86, 56, 48, 48, 50, 50, 48, 48,
+ 50, -1, 51, 48, 48, 48, 51, 50, 48, 48,
+ 54, 50, 48, 53, 50, 48, 48, 48, 50, 48,
+ 53, 45, 48, 54, 50, 72, -1, 48, -1, 48,
+ -1, 60, 53, 48, 53, 48, 15, 48, 53, -1,
+ 53, 48, 53, 48, 65, -1, 53, -1, 53, 48,
+ 55, 70, 72, 48, 53, 70, 63, 70, 53, 70,
+ 48, 48, 41, 42, 59, 53, 53, 55, 48, 13,
+ 57, 70, 48, 53, 48, 55, 20, 53, -1, 53,
+ -1, 55, -1, 5, -1, 61, 5, -1, 32, 33,
+ 13, 13, -1, 16, 13, -1, -1, -1, 20, -1,
+ -1, 20, 22, 23, 24, 25, 26, 27, 28, -1,
+ 32, 33, -1, 32, 33, 21, 22, 23, 24, 25,
+ 26, 27, 28, 13, -1, -1, -1, -1, -1, -1,
+ 20, 21, 22, 23, 24, 25, 26, 27, 28, 13,
+ -1, -1, -1, -1, -1, -1, 20, 21, 22, 23,
+ 24, 25, 26, 27, 28, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 21, 22, 23, 24, 25,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 13, -1, -1, 16, -1, 18,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 39, -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, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1};
+ -1, -1, -1, -1, -1, -1, -1, -1};
QT_END_NAMESPACE
diff --git a/src/libs/qmljs/parser/qmljsgrammar_p.h b/src/libs/qmljs/parser/qmljsgrammar_p.h
index 794ba0ad1b..b4439d90f7 100644
--- a/src/libs/qmljs/parser/qmljsgrammar_p.h
+++ b/src/libs/qmljs/parser/qmljsgrammar_p.h
@@ -157,15 +157,15 @@ public:
T_XOR = 79,
T_XOR_EQ = 80,
- ACCEPT_STATE = 640,
- RULE_COUNT = 345,
- STATE_COUNT = 641,
+ ACCEPT_STATE = 644,
+ RULE_COUNT = 349,
+ STATE_COUNT = 645,
TERMINAL_COUNT = 102,
NON_TERMINAL_COUNT = 107,
- GOTO_INDEX_OFFSET = 641,
- GOTO_INFO_OFFSET = 2818,
- GOTO_CHECK_OFFSET = 2818
+ GOTO_INDEX_OFFSET = 645,
+ GOTO_INFO_OFFSET = 2807,
+ GOTO_CHECK_OFFSET = 2807
};
static const char *const spell [];
diff --git a/src/libs/qmljs/parser/qmljslexer.cpp b/src/libs/qmljs/parser/qmljslexer.cpp
index 1464e5bc3b..f105005e6e 100644
--- a/src/libs/qmljs/parser/qmljslexer.cpp
+++ b/src/libs/qmljs/parser/qmljslexer.cpp
@@ -97,13 +97,18 @@ Lexer::Lexer(Engine *engine)
, _restrictedKeyword(false)
, _terminator(false)
, _followsClosingBrace(false)
- , _delimited(false)
+ , _delimited(true)
, _qmlMode(true)
{
if (engine)
engine->setLexer(this);
}
+bool Lexer::qmlMode() const
+{
+ return _qmlMode;
+}
+
QString Lexer::code() const
{
return _code;
@@ -147,7 +152,7 @@ void Lexer::setCode(const QString &code, int lineno, bool qmlMode)
_restrictedKeyword = false;
_terminator = false;
_followsClosingBrace = false;
- _delimited = false;
+ _delimited = true;
}
void Lexer::scanChar()
@@ -176,6 +181,7 @@ int Lexer::lex()
switch (_tokenKind) {
case T_LBRACE:
case T_SEMICOLON:
+ case T_COLON:
_delimited = true;
break;
diff --git a/src/libs/qmljs/parser/qmljslexer_p.h b/src/libs/qmljs/parser/qmljslexer_p.h
index 338fd0be40..22bfaa6bb8 100644
--- a/src/libs/qmljs/parser/qmljslexer_p.h
+++ b/src/libs/qmljs/parser/qmljslexer_p.h
@@ -136,6 +136,8 @@ public:
public:
Lexer(Engine *engine);
+ bool qmlMode() const;
+
QString code() const;
void setCode(const QString &code, int lineno, bool qmlMode = true);
@@ -174,12 +176,13 @@ public:
BalancedParentheses
};
+protected:
+ int classify(const QChar *s, int n, bool qmlMode);
+
private:
inline void scanChar();
int scanToken();
- int classify(const QChar *s, int n, bool qmlMode);
-
bool isLineTerminator() const;
static bool isIdentLetter(QChar c);
static bool isDecimalDigit(ushort c);
diff --git a/src/libs/qmljs/parser/qmljsparser.cpp b/src/libs/qmljs/parser/qmljsparser.cpp
index dbd0797ee4..e9865343f1 100644
--- a/src/libs/qmljs/parser/qmljsparser.cpp
+++ b/src/libs/qmljs/parser/qmljsparser.cpp
@@ -364,7 +364,7 @@ case 33: {
sym(1).Node = node;
} break;
-case 38:
+case 41:
{
AST::UiScriptBinding *node = new (pool) AST::UiScriptBinding(
sym(1).UiQualifiedId, sym(3).Statement);
@@ -372,28 +372,29 @@ case 38:
sym(1).Node = node;
} break;
-case 42: {
+case 45: {
sym(1).Node = 0;
} break;
-case 43: {
+case 46: {
sym(1).Node = sym(1).UiParameterList->finish ();
} break;
-case 44: {
+case 47: {
AST::UiParameterList *node = new (pool) AST::UiParameterList(stringRef(1), stringRef(2));
+ node->propertyTypeToken = loc(1);
node->identifierToken = loc(2);
sym(1).Node = node;
} break;
-case 45: {
+case 48: {
AST::UiParameterList *node = new (pool) AST::UiParameterList(sym(1).UiParameterList, stringRef(3), stringRef(4));
node->commaToken = loc(2);
node->identifierToken = loc(4);
sym(1).Node = node;
} break;
-case 47: {
+case 50: {
AST::UiPublicMember *node = new (pool) AST::UiPublicMember(QStringRef(), stringRef(2));
node->type = AST::UiPublicMember::Signal;
node->propertyToken = loc(1);
@@ -404,7 +405,7 @@ case 47: {
sym(1).Node = node;
} break;
-case 49: {
+case 52: {
AST::UiPublicMember *node = new (pool) AST::UiPublicMember(QStringRef(), stringRef(2));
node->type = AST::UiPublicMember::Signal;
node->propertyToken = loc(1);
@@ -414,7 +415,7 @@ case 49: {
sym(1).Node = node;
} break;
-case 51: {
+case 54: {
AST::UiPublicMember *node = new (pool) AST::UiPublicMember(stringRef(4), stringRef(6));
node->typeModifier = stringRef(2);
node->propertyToken = loc(1);
@@ -425,7 +426,7 @@ case 51: {
sym(1).Node = node;
} break;
-case 53: {
+case 56: {
AST::UiPublicMember *node = new (pool) AST::UiPublicMember(stringRef(2), stringRef(3));
node->propertyToken = loc(1);
node->typeToken = loc(2);
@@ -434,7 +435,7 @@ case 53: {
sym(1).Node = node;
} break;
-case 55: {
+case 58: {
AST::UiPublicMember *node = new (pool) AST::UiPublicMember(stringRef(3), stringRef(4));
node->isDefaultMember = true;
node->defaultToken = loc(1);
@@ -445,7 +446,7 @@ case 55: {
sym(1).Node = node;
} break;
-case 56: {
+case 59: {
AST::UiPublicMember *node = new (pool) AST::UiPublicMember(stringRef(2), stringRef(3),
sym(5).Statement);
node->propertyToken = loc(1);
@@ -455,7 +456,7 @@ case 56: {
sym(1).Node = node;
} break;
-case 57: {
+case 60: {
AST::UiPublicMember *node = new (pool) AST::UiPublicMember(stringRef(3), stringRef(4),
sym(6).Statement);
node->isReadonlyMember = true;
@@ -467,7 +468,7 @@ case 57: {
sym(1).Node = node;
} break;
-case 58: {
+case 61: {
AST::UiPublicMember *node = new (pool) AST::UiPublicMember(stringRef(3), stringRef(4),
sym(6).Statement);
node->isDefaultMember = true;
@@ -479,7 +480,7 @@ case 58: {
sym(1).Node = node;
} break;
-case 59: {
+case 62: {
AST::UiPublicMember *node = new (pool) AST::UiPublicMember(stringRef(4), stringRef(6));
node->typeModifier = stringRef(2);
node->propertyToken = loc(1);
@@ -503,7 +504,7 @@ case 59: {
sym(1).Node = node;
} break;
-case 60: {
+case 63: {
AST::UiPublicMember *node = new (pool) AST::UiPublicMember(stringRef(2), stringRef(3));
node->propertyToken = loc(1);
node->typeToken = loc(2);
@@ -523,57 +524,57 @@ case 60: {
sym(1).Node = node;
} break;
-case 61: {
+case 64: {
sym(1).Node = new (pool) AST::UiSourceElement(sym(1).Node);
} break;
-case 62: {
+case 65: {
sym(1).Node = new (pool) AST::UiSourceElement(sym(1).Node);
} break;
-case 68: {
+case 71: {
AST::ThisExpression *node = new (pool) AST::ThisExpression();
node->thisToken = loc(1);
sym(1).Node = node;
} break;
-case 69: {
+case 72: {
AST::IdentifierExpression *node = new (pool) AST::IdentifierExpression(stringRef(1));
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 70: {
+case 73: {
AST::NullExpression *node = new (pool) AST::NullExpression();
node->nullToken = loc(1);
sym(1).Node = node;
} break;
-case 71: {
+case 74: {
AST::TrueLiteral *node = new (pool) AST::TrueLiteral();
node->trueToken = loc(1);
sym(1).Node = node;
} break;
-case 72: {
+case 75: {
AST::FalseLiteral *node = new (pool) AST::FalseLiteral();
node->falseToken = loc(1);
sym(1).Node = node;
} break;
-case 73: {
+case 76: {
AST::NumericLiteral *node = new (pool) AST::NumericLiteral(sym(1).dval);
node->literalToken = loc(1);
sym(1).Node = node;
} break;
-case 74:
-case 75: {
+case 77:
+case 78: {
AST::StringLiteral *node = new (pool) AST::StringLiteral(stringRef(1));
node->literalToken = loc(1);
sym(1).Node = node;
} break;
-case 76: {
+case 79: {
bool rx = lexer->scanRegExp(Lexer::NoPrefix);
if (!rx) {
diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
@@ -581,6 +582,7 @@ case 76: {
}
loc(1).length = lexer->tokenLength();
+ yylloc = loc(1); // adjust the location of the current token
AST::RegExpLiteral *node = new (pool) AST::RegExpLiteral(
driver->newStringRef(lexer->regExpPattern()), lexer->regExpFlags());
@@ -588,7 +590,7 @@ case 76: {
sym(1).Node = node;
} break;
-case 77: {
+case 80: {
bool rx = lexer->scanRegExp(Lexer::EqualPrefix);
if (!rx) {
diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
@@ -596,6 +598,7 @@ case 77: {
}
loc(1).length = lexer->tokenLength();
+ yylloc = loc(1); // adjust the location of the current token
AST::RegExpLiteral *node = new (pool) AST::RegExpLiteral(
driver->newStringRef(lexer->regExpPattern()), lexer->regExpFlags());
@@ -603,28 +606,28 @@ case 77: {
sym(1).Node = node;
} break;
-case 78: {
+case 81: {
AST::ArrayLiteral *node = new (pool) AST::ArrayLiteral((AST::Elision *) 0);
node->lbracketToken = loc(1);
node->rbracketToken = loc(2);
sym(1).Node = node;
} break;
-case 79: {
+case 82: {
AST::ArrayLiteral *node = new (pool) AST::ArrayLiteral(sym(2).Elision->finish());
node->lbracketToken = loc(1);
node->rbracketToken = loc(3);
sym(1).Node = node;
} break;
-case 80: {
+case 83: {
AST::ArrayLiteral *node = new (pool) AST::ArrayLiteral(sym(2).ElementList->finish ());
node->lbracketToken = loc(1);
node->rbracketToken = loc(3);
sym(1).Node = node;
} break;
-case 81: {
+case 84: {
AST::ArrayLiteral *node = new (pool) AST::ArrayLiteral(sym(2).ElementList->finish (),
(AST::Elision *) 0);
node->lbracketToken = loc(1);
@@ -633,7 +636,7 @@ case 81: {
sym(1).Node = node;
} break;
-case 82: {
+case 85: {
AST::ArrayLiteral *node = new (pool) AST::ArrayLiteral(sym(2).ElementList->finish (),
sym(4).Elision->finish());
node->lbracketToken = loc(1);
@@ -642,7 +645,7 @@ case 82: {
sym(1).Node = node;
} break;
-case 83: {
+case 86: {
AST::ObjectLiteral *node = 0;
if (sym(2).Node)
node = new (pool) AST::ObjectLiteral(
@@ -654,7 +657,7 @@ case 83: {
sym(1).Node = node;
} break;
-case 84: {
+case 87: {
AST::ObjectLiteral *node = new (pool) AST::ObjectLiteral(
sym(2).PropertyNameAndValueList->finish ());
node->lbraceToken = loc(1);
@@ -662,14 +665,14 @@ case 84: {
sym(1).Node = node;
} break;
-case 85: {
+case 88: {
AST::NestedExpression *node = new (pool) AST::NestedExpression(sym(2).Expression);
node->lparenToken = loc(1);
node->rparenToken = loc(3);
sym(1).Node = node;
} break;
-case 86: {
+case 89: {
if (AST::ArrayMemberExpression *mem = AST::cast<AST::ArrayMemberExpression *>(sym(1).Expression)) {
diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Warning, mem->lbracketToken,
QLatin1String("Ignored annotation")));
@@ -689,48 +692,48 @@ case 86: {
}
} break;
-case 87: {
+case 90: {
sym(1).Node = new (pool) AST::ElementList((AST::Elision *) 0, sym(1).Expression);
} break;
-case 88: {
+case 91: {
sym(1).Node = new (pool) AST::ElementList(sym(1).Elision->finish(), sym(2).Expression);
} break;
-case 89: {
+case 92: {
AST::ElementList *node = new (pool) AST::ElementList(sym(1).ElementList,
(AST::Elision *) 0, sym(3).Expression);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 90: {
+case 93: {
AST::ElementList *node = new (pool) AST::ElementList(sym(1).ElementList, sym(3).Elision->finish(),
sym(4).Expression);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 91: {
+case 94: {
AST::Elision *node = new (pool) AST::Elision();
node->commaToken = loc(1);
sym(1).Node = node;
} break;
-case 92: {
+case 95: {
AST::Elision *node = new (pool) AST::Elision(sym(1).Elision);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 93: {
+case 96: {
AST::PropertyNameAndValueList *node = new (pool) AST::PropertyNameAndValueList(
sym(1).PropertyName, sym(3).Expression);
node->colonToken = loc(2);
sym(1).Node = node;
} break;
-case 94: {
+case 97: {
AST::PropertyNameAndValueList *node = new (pool) AST::PropertyNameAndValueList(
sym(1).PropertyNameAndValueList, sym(3).PropertyName, sym(5).Expression);
node->commaToken = loc(2);
@@ -738,51 +741,51 @@ case 94: {
sym(1).Node = node;
} break;
-case 95: {
+case 98: {
AST::IdentifierPropertyName *node = new (pool) AST::IdentifierPropertyName(stringRef(1));
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 96:
-case 97: {
+case 99:
+case 100: {
AST::IdentifierPropertyName *node = new (pool) AST::IdentifierPropertyName(stringRef(1));
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 98: {
+case 101: {
AST::StringLiteralPropertyName *node = new (pool) AST::StringLiteralPropertyName(stringRef(1));
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 99: {
+case 102: {
AST::NumericLiteralPropertyName *node = new (pool) AST::NumericLiteralPropertyName(sym(1).dval);
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 100: {
+case 103: {
AST::IdentifierPropertyName *node = new (pool) AST::IdentifierPropertyName(stringRef(1));
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 136: {
+case 139: {
AST::ArrayMemberExpression *node = new (pool) AST::ArrayMemberExpression(sym(1).Expression, sym(3).Expression);
node->lbracketToken = loc(2);
node->rbracketToken = loc(4);
sym(1).Node = node;
} break;
-case 137: {
+case 140: {
AST::FieldMemberExpression *node = new (pool) AST::FieldMemberExpression(sym(1).Expression, stringRef(3));
node->dotToken = loc(2);
node->identifierToken = loc(3);
sym(1).Node = node;
} break;
-case 138: {
+case 141: {
AST::NewMemberExpression *node = new (pool) AST::NewMemberExpression(sym(2).Expression, sym(4).ArgumentList);
node->newToken = loc(1);
node->lparenToken = loc(3);
@@ -790,384 +793,384 @@ case 138: {
sym(1).Node = node;
} break;
-case 140: {
+case 143: {
AST::NewExpression *node = new (pool) AST::NewExpression(sym(2).Expression);
node->newToken = loc(1);
sym(1).Node = node;
} break;
-case 141: {
+case 144: {
AST::CallExpression *node = new (pool) AST::CallExpression(sym(1).Expression, sym(3).ArgumentList);
node->lparenToken = loc(2);
node->rparenToken = loc(4);
sym(1).Node = node;
} break;
-case 142: {
+case 145: {
AST::CallExpression *node = new (pool) AST::CallExpression(sym(1).Expression, sym(3).ArgumentList);
node->lparenToken = loc(2);
node->rparenToken = loc(4);
sym(1).Node = node;
} break;
-case 143: {
+case 146: {
AST::ArrayMemberExpression *node = new (pool) AST::ArrayMemberExpression(sym(1).Expression, sym(3).Expression);
node->lbracketToken = loc(2);
node->rbracketToken = loc(4);
sym(1).Node = node;
} break;
-case 144: {
+case 147: {
AST::FieldMemberExpression *node = new (pool) AST::FieldMemberExpression(sym(1).Expression, stringRef(3));
node->dotToken = loc(2);
node->identifierToken = loc(3);
sym(1).Node = node;
} break;
-case 145: {
+case 148: {
sym(1).Node = 0;
} break;
-case 146: {
+case 149: {
sym(1).Node = sym(1).ArgumentList->finish();
} break;
-case 147: {
+case 150: {
sym(1).Node = new (pool) AST::ArgumentList(sym(1).Expression);
} break;
-case 148: {
+case 151: {
AST::ArgumentList *node = new (pool) AST::ArgumentList(sym(1).ArgumentList, sym(3).Expression);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 152: {
+case 155: {
AST::PostIncrementExpression *node = new (pool) AST::PostIncrementExpression(sym(1).Expression);
node->incrementToken = loc(2);
sym(1).Node = node;
} break;
-case 153: {
+case 156: {
AST::PostDecrementExpression *node = new (pool) AST::PostDecrementExpression(sym(1).Expression);
node->decrementToken = loc(2);
sym(1).Node = node;
} break;
-case 155: {
+case 158: {
AST::DeleteExpression *node = new (pool) AST::DeleteExpression(sym(2).Expression);
node->deleteToken = loc(1);
sym(1).Node = node;
} break;
-case 156: {
+case 159: {
AST::VoidExpression *node = new (pool) AST::VoidExpression(sym(2).Expression);
node->voidToken = loc(1);
sym(1).Node = node;
} break;
-case 157: {
+case 160: {
AST::TypeOfExpression *node = new (pool) AST::TypeOfExpression(sym(2).Expression);
node->typeofToken = loc(1);
sym(1).Node = node;
} break;
-case 158: {
+case 161: {
AST::PreIncrementExpression *node = new (pool) AST::PreIncrementExpression(sym(2).Expression);
node->incrementToken = loc(1);
sym(1).Node = node;
} break;
-case 159: {
+case 162: {
AST::PreDecrementExpression *node = new (pool) AST::PreDecrementExpression(sym(2).Expression);
node->decrementToken = loc(1);
sym(1).Node = node;
} break;
-case 160: {
+case 163: {
AST::UnaryPlusExpression *node = new (pool) AST::UnaryPlusExpression(sym(2).Expression);
node->plusToken = loc(1);
sym(1).Node = node;
} break;
-case 161: {
+case 164: {
AST::UnaryMinusExpression *node = new (pool) AST::UnaryMinusExpression(sym(2).Expression);
node->minusToken = loc(1);
sym(1).Node = node;
} break;
-case 162: {
+case 165: {
AST::TildeExpression *node = new (pool) AST::TildeExpression(sym(2).Expression);
node->tildeToken = loc(1);
sym(1).Node = node;
} break;
-case 163: {
+case 166: {
AST::NotExpression *node = new (pool) AST::NotExpression(sym(2).Expression);
node->notToken = loc(1);
sym(1).Node = node;
} break;
-case 165: {
+case 168: {
AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
QSOperator::Mul, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 166: {
+case 169: {
AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
QSOperator::Div, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 167: {
+case 170: {
AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
QSOperator::Mod, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 169: {
+case 172: {
AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
QSOperator::Add, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 170: {
+case 173: {
AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
QSOperator::Sub, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 172: {
+case 175: {
AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
QSOperator::LShift, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 173: {
+case 176: {
AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
QSOperator::RShift, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 174: {
+case 177: {
AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
QSOperator::URShift, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 176: {
+case 179: {
AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
QSOperator::Lt, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 177: {
+case 180: {
AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
QSOperator::Gt, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 178: {
+case 181: {
AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
QSOperator::Le, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 179: {
+case 182: {
AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
QSOperator::Ge, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 180: {
+case 183: {
AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
QSOperator::InstanceOf, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 181: {
+case 184: {
AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
QSOperator::In, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 183: {
+case 186: {
AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
QSOperator::Lt, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 184: {
+case 187: {
AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
QSOperator::Gt, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 185: {
+case 188: {
AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
QSOperator::Le, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 186: {
+case 189: {
AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
QSOperator::Ge, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 187: {
+case 190: {
AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
QSOperator::InstanceOf, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 189: {
+case 192: {
AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
QSOperator::Equal, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 190: {
+case 193: {
AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
QSOperator::NotEqual, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 191: {
+case 194: {
AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
QSOperator::StrictEqual, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 192: {
+case 195: {
AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
QSOperator::StrictNotEqual, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 194: {
+case 197: {
AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
QSOperator::Equal, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 195: {
+case 198: {
AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
QSOperator::NotEqual, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 196: {
+case 199: {
AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
QSOperator::StrictEqual, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 197: {
+case 200: {
AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
QSOperator::StrictNotEqual, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 199: {
+case 202: {
AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
QSOperator::BitAnd, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 201: {
+case 204: {
AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
QSOperator::BitAnd, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 203: {
+case 206: {
AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
QSOperator::BitXor, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 205: {
+case 208: {
AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
QSOperator::BitXor, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 207: {
+case 210: {
AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
QSOperator::BitOr, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 209: {
+case 212: {
AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
QSOperator::BitOr, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 211: {
+case 214: {
AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
QSOperator::And, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 213: {
+case 216: {
AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
QSOperator::And, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 215: {
+case 218: {
AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
QSOperator::Or, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 217: {
+case 220: {
AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
QSOperator::Or, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 219: {
+case 222: {
AST::ConditionalExpression *node = new (pool) AST::ConditionalExpression(sym(1).Expression,
sym(3).Expression, sym(5).Expression);
node->questionToken = loc(2);
@@ -1175,7 +1178,7 @@ case 219: {
sym(1).Node = node;
} break;
-case 221: {
+case 224: {
AST::ConditionalExpression *node = new (pool) AST::ConditionalExpression(sym(1).Expression,
sym(3).Expression, sym(5).Expression);
node->questionToken = loc(2);
@@ -1183,112 +1186,112 @@ case 221: {
sym(1).Node = node;
} break;
-case 223: {
+case 226: {
AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
sym(2).ival, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 225: {
+case 228: {
AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
sym(2).ival, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 226: {
+case 229: {
sym(1).ival = QSOperator::Assign;
} break;
-case 227: {
+case 230: {
sym(1).ival = QSOperator::InplaceMul;
} break;
-case 228: {
+case 231: {
sym(1).ival = QSOperator::InplaceDiv;
} break;
-case 229: {
+case 232: {
sym(1).ival = QSOperator::InplaceMod;
} break;
-case 230: {
+case 233: {
sym(1).ival = QSOperator::InplaceAdd;
} break;
-case 231: {
+case 234: {
sym(1).ival = QSOperator::InplaceSub;
} break;
-case 232: {
+case 235: {
sym(1).ival = QSOperator::InplaceLeftShift;
} break;
-case 233: {
+case 236: {
sym(1).ival = QSOperator::InplaceRightShift;
} break;
-case 234: {
+case 237: {
sym(1).ival = QSOperator::InplaceURightShift;
} break;
-case 235: {
+case 238: {
sym(1).ival = QSOperator::InplaceAnd;
} break;
-case 236: {
+case 239: {
sym(1).ival = QSOperator::InplaceXor;
} break;
-case 237: {
+case 240: {
sym(1).ival = QSOperator::InplaceOr;
} break;
-case 239: {
+case 242: {
AST::Expression *node = new (pool) AST::Expression(sym(1).Expression, sym(3).Expression);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 240: {
+case 243: {
sym(1).Node = 0;
} break;
-case 243: {
+case 246: {
AST::Expression *node = new (pool) AST::Expression(sym(1).Expression, sym(3).Expression);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 244: {
+case 247: {
sym(1).Node = 0;
} break;
-case 261: {
+case 264: {
AST::Block *node = new (pool) AST::Block(sym(2).StatementList);
node->lbraceToken = loc(1);
node->rbraceToken = loc(3);
sym(1).Node = node;
} break;
-case 262: {
+case 265: {
sym(1).Node = new (pool) AST::StatementList(sym(1).Statement);
} break;
-case 263: {
+case 266: {
sym(1).Node = new (pool) AST::StatementList(sym(1).StatementList, sym(2).Statement);
} break;
-case 264: {
+case 267: {
sym(1).Node = 0;
} break;
-case 265: {
+case 268: {
sym(1).Node = sym(1).StatementList->finish ();
} break;
-case 267: {
+case 270: {
AST::VariableStatement *node = new (pool) AST::VariableStatement(
sym(2).VariableDeclarationList->finish (/*readOnly=*/sym(1).ival == T_CONST));
node->declarationKindToken = loc(1);
@@ -1296,76 +1299,76 @@ case 267: {
sym(1).Node = node;
} break;
-case 268: {
+case 271: {
sym(1).ival = T_CONST;
} break;
-case 269: {
+case 272: {
sym(1).ival = T_VAR;
} break;
-case 270: {
+case 273: {
sym(1).Node = new (pool) AST::VariableDeclarationList(sym(1).VariableDeclaration);
} break;
-case 271: {
+case 274: {
AST::VariableDeclarationList *node = new (pool) AST::VariableDeclarationList(
sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 272: {
+case 275: {
sym(1).Node = new (pool) AST::VariableDeclarationList(sym(1).VariableDeclaration);
} break;
-case 273: {
+case 276: {
sym(1).Node = new (pool) AST::VariableDeclarationList(sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
} break;
-case 274: {
+case 277: {
AST::VariableDeclaration *node = new (pool) AST::VariableDeclaration(stringRef(1), sym(2).Expression);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 275: {
+case 278: {
AST::VariableDeclaration *node = new (pool) AST::VariableDeclaration(stringRef(1), sym(2).Expression);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 276: {
+case 279: {
// ### TODO: AST for initializer
sym(1) = sym(2);
} break;
-case 277: {
+case 280: {
sym(1).Node = 0;
} break;
-case 279: {
+case 282: {
// ### TODO: AST for initializer
sym(1) = sym(2);
} break;
-case 280: {
+case 283: {
sym(1).Node = 0;
} break;
-case 282: {
+case 285: {
AST::EmptyStatement *node = new (pool) AST::EmptyStatement();
node->semicolonToken = loc(1);
sym(1).Node = node;
} break;
-case 284: {
+case 287: {
AST::ExpressionStatement *node = new (pool) AST::ExpressionStatement(sym(1).Expression);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 285: {
+case 288: {
AST::IfStatement *node = new (pool) AST::IfStatement(sym(3).Expression, sym(5).Statement, sym(7).Statement);
node->ifToken = loc(1);
node->lparenToken = loc(2);
@@ -1374,7 +1377,7 @@ case 285: {
sym(1).Node = node;
} break;
-case 286: {
+case 289: {
AST::IfStatement *node = new (pool) AST::IfStatement(sym(3).Expression, sym(5).Statement);
node->ifToken = loc(1);
node->lparenToken = loc(2);
@@ -1382,7 +1385,7 @@ case 286: {
sym(1).Node = node;
} break;
-case 288: {
+case 291: {
AST::DoWhileStatement *node = new (pool) AST::DoWhileStatement(sym(2).Statement, sym(5).Expression);
node->doToken = loc(1);
node->whileToken = loc(3);
@@ -1392,7 +1395,7 @@ case 288: {
sym(1).Node = node;
} break;
-case 289: {
+case 292: {
AST::WhileStatement *node = new (pool) AST::WhileStatement(sym(3).Expression, sym(5).Statement);
node->whileToken = loc(1);
node->lparenToken = loc(2);
@@ -1400,7 +1403,7 @@ case 289: {
sym(1).Node = node;
} break;
-case 290: {
+case 293: {
AST::ForStatement *node = new (pool) AST::ForStatement(sym(3).Expression,
sym(5).Expression, sym(7).Expression, sym(9).Statement);
node->forToken = loc(1);
@@ -1411,7 +1414,7 @@ case 290: {
sym(1).Node = node;
} break;
-case 291: {
+case 294: {
AST::LocalForStatement *node = new (pool) AST::LocalForStatement(
sym(4).VariableDeclarationList->finish (/*readOnly=*/false), sym(6).Expression,
sym(8).Expression, sym(10).Statement);
@@ -1424,7 +1427,7 @@ case 291: {
sym(1).Node = node;
} break;
-case 292: {
+case 295: {
AST:: ForEachStatement *node = new (pool) AST::ForEachStatement(sym(3).Expression,
sym(5).Expression, sym(7).Statement);
node->forToken = loc(1);
@@ -1434,7 +1437,7 @@ case 292: {
sym(1).Node = node;
} break;
-case 293: {
+case 296: {
AST::LocalForEachStatement *node = new (pool) AST::LocalForEachStatement(
sym(4).VariableDeclaration, sym(6).Expression, sym(8).Statement);
node->forToken = loc(1);
@@ -1445,14 +1448,14 @@ case 293: {
sym(1).Node = node;
} break;
-case 295: {
+case 298: {
AST::ContinueStatement *node = new (pool) AST::ContinueStatement();
node->continueToken = loc(1);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 297: {
+case 300: {
AST::ContinueStatement *node = new (pool) AST::ContinueStatement(stringRef(2));
node->continueToken = loc(1);
node->identifierToken = loc(2);
@@ -1460,14 +1463,14 @@ case 297: {
sym(1).Node = node;
} break;
-case 299: {
+case 302: {
AST::BreakStatement *node = new (pool) AST::BreakStatement(QStringRef());
node->breakToken = loc(1);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 301: {
+case 304: {
AST::BreakStatement *node = new (pool) AST::BreakStatement(stringRef(2));
node->breakToken = loc(1);
node->identifierToken = loc(2);
@@ -1475,14 +1478,14 @@ case 301: {
sym(1).Node = node;
} break;
-case 303: {
+case 306: {
AST::ReturnStatement *node = new (pool) AST::ReturnStatement(sym(2).Expression);
node->returnToken = loc(1);
node->semicolonToken = loc(3);
sym(1).Node = node;
} break;
-case 304: {
+case 307: {
AST::WithStatement *node = new (pool) AST::WithStatement(sym(3).Expression, sym(5).Statement);
node->withToken = loc(1);
node->lparenToken = loc(2);
@@ -1490,7 +1493,7 @@ case 304: {
sym(1).Node = node;
} break;
-case 305: {
+case 308: {
AST::SwitchStatement *node = new (pool) AST::SwitchStatement(sym(3).Expression, sym(5).CaseBlock);
node->switchToken = loc(1);
node->lparenToken = loc(2);
@@ -1498,90 +1501,90 @@ case 305: {
sym(1).Node = node;
} break;
-case 306: {
+case 309: {
AST::CaseBlock *node = new (pool) AST::CaseBlock(sym(2).CaseClauses);
node->lbraceToken = loc(1);
node->rbraceToken = loc(3);
sym(1).Node = node;
} break;
-case 307: {
+case 310: {
AST::CaseBlock *node = new (pool) AST::CaseBlock(sym(2).CaseClauses, sym(3).DefaultClause, sym(4).CaseClauses);
node->lbraceToken = loc(1);
node->rbraceToken = loc(5);
sym(1).Node = node;
} break;
-case 308: {
+case 311: {
sym(1).Node = new (pool) AST::CaseClauses(sym(1).CaseClause);
} break;
-case 309: {
+case 312: {
sym(1).Node = new (pool) AST::CaseClauses(sym(1).CaseClauses, sym(2).CaseClause);
} break;
-case 310: {
+case 313: {
sym(1).Node = 0;
} break;
-case 311: {
+case 314: {
sym(1).Node = sym(1).CaseClauses->finish ();
} break;
-case 312: {
+case 315: {
AST::CaseClause *node = new (pool) AST::CaseClause(sym(2).Expression, sym(4).StatementList);
node->caseToken = loc(1);
node->colonToken = loc(3);
sym(1).Node = node;
} break;
-case 313: {
+case 316: {
AST::DefaultClause *node = new (pool) AST::DefaultClause(sym(3).StatementList);
node->defaultToken = loc(1);
node->colonToken = loc(2);
sym(1).Node = node;
} break;
-case 314:
-case 315: {
+case 317:
+case 318: {
AST::LabelledStatement *node = new (pool) AST::LabelledStatement(stringRef(1), sym(3).Statement);
node->identifierToken = loc(1);
node->colonToken = loc(2);
sym(1).Node = node;
} break;
-case 316: {
+case 319: {
AST::LabelledStatement *node = new (pool) AST::LabelledStatement(stringRef(1), sym(3).Statement);
node->identifierToken = loc(1);
node->colonToken = loc(2);
sym(1).Node = node;
} break;
-case 318: {
+case 321: {
AST::ThrowStatement *node = new (pool) AST::ThrowStatement(sym(2).Expression);
node->throwToken = loc(1);
node->semicolonToken = loc(3);
sym(1).Node = node;
} break;
-case 319: {
+case 322: {
AST::TryStatement *node = new (pool) AST::TryStatement(sym(2).Statement, sym(3).Catch);
node->tryToken = loc(1);
sym(1).Node = node;
} break;
-case 320: {
+case 323: {
AST::TryStatement *node = new (pool) AST::TryStatement(sym(2).Statement, sym(3).Finally);
node->tryToken = loc(1);
sym(1).Node = node;
} break;
-case 321: {
+case 324: {
AST::TryStatement *node = new (pool) AST::TryStatement(sym(2).Statement, sym(3).Catch, sym(4).Finally);
node->tryToken = loc(1);
sym(1).Node = node;
} break;
-case 322: {
+case 325: {
AST::Catch *node = new (pool) AST::Catch(stringRef(3), sym(5).Block);
node->catchToken = loc(1);
node->lparenToken = loc(2);
@@ -1590,20 +1593,20 @@ case 322: {
sym(1).Node = node;
} break;
-case 323: {
+case 326: {
AST::Finally *node = new (pool) AST::Finally(sym(2).Block);
node->finallyToken = loc(1);
sym(1).Node = node;
} break;
-case 325: {
+case 328: {
AST::DebuggerStatement *node = new (pool) AST::DebuggerStatement();
node->debuggerToken = loc(1);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 326: {
+case 329: {
AST::FunctionDeclaration *node = new (pool) AST::FunctionDeclaration(stringRef(2), sym(4).FormalParameterList, sym(7).FunctionBody);
node->functionToken = loc(1);
node->identifierToken = loc(2);
@@ -1614,7 +1617,7 @@ case 326: {
sym(1).Node = node;
} break;
-case 327: {
+case 330: {
AST::FunctionExpression *node = new (pool) AST::FunctionExpression(stringRef(2), sym(4).FormalParameterList, sym(7).FunctionBody);
node->functionToken = loc(1);
if (! stringRef(2).isNull())
@@ -1626,60 +1629,60 @@ case 327: {
sym(1).Node = node;
} break;
-case 328: {
+case 331: {
AST::FormalParameterList *node = new (pool) AST::FormalParameterList(stringRef(1));
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 329: {
+case 332: {
AST::FormalParameterList *node = new (pool) AST::FormalParameterList(sym(1).FormalParameterList, stringRef(3));
node->commaToken = loc(2);
node->identifierToken = loc(3);
sym(1).Node = node;
} break;
-case 330: {
+case 333: {
sym(1).Node = 0;
} break;
-case 331: {
+case 334: {
sym(1).Node = sym(1).FormalParameterList->finish ();
} break;
-case 332: {
+case 335: {
sym(1).Node = 0;
} break;
-case 334: {
+case 337: {
sym(1).Node = new (pool) AST::FunctionBody(sym(1).SourceElements->finish ());
} break;
-case 335: {
+case 339: {
sym(1).Node = new (pool) AST::Program(sym(1).SourceElements->finish ());
} break;
-case 336: {
+case 340: {
sym(1).Node = new (pool) AST::SourceElements(sym(1).SourceElement);
} break;
-case 337: {
+case 341: {
sym(1).Node = new (pool) AST::SourceElements(sym(1).SourceElements, sym(2).SourceElement);
} break;
-case 338: {
+case 342: {
sym(1).Node = new (pool) AST::StatementSourceElement(sym(1).Statement);
} break;
-case 339: {
+case 343: {
sym(1).Node = new (pool) AST::FunctionSourceElement(sym(1).FunctionDeclaration);
} break;
-case 340: {
+case 344: {
stringRef(1) = QStringRef();
} break;
-case 342: {
+case 346: {
sym(1).Node = 0;
} break;
diff --git a/src/libs/qmljs/parser/qmljsparser_p.h b/src/libs/qmljs/parser/qmljsparser_p.h
index 862bb7d557..8b14074a20 100644
--- a/src/libs/qmljs/parser/qmljsparser_p.h
+++ b/src/libs/qmljs/parser/qmljsparser_p.h
@@ -108,9 +108,6 @@ public:
AST::UiObjectMemberList *UiObjectMemberList;
AST::UiArrayMemberList *UiArrayMemberList;
AST::UiQualifiedId *UiQualifiedId;
- AST::UiSignature *UiSignature;
- AST::UiFormalList *UiFormalList;
- AST::UiFormal *UiFormal;
};
public:
@@ -231,9 +228,9 @@ protected:
-#define J_SCRIPT_REGEXPLITERAL_RULE1 76
+#define J_SCRIPT_REGEXPLITERAL_RULE1 79
-#define J_SCRIPT_REGEXPLITERAL_RULE2 77
+#define J_SCRIPT_REGEXPLITERAL_RULE2 80
QT_QML_END_NAMESPACE
diff --git a/src/libs/qmljs/qmljsevaluate.cpp b/src/libs/qmljs/qmljsevaluate.cpp
index 69a1abe22d..05d8edece9 100644
--- a/src/libs/qmljs/qmljsevaluate.cpp
+++ b/src/libs/qmljs/qmljsevaluate.cpp
@@ -212,21 +212,6 @@ bool Evaluate::visit(AST::UiQualifiedId *ast)
return false;
}
-bool Evaluate::visit(AST::UiSignature *)
-{
- return false;
-}
-
-bool Evaluate::visit(AST::UiFormalList *)
-{
- return false;
-}
-
-bool Evaluate::visit(AST::UiFormal *)
-{
- return false;
-}
-
bool Evaluate::visit(AST::ThisExpression *)
{
return false;
diff --git a/src/libs/qmljs/qmljsevaluate.h b/src/libs/qmljs/qmljsevaluate.h
index ff84f42d9d..50f5ac7eb3 100644
--- a/src/libs/qmljs/qmljsevaluate.h
+++ b/src/libs/qmljs/qmljsevaluate.h
@@ -79,9 +79,6 @@ protected:
virtual bool visit(AST::UiObjectMemberList *ast);
virtual bool visit(AST::UiArrayMemberList *ast);
virtual bool visit(AST::UiQualifiedId *ast);
- virtual bool visit(AST::UiSignature *ast);
- virtual bool visit(AST::UiFormalList *ast);
- virtual bool visit(AST::UiFormal *ast);
// QmlJS
virtual bool visit(AST::ThisExpression *ast);
View Lorry Controller Status