diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-13 01:41:56 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-13 01:41:56 (GMT) |
| commit | d5e372425698c6a87e86743114e4b8d28d5d86eb (patch) | |
| tree | c86c9c2c77da281275009d5a053bd51538ac8b44 /src/declarative/qml | |
| parent | 883da42f7c75775502c818aa456c8576d8457ff8 (diff) | |
| download | Qt-d5e372425698c6a87e86743114e4b8d28d5d86eb.zip Qt-d5e372425698c6a87e86743114e4b8d28d5d86eb.tar.gz Qt-d5e372425698c6a87e86743114e4b8d28d5d86eb.tar.bz2 | |
Don't loop indefinately on library import statement
Diffstat (limited to 'src/declarative/qml')
| -rw-r--r-- | src/declarative/qml/parser/qmljs.g | 4 | ||||
| -rw-r--r-- | src/declarative/qml/parser/qmljsparser.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/declarative/qml/parser/qmljs.g b/src/declarative/qml/parser/qmljs.g index 3ed6ee2..a52d78b 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); @@ -569,7 +569,7 @@ 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); diff --git a/src/declarative/qml/parser/qmljsparser.cpp b/src/declarative/qml/parser/qmljsparser.cpp index 679d0b3..0e8a5ff 100644 --- a/src/declarative/qml/parser/qmljsparser.cpp +++ b/src/declarative/qml/parser/qmljsparser.cpp @@ -232,7 +232,7 @@ case 8: { } break; case 10: { - 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); @@ -240,7 +240,7 @@ case 10: { } break; case 12: { - 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); |