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

Recognize C++0x sizeof... expressions.

Browse Source
This commit is contained in:
Roberto Raggi
2010-03-25 10:43:16 +01:00
parent ddcc40d0fc
commit 3c8d12562e
3 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1632,8 +1632,18 @@ unsigned SizeofExpressionAST::firstToken() const
unsigned SizeofExpressionAST::lastToken() const
{
if (expression)
if (rparen_token)
return rparen_token + 1;
else if (expression)
return expression->lastToken();
else if (lparen_token)
return lparen_token + 1;
else if (dot_dot_dot_token)
return dot_dot_dot_token + 1;
return sizeof_token + 1;
}

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

@@ -2887,6 +2887,7 @@ class CPLUSPLUS_EXPORT SizeofExpressionAST: public ExpressionAST
{
public:
unsigned sizeof_token;
unsigned dot_dot_dot_token;
unsigned lparen_token;
ExpressionAST *expression;
unsigned rparen_token;

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

@@ -4268,6 +4268,11 @@ bool Parser::parseUnaryExpression(ExpressionAST *&node)
SizeofExpressionAST *ast = new (_pool) SizeofExpressionAST;
ast->sizeof_token = consumeToken();
// sizeof...(Args)
if (_cxx0xEnabled && LA() == T_DOT_DOT_DOT && (LA(2) == T_IDENTIFIER || (LA(2) == T_LPAREN && LA(3) == T_IDENTIFIER
&& LA(4) == T_RPAREN)))
ast->dot_dot_dot_token = consumeToken();
if (LA() == T_LPAREN) {
unsigned lparen_token = consumeToken();
if (parseTypeId(ast->expression) && LA() == T_RPAREN) {