summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/parser/qmljs.g
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-07-09 07:25:16 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-07-09 07:25:16 (GMT)
commit8a6e5d5c95a8ae586c8fc2fa63be0228c4cefb53 (patch)
tree92326e96d070ac6c437f7b3cd8d6ac906b2b7656 /src/declarative/qml/parser/qmljs.g
parent6c901f67fb2f2e73fa362e72d985a04fa57cdf48 (diff)
downloadQt-8a6e5d5c95a8ae586c8fc2fa63be0228c4cefb53.zip
Qt-8a6e5d5c95a8ae586c8fc2fa63be0228c4cefb53.tar.gz
Qt-8a6e5d5c95a8ae586c8fc2fa63be0228c4cefb53.tar.bz2
Expand input keyword to include "as" support
Diffstat (limited to 'src/declarative/qml/parser/qmljs.g')
-rw-r--r--src/declarative/qml/parser/qmljs.g43
1 files changed, 43 insertions, 0 deletions
diff --git a/src/declarative/qml/parser/qmljs.g b/src/declarative/qml/parser/qmljs.g
index c7952e2..3ed6ee2 100644
--- a/src/declarative/qml/parser/qmljs.g
+++ b/src/declarative/qml/parser/qmljs.g
@@ -84,6 +84,7 @@
--- context keywords.
%token T_PUBLIC "public"
%token T_IMPORT "import"
+%token T_AS "as"
%nonassoc SHIFT_THERE
%nonassoc T_IDENTIFIER T_COLON T_SIGNAL T_PROPERTY
@@ -537,6 +538,48 @@ case $rule_number: {
} break;
./
+UiImport: T_IMPORT T_STRING_LITERAL T_AS JsIdentifier T_AUTOMATIC_SEMICOLON;
+UiImport: T_IMPORT T_STRING_LITERAL T_AS JsIdentifier T_SEMICOLON;
+/.
+case $rule_number: {
+ AST::UiImport *node = makeAstNode<AST::UiImport>(driver->nodePool(), sym(2).sval);
+ node->importId = sym(4).sval;
+ node->importToken = loc(1);
+ node->fileNameToken = loc(2);
+ node->asToken = loc(3);
+ node->importIdToken = loc(4);
+ node->semicolonToken = loc(5);
+ sym(1).Node = node;
+} break;
+./
+
+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);
+ node->importToken = loc(1);
+ node->fileNameToken = loc(2);
+ node->semicolonToken = loc(3);
+ 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);
+ node->importId = sym(4).sval;
+ node->importToken = loc(1);
+ node->fileNameToken = loc(2);
+ node->asToken = loc(3);
+ node->importIdToken = loc(4);
+ node->semicolonToken = loc(5);
+ sym(1).Node = node;
+} break;
+./
+
Empty: ;
/.
case $rule_number: {