diff options
| author | Roberto Raggi <roberto.raggi@nokia.com> | 2010-08-11 14:24:28 +0200 |
|---|---|---|
| committer | Roberto Raggi <roberto.raggi@nokia.com> | 2010-08-11 15:25:19 +0200 |
| commit | 41b4af05010ef9ae564fcff00b904f22c5f617e0 (patch) | |
| tree | 915171245238821c9b3559ae269d3d8e4b4081e1 /src/shared/cplusplus/Lexer.cpp | |
| parent | f74ba9daef50a0b267056c8753819d59621fc000 (diff) | |
| download | qt-creator-41b4af05010ef9ae564fcff00b904f22c5f617e0.tar.gz | |
Get rid of the prefix findOrInsert for the functions in CPlusPlus::Control.
Diffstat (limited to 'src/shared/cplusplus/Lexer.cpp')
| -rw-r--r-- | src/shared/cplusplus/Lexer.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/shared/cplusplus/Lexer.cpp b/src/shared/cplusplus/Lexer.cpp index 3b75c68421..605551e070 100644 --- a/src/shared/cplusplus/Lexer.cpp +++ b/src/shared/cplusplus/Lexer.cpp @@ -281,7 +281,7 @@ void Lexer::scan_helper(Token *tok) yyinp(); if (control()) - tok->string = control()->findOrInsertStringLiteral(yytext, yylen); + tok->string = control()->stringLiteral(yytext, yylen); } break; case '{': @@ -361,7 +361,7 @@ void Lexer::scan_helper(Token *tok) int yylen = _currentChar - yytext; tok->f.kind = T_NUMERIC_LITERAL; if (control()) - tok->number = control()->findOrInsertNumericLiteral(yytext, yylen); + tok->number = control()->numericLiteral(yytext, yylen); } else { tok->f.kind = T_DOT; } @@ -564,7 +564,7 @@ void Lexer::scan_helper(Token *tok) if (_yychar == '>') yyinp(); if (control()) - tok->string = control()->findOrInsertStringLiteral(yytext, yylen); + tok->string = control()->stringLiteral(yytext, yylen); tok->f.kind = T_ANGLE_STRING_LITERAL; } else if (_yychar == '<') { yyinp(); @@ -642,7 +642,7 @@ void Lexer::scan_helper(Token *tok) yyinp(); if (control()) - tok->string = control()->findOrInsertStringLiteral(yytext, yylen); + tok->string = control()->stringLiteral(yytext, yylen); break; } @@ -679,7 +679,7 @@ void Lexer::scan_helper(Token *tok) yyinp(); if (control()) - tok->string = control()->findOrInsertStringLiteral(yytext, yylen); + tok->string = control()->stringLiteral(yytext, yylen); } else if (std::isalpha(ch) || ch == '_' || ch == '$') { const char *yytext = _currentChar - 1; while (std::isalnum(_yychar) || _yychar == '_' || _yychar == '$') @@ -694,7 +694,7 @@ void Lexer::scan_helper(Token *tok) tok->f.kind = classifyOperator(yytext, yylen); if (control()) - tok->identifier = control()->findOrInsertIdentifier(yytext, yylen); + tok->identifier = control()->identifier(yytext, yylen); } break; } else if (std::isdigit(ch)) { @@ -715,7 +715,7 @@ void Lexer::scan_helper(Token *tok) int yylen = _currentChar - yytext; tok->f.kind = T_NUMERIC_LITERAL; if (control()) - tok->number = control()->findOrInsertNumericLiteral(yytext, yylen); + tok->number = control()->numericLiteral(yytext, yylen); break; } else { tok->f.kind = T_ERROR; |