summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/parser/qmljs.g
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-07-14 04:24:56 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-07-14 04:24:56 (GMT)
commita093c5ef65aa2c28f52f78c8be5bbe7d567646fa (patch)
treedd8f8774eb3e92ec49ee31abd15e4ea2e2bbcb29 /src/declarative/qml/parser/qmljs.g
parent4ca1f77ab54f1e02045dc7e680bd99103f680fea (diff)
downloadQt-a093c5ef65aa2c28f52f78c8be5bbe7d567646fa.zip
Qt-a093c5ef65aa2c28f52f78c8be5bbe7d567646fa.tar.gz
Qt-a093c5ef65aa2c28f52f78c8be5bbe7d567646fa.tar.bz2
Libraries and library versioning.
Diffstat (limited to 'src/declarative/qml/parser/qmljs.g')
-rw-r--r--src/declarative/qml/parser/qmljs.g33
1 files changed, 31 insertions, 2 deletions
diff --git a/src/declarative/qml/parser/qmljs.g b/src/declarative/qml/parser/qmljs.g
index 3ed6ee2..8297c08 100644
--- a/src/declarative/qml/parser/qmljs.g
+++ b/src/declarative/qml/parser/qmljs.g
@@ -557,7 +557,7 @@ UiImport: T_IMPORT UiQualifiedId T_AUTOMATIC_SEMICOLON;
UiImport: T_IMPORT UiQualifiedId T_SEMICOLON;
/.
case $rule_number: {
- AST::UiImport *node = makeAstNode<AST::UiImport>(driver->nodePool(), sym(2).UiQualifiedId);
+ AST::UiImport *node = makeAstNode<AST::UiImport>(driver->nodePool(), sym(2).UiQualifiedId->finish());
node->importToken = loc(1);
node->fileNameToken = loc(2);
node->semicolonToken = loc(3);
@@ -565,11 +565,40 @@ case $rule_number: {
} break;
./
+UiImport: T_IMPORT UiQualifiedId T_NUMERIC_LITERAL T_AUTOMATIC_SEMICOLON;
+UiImport: T_IMPORT UiQualifiedId T_NUMERIC_LITERAL T_SEMICOLON;
+/.
+case $rule_number: {
+ AST::UiImport *node = makeAstNode<AST::UiImport>(driver->nodePool(), sym(2).UiQualifiedId->finish());
+ node->importToken = loc(1);
+ node->fileNameToken = loc(2);
+ node->versionToken = loc(3);
+ node->semicolonToken = loc(4);
+ sym(1).Node = node;
+} break;
+./
+
+UiImport: T_IMPORT UiQualifiedId T_NUMERIC_LITERAL T_AS JsIdentifier T_AUTOMATIC_SEMICOLON;
+UiImport: T_IMPORT UiQualifiedId T_NUMERIC_LITERAL T_AS JsIdentifier T_SEMICOLON;
+/.
+case $rule_number: {
+ AST::UiImport *node = makeAstNode<AST::UiImport>(driver->nodePool(), sym(2).UiQualifiedId->finish());
+ node->importId = sym(5).sval;
+ node->importToken = loc(1);
+ node->fileNameToken = loc(2);
+ node->versionToken = loc(3);
+ node->asToken = loc(4);
+ node->importIdToken = loc(5);
+ node->semicolonToken = loc(6);
+ sym(1).Node = node;
+} break;
+./
+
UiImport: T_IMPORT UiQualifiedId T_AS JsIdentifier T_AUTOMATIC_SEMICOLON;
UiImport: T_IMPORT UiQualifiedId T_AS JsIdentifier T_SEMICOLON;
/.
case $rule_number: {
- AST::UiImport *node = makeAstNode<AST::UiImport>(driver->nodePool(), sym(2).UiQualifiedId);
+ AST::UiImport *node = makeAstNode<AST::UiImport>(driver->nodePool(), sym(2).UiQualifiedId->finish());
node->importId = sym(4).sval;
node->importToken = loc(1);
node->fileNameToken = loc(2);