diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-03-28 23:18:16 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-03-28 23:18:16 (GMT) |
| commit | bd0e2aa6c99747551966fb787ea86c21f426a791 (patch) | |
| tree | 8c3de7b8aa0cf856633934f3df5adaa2bdcd0d7a /src/declarative/qml/parser/qdeclarativejsparser.cpp | |
| parent | 0a114cf91058e215f4b6f8bbea09aa9e9ad57069 (diff) | |
| parent | 6cce231a2d8da6fb232908a8c815ba3a433cfad7 (diff) | |
| download | Qt-bd0e2aa6c99747551966fb787ea86c21f426a791.zip Qt-bd0e2aa6c99747551966fb787ea86c21f426a791.tar.gz Qt-bd0e2aa6c99747551966fb787ea86c21f426a791.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/qml/parser/qdeclarativejsparser.cpp')
| -rw-r--r-- | src/declarative/qml/parser/qdeclarativejsparser.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/declarative/qml/parser/qdeclarativejsparser.cpp b/src/declarative/qml/parser/qdeclarativejsparser.cpp index 9205ef4..2949e88 100644 --- a/src/declarative/qml/parser/qdeclarativejsparser.cpp +++ b/src/declarative/qml/parser/qdeclarativejsparser.cpp @@ -275,7 +275,7 @@ case 20: { } else if (AST::UiQualifiedId *qualifiedId = reparseAsQualifiedId(sym(2).Expression)) { QString text; for (AST::UiQualifiedId *q = qualifiedId; q; q = q->next) { - text += q->name->asString(); + text += q->name->asString(); if (q->next) text += QLatin1String("."); } node = makeAstNode<AST::UiImport>(driver->nodePool(), qualifiedId); @@ -571,6 +571,9 @@ case 76: { diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage())); return false; // ### remove me } + + loc(1).length = lexer->tokenLength(); + AST::RegExpLiteral *node = makeAstNode<AST::RegExpLiteral> (driver->nodePool(), lexer->pattern, lexer->flags); node->literalToken = loc(1); sym(1).Node = node; @@ -582,6 +585,9 @@ case 77: { diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage())); return false; } + + loc(1).length = lexer->tokenLength(); + AST::RegExpLiteral *node = makeAstNode<AST::RegExpLiteral> (driver->nodePool(), lexer->pattern, lexer->flags); node->literalToken = loc(1); sym(1).Node = node; |