diff options
| author | Roberto Raggi <roberto.raggi@nokia.com> | 2010-10-26 13:50:17 +0200 |
|---|---|---|
| committer | Roberto Raggi <roberto.raggi@nokia.com> | 2010-10-26 13:50:17 +0200 |
| commit | c23721c860dee761e6cf152200f281c1c595366b (patch) | |
| tree | c6e6e0fea52c2f9f9c306016e759597db9fda0e9 /src | |
| parent | 0a679b61d439734acdf8cb33a5c59aba9fe9e8da (diff) | |
| download | qt-creator-c23721c860dee761e6cf152200f281c1c595366b.tar.gz | |
Updated the QML/JS front-end.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/qmljs/parser/qmljs.g | 4 | ||||
| -rw-r--r-- | src/libs/qmljs/parser/qmljsparser.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libs/qmljs/parser/qmljs.g b/src/libs/qmljs/parser/qmljs.g index ee3ff56573..9b6facdaf5 100644 --- a/src/libs/qmljs/parser/qmljs.g +++ b/src/libs/qmljs/parser/qmljs.g @@ -1254,7 +1254,7 @@ case $rule_number: { else node = makeAstNode<AST::ObjectLiteral> (driver->nodePool()); node->lbraceToken = loc(1); - node->lbraceToken = loc(3); + node->rbraceToken = loc(3); sym(1).Node = node; } break; ./ @@ -1265,7 +1265,7 @@ case $rule_number: { AST::ObjectLiteral *node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(), sym(2).PropertyNameAndValueList->finish ()); node->lbraceToken = loc(1); - node->lbraceToken = loc(4); + node->rbraceToken = loc(4); sym(1).Node = node; } break; ./ diff --git a/src/libs/qmljs/parser/qmljsparser.cpp b/src/libs/qmljs/parser/qmljsparser.cpp index 2dab9ec42b..f99231601c 100644 --- a/src/libs/qmljs/parser/qmljsparser.cpp +++ b/src/libs/qmljs/parser/qmljsparser.cpp @@ -679,7 +679,7 @@ case 85: { else node = makeAstNode<AST::ObjectLiteral> (driver->nodePool()); node->lbraceToken = loc(1); - node->lbraceToken = loc(3); + node->rbraceToken = loc(3); sym(1).Node = node; } break; @@ -687,7 +687,7 @@ case 86: { AST::ObjectLiteral *node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(), sym(2).PropertyNameAndValueList->finish ()); node->lbraceToken = loc(1); - node->lbraceToken = loc(4); + node->rbraceToken = loc(4); sym(1).Node = node; } break; |