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

Merge remote branch 'origin/1.3'

Browse Source
This commit is contained in:
Roberto Raggi
2009-11-17 09:40:50 +01:00
parent d208a3acc8 fa2eca8262
commit 35901130ee
4 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/shared/cplusplus/Parser.cpp
View File

@@ -442,6 +442,8 @@ bool Parser::parseTranslationUnit(TranslationUnitAST *&node)
rewind(start_declaration + 1);
skipUntilDeclaration();
}
_templateArgumentList.clear();
}
node = ast;
@@ -569,6 +571,8 @@ bool Parser::parseLinkageBody(DeclarationAST *&node)
rewind(start_declaration + 1);
skipUntilDeclaration();
}
_templateArgumentList.clear();
}
match(T_RBRACE, &ast->rbrace_token);
node = ast;
@@ -693,11 +697,9 @@ bool Parser::parseOperatorFunctionId(NameAST *&node)
Parser::TemplateArgumentListEntry *Parser::templateArgumentListEntry(unsigned tokenIndex)
{
for (unsigned i = 0; i < _templateArgumentList.size(); ++i) {
TemplateArgumentListEntry *entry = &_templateArgumentList[i];
if (entry->index == tokenIndex)
return entry;
}
std::map<unsigned, TemplateArgumentListEntry>::iterator it =_templateArgumentList.find(tokenIndex);
if (it != _templateArgumentList.end())
return &it->second;
return 0;
}
@@ -729,11 +731,11 @@ bool Parser::parseTemplateArgumentList(TemplateArgumentListAST *&node)
}
}
_templateArgumentList.push_back(TemplateArgumentListEntry(start, cursor(), node));
_templateArgumentList.insert(std::make_pair(cursor(), TemplateArgumentListEntry(start, cursor(), node)));
return true;
}
_templateArgumentList.push_back(TemplateArgumentListEntry(start, cursor(), 0));
_templateArgumentList.insert(std::make_pair(cursor(), TemplateArgumentListEntry(start, cursor(), 0)));
return false;
}