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

Replaced T_INT_LITERAL and T_FLOAT_LITERAL with T_NUMERIC_LITERAL.

Browse Source
This commit is contained in:
Roberto Raggi
2009-07-10 15:44:47 +02:00
parent 017d865330
commit 3e54a65a69
7 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/shared/cplusplus/Lexer.cpp
View File

@@ -348,7 +348,7 @@ void Lexer::scan_helper(Token *tok)
}
} while (_yychar);
int yylen = _currentChar - yytext;
tok->kind = T_INT_LITERAL;
tok->kind = T_NUMERIC_LITERAL;
if (control())
tok->number = control()->findOrInsertNumericLiteral(yytext, yylen);
} else {
@@ -702,7 +702,7 @@ void Lexer::scan_helper(Token *tok)
}
}
int yylen = _currentChar - yytext;
tok->kind = T_INT_LITERAL;
tok->kind = T_NUMERIC_LITERAL;
if (control())
tok->number = control()->findOrInsertNumericLiteral(yytext, yylen);
break;

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

@@ -2715,8 +2715,9 @@ bool Parser::parseBoolLiteral(ExpressionAST *&node)
bool Parser::parseNumericLiteral(ExpressionAST *&node)
{
if (LA() == T_INT_LITERAL || LA() == T_FLOAT_LITERAL ||
LA() == T_CHAR_LITERAL || LA() == T_WIDE_CHAR_LITERAL) {
if (LA() == T_NUMERIC_LITERAL ||
LA() == T_CHAR_LITERAL ||
LA() == T_WIDE_CHAR_LITERAL) {
NumericLiteralAST *ast = new (_pool) NumericLiteralAST;
ast->literal_token = consumeToken();
node = ast;
@@ -2743,10 +2744,9 @@ bool Parser::parsePrimaryExpression(ExpressionAST *&node)
case T_WIDE_STRING_LITERAL:
return parseStringLiteral(node);
case T_INT_LITERAL:
case T_FLOAT_LITERAL:
case T_CHAR_LITERAL:
case T_CHAR_LITERAL: // ### FIXME don't use NumericLiteral for chars
case T_WIDE_CHAR_LITERAL:
case T_NUMERIC_LITERAL:
return parseNumericLiteral(node);
case T_TRUE:

3
src/shared/cplusplus/Token.cpp
View File

@@ -118,8 +118,7 @@ const char *Token::spell() const
case T_IDENTIFIER:
return identifier->chars();
case T_INT_LITERAL:
case T_FLOAT_LITERAL:
case T_NUMERIC_LITERAL:
case T_CHAR_LITERAL:
case T_STRING_LITERAL:
case T_AT_STRING_LITERAL:

3
src/shared/cplusplus/Token.h
View File

@@ -64,8 +64,7 @@ enum Kind {
T_IDENTIFIER,
T_FIRST_LITERAL,
T_INT_LITERAL = T_FIRST_LITERAL,
T_FLOAT_LITERAL,
T_NUMERIC_LITERAL = T_FIRST_LITERAL,
T_CHAR_LITERAL,
T_WIDE_CHAR_LITERAL,
T_STRING_LITERAL,

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

@@ -208,7 +208,7 @@ void TranslationUnit::tokenize()
} else {
if (! tk.newline && tk.is(T_IDENTIFIER) && tk.identifier == lineId)
lex(&tk);
if (! tk.newline && tk.is(T_INT_LITERAL)) {
if (! tk.newline && tk.is(T_NUMERIC_LITERAL)) {
unsigned line = (unsigned) strtoul(tk.spell(), 0, 0);
lex(&tk);
if (! tk.newline && tk.is(T_STRING_LITERAL)) {