feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fixed crash in SimpleDeclarationAST::lastToken()

Browse Source
This commit is contained in:
Roberto Raggi
2009-06-16 10:00:07 +02:00
parent 1077631da9
commit 4164d31712
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/shared/cplusplus/AST.cpp
View File

@@ -1170,15 +1170,23 @@ void DeclaratorListAST::accept0(ASTVisitor *visitor)
unsigned DeclaratorListAST::firstToken() const
{
if (comma_token)
return comma_token;
return declarator->firstToken();
}
unsigned DeclaratorListAST::lastToken() const
{
for (const DeclaratorListAST *it = this; it; it = it->next) {
if (! it->next)
return it->declarator->lastToken();
if (! it->next) {
if (it->declarator)
return it->declarator->lastToken();
else if (it->comma_token)
return it->comma_token + 1;
}
}
return 0;
}
@@ -2877,10 +2885,8 @@ unsigned SimpleDeclarationAST::lastToken() const
if (semicolon_token)
return semicolon_token + 1;
for (DeclaratorListAST *it = declarators; it; it = it->next) {
if (! it->next)
return it->lastToken();
}
if (declarators)
return declarators->lastToken();
for (SpecifierAST *it = decl_specifier_seq; it; it = it->next) {
if (! it->next)