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

Merge remote-tracking branch 'origin/2.6'

Browse Source
This commit is contained in:
Eike Ziller
2012-08-20 09:53:10 +02:00
parent 457c289100 2ded6900ce
commit 17cf48f546
16 changed files with 53 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/libs/3rdparty/cplusplus/Lexer.cpp vendored
View File

@@ -579,25 +579,19 @@ void Lexer::scan_helper(Token *tok)
} else if (_yychar == '\'') {
yyinp();
scanCharLiteral(tok, ch);
} else {
if (_yychar == '8') {
unsigned char la = 0;
if (_currentChar + 1 != _lastChar)
la = *(_currentChar + 1);
if (la == '"') {
yyinp();
yyinp();
scanStringLiteral(tok, '8');
} else if (la == '\'') {
yyinp();
yyinp();
scanCharLiteral(tok, '8');
} else {
scanIdentifier(tok);
}
} else if (ch == 'u' && _yychar == '8') {
yyinp();
if (_yychar == '"') {
yyinp();
scanStringLiteral(tok, '8');
} else if (_yychar == '\'') {
yyinp();
scanCharLiteral(tok, '8');
} else {
scanIdentifier(tok);
scanIdentifier(tok, 1);
}
} else {
scanIdentifier(tok);
}
} else if (std::isalpha(ch) || ch == '_' || ch == '$') {
scanIdentifier(tok);
@@ -693,9 +687,9 @@ void Lexer::scanNumericLiteral(Token *tok)
tok->number = control()->numericLiteral(yytext, yylen);
}
void Lexer::scanIdentifier(Token *tok)
void Lexer::scanIdentifier(Token *tok, unsigned extraProcessedChars)
{
const char *yytext = _currentChar - 1;
const char *yytext = _currentChar - 1 - extraProcessedChars;
while (std::isalnum(_yychar) || _yychar == '_' || _yychar == '$')
yyinp();
int yylen = _currentChar - yytext;

2
src/libs/3rdparty/cplusplus/Lexer.h vendored
View File

@@ -94,7 +94,7 @@ private:
void scanCharLiteral(Token *tok, unsigned char hint = 0);
void scanUntilQuote(Token *tok, unsigned char quote);
void scanNumericLiteral(Token *tok);
void scanIdentifier(Token *tok);
void scanIdentifier(Token *tok, unsigned extraProcessedChars = 0);
inline void yyinp()
{