summaryrefslogtreecommitdiff
path: root/shared/cplusplus/AST.cpp
diff options
context:
space:
mode:
authorRoberto Raggi <qtc-committer@nokia.com>2009-01-05 14:07:57 +0100
committerRoberto Raggi <qtc-committer@nokia.com>2009-01-05 14:07:57 +0100
commitce6bbe65f3e8550122e91305277649e0efa61881 (patch)
tree9fab670bc67b0c24381f0b2695b6b6154edb0358 /shared/cplusplus/AST.cpp
parentf87c952c728ee928d9e71446664ffc17494bd466 (diff)
downloadqt-creator-ce6bbe65f3e8550122e91305277649e0efa61881.tar.gz
Implemented NestedExpressionAST::lastToken()
Diffstat (limited to 'shared/cplusplus/AST.cpp')
-rw-r--r--shared/cplusplus/AST.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/shared/cplusplus/AST.cpp b/shared/cplusplus/AST.cpp
index 5ddfe4774c..dcf3257361 100644
--- a/shared/cplusplus/AST.cpp
+++ b/shared/cplusplus/AST.cpp
@@ -1790,8 +1790,11 @@ unsigned NestedExpressionAST::firstToken() const
unsigned NestedExpressionAST::lastToken() const
{
- assert(0 && "review me");
- return rparen_token + 1;
+ if (rparen_token)
+ return rparen_token + 1;
+ else if (expression)
+ return expression->lastToken();
+ return lparen_token + 1;
}
void NestedNameSpecifierAST::accept0(ASTVisitor *visitor)
@@ -1809,8 +1812,9 @@ unsigned NestedNameSpecifierAST::firstToken() const
unsigned NestedNameSpecifierAST::lastToken() const
{
- assert(0 && "review me");
- return scope_token + 1;
+ if (scope_token)
+ return scope_token + 1;
+ return class_or_namespace_name->lastToken();
}
void NewDeclaratorAST::accept0(ASTVisitor *visitor)