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

Accepts `...' when parsing declarator-ids in C++0x.

Browse Source
This commit is contained in:
Roberto Raggi
2010-03-25 10:26:33 +01:00
parent a52b826600
commit ddcc40d0fc
5 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -760,12 +760,22 @@ unsigned DeclarationStatementAST::lastToken() const
unsigned DeclaratorIdAST::firstToken() const
{
if (dot_dot_dot_token)
return dot_dot_dot_token;
return name->firstToken();
}
unsigned DeclaratorIdAST::lastToken() const
{
return name->lastToken();
if (name)
return name->lastToken();
else if (dot_dot_dot_token)
return dot_dot_dot_token + 1;
// assert?
return 0;
}
unsigned DeleteExpressionAST::firstToken() const

4
src/shared/cplusplus/AST.h
View File

@@ -1368,11 +1368,13 @@ protected:
class CPLUSPLUS_EXPORT DeclaratorIdAST: public CoreDeclaratorAST
{
public:
unsigned dot_dot_dot_token;
NameAST *name;
public:
DeclaratorIdAST()
: name(0)
: dot_dot_dot_token(0)
, name(0)
{}
virtual DeclaratorIdAST *asDeclaratorId() { return this; }

1
src/shared/cplusplus/ASTClone.cpp
View File

@@ -447,6 +447,7 @@ DeclarationStatementAST *DeclarationStatementAST::clone(MemoryPool *pool) const
DeclaratorIdAST *DeclaratorIdAST::clone(MemoryPool *pool) const
{
DeclaratorIdAST *ast = new (pool) DeclaratorIdAST;
ast->dot_dot_dot_token = dot_dot_dot_token;
if (name)
ast->name = name->clone(pool);
return ast;

2
src/shared/cplusplus/ASTMatcher.cpp
View File

@@ -731,6 +731,8 @@ bool ASTMatcher::match(DeclaratorIdAST *node, DeclaratorIdAST *pattern)
(void) node;
(void) pattern;
pattern->dot_dot_dot_token = node->dot_dot_dot_token;
if (! pattern->name)
pattern->name = node->name;
else if (! AST::match(node->name, pattern->name, this))

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

@@ -1218,11 +1218,18 @@ bool Parser::parseCoreDeclarator(DeclaratorAST *&node)
while (parsePtrOperator(*ptr_operators_tail))
ptr_operators_tail = &(*ptr_operators_tail)->next;
if (LA() == T_COLON_COLON || LA() == T_IDENTIFIER || LA() == T_TILDE
|| LA() == T_OPERATOR) {
if (LA() == T_COLON_COLON || LA() == T_IDENTIFIER || LA() == T_TILDE || LA() == T_OPERATOR
|| (_cxx0xEnabled && LA() == T_DOT_DOT_DOT && (LA(2) == T_COLON_COLON || LA(2) == T_IDENTIFIER))) {
unsigned dot_dot_dot_token = 0;
if (LA() == T_DOT_DOT_DOT)
dot_dot_dot_token = consumeToken();
NameAST *name = 0;
if (parseName(name)) {
DeclaratorIdAST *declarator_id = new (_pool) DeclaratorIdAST;
declarator_id->dot_dot_dot_token = dot_dot_dot_token;
declarator_id->name = name;
DeclaratorAST *ast = new (_pool) DeclaratorAST;
ast->attribute_list = attributes;