From d5e372425698c6a87e86743114e4b8d28d5d86eb Mon Sep 17 00:00:00 2001 From: Aaron Kennedy Date: Mon, 13 Jul 2009 11:41:56 +1000 Subject: Don't loop indefinately on library import statement --- src/declarative/qml/parser/qmljs.g | 4 ++-- 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(driver->nodePool(), sym(2).UiQualifiedId); + AST::UiImport *node = makeAstNode(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(driver->nodePool(), sym(2).UiQualifiedId); + AST::UiImport *node = makeAstNode(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(driver->nodePool(), sym(2).UiQualifiedId); + AST::UiImport *node = makeAstNode(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(driver->nodePool(), sym(2).UiQualifiedId); + AST::UiImport *node = makeAstNode(driver->nodePool(), sym(2).UiQualifiedId->finish()); node->importId = sym(4).sval; node->importToken = loc(1); node->fileNameToken = loc(2); -- cgit v0.12