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

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

Browse Source
This commit is contained in:
Friedemann Kleint
2009-07-13 14:49:01 +02:00
parent bd176fb53e dbffbe107f
commit 7c6a9b6d2e
2 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
share/qtcreator/static.pro
View File

@@ -27,6 +27,7 @@ DATA_DIRS = \
templates \ templates \
designer \ designer \
schemes \ schemes \
styles \
gdbmacros gdbmacros
!isEmpty(copydata) { !isEmpty(copydata) {

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

@@ -1306,24 +1306,40 @@ bool Parser::parseTypeId(ExpressionAST *&node)
bool Parser::parseParameterDeclarationClause(ParameterDeclarationClauseAST *&node) bool Parser::parseParameterDeclarationClause(ParameterDeclarationClauseAST *&node)
{ {
if (LA() == T_RPAREN)
return true; // nothing to do
DeclarationListAST *parameter_declarations = 0; DeclarationListAST *parameter_declarations = 0;
if (LA() != T_DOT_DOT_DOT)
parseParameterDeclarationList(parameter_declarations);
unsigned dot_dot_dot_token = 0; unsigned dot_dot_dot_token = 0;
if (LA() == T_DOT_DOT_DOT || (LA() == T_COMMA && LA(2) == T_DOT_DOT_DOT)) { if (LA() == T_DOT_DOT_DOT)
if (LA() == T_COMMA) dot_dot_dot_token = consumeToken();
consumeToken(); else {
parseParameterDeclarationList(parameter_declarations);
if (LA() == T_DOT_DOT_DOT) {
dot_dot_dot_token = consumeToken();
} else if (LA() == T_COMMA && LA(2) == T_DOT_DOT_DOT) {
consumeToken(); // skip comma
dot_dot_dot_token = consumeToken(); dot_dot_dot_token = consumeToken();
} }
}
if (parameter_declarations || dot_dot_dot_token) {
ParameterDeclarationClauseAST *ast = new (_pool) ParameterDeclarationClauseAST; ParameterDeclarationClauseAST *ast = new (_pool) ParameterDeclarationClauseAST;
ast->parameter_declarations = parameter_declarations; ast->parameter_declarations = parameter_declarations;
ast->dot_dot_dot_token = dot_dot_dot_token; ast->dot_dot_dot_token = dot_dot_dot_token;
node = ast; node = ast;
}
return true; return true;
} }
bool Parser::parseParameterDeclarationList(DeclarationListAST *&node) bool Parser::parseParameterDeclarationList(DeclarationListAST *&node)
{ {
if (LA() == T_DOT_DOT_DOT || (LA() == T_COMMA && LA(2) == T_DOT_DOT_DOT))
return false; // nothing to do.
DeclarationListAST **parameter_declaration_ptr = &node; DeclarationListAST **parameter_declaration_ptr = &node;
DeclarationAST *declaration = 0; DeclarationAST *declaration = 0;
if (parseParameterDeclaration(declaration)) { if (parseParameterDeclaration(declaration)) {