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

C++: Recognize C++11 nullptr

Browse Source 
Change-Id: I5b7ac8f9b2137ffe9439ada4ec4aeb9cee8e249d
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
This commit is contained in:
Leandro Melo
2011-11-18 13:33:26 +01:00
parent 64d579dc3a
commit 057fad645b
20 changed files with 140 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/libs/3rdparty/cplusplus/Parser.cpp vendored
View File

@@ -3865,6 +3865,18 @@ bool Parser::parseNumericLiteral(ExpressionAST *&node)
return false;
}
bool Parser::parsePointerLiteral(ExpressionAST *&node)
{
DEBUG_THIS_RULE();
if (LA() == T_NULLPTR) {
PointerLiteralAST *ast = new (_pool) PointerLiteralAST;
ast->literal_token = consumeToken();
node = ast;
return true;
}
return false;
}
bool Parser::parseThisExpression(ExpressionAST *&node)
{
DEBUG_THIS_RULE();
@@ -3885,6 +3897,11 @@ bool Parser::parsePrimaryExpression(ExpressionAST *&node)
case T_WIDE_STRING_LITERAL:
return parseStringLiteral(node);
case T_NULLPTR:
if (_cxx0xEnabled)
return parsePointerLiteral(node);
// fall-through
case T_CHAR_LITERAL: // ### FIXME don't use NumericLiteral for chars
case T_WIDE_CHAR_LITERAL:
case T_NUMERIC_LITERAL: