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

C++: Mini refactorings in Lexer

Browse Source 
...that will reduce noise in a follow-up change.

Change-Id: I39253fa631019c6d3177d2f8b2c521ec85bfba4b
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Nikolai Kosjar
2015-09-21 16:13:39 +02:00
parent 8eb30feb03
commit 3edd1e575e
1 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,6 +135,13 @@ void Lexer::scan(Token *tok)
tok->f.utf16chars = _currentCharUtf16 - _tokenStartUtf16;
}
static bool isMultiLineToken(unsigned char kind)
{
return kind == T_EOF_SYMBOL
|| kind == T_COMMENT
|| kind == T_DOXY_COMMENT;
}
void Lexer::scan_helper(Token *tok)
{
again:
@@ -143,18 +150,10 @@ void Lexer::scan_helper(Token *tok)
tok->f.joined = s._newlineExpected;
tok->f.newline = !s._newlineExpected;
if (s._newlineExpected) {
if (s._newlineExpected)
s._newlineExpected = false;
} else {
switch (s._tokenKind) {
case T_EOF_SYMBOL:
case T_COMMENT:
case T_DOXY_COMMENT:
break; // multiline tokens, don't break on newline
default: // Strings and C++ comments
_state = 0;
}
}
else if (!isMultiLineToken(s._tokenKind))
_state = 0;
} else {
tok->f.whitespace = true;
}
@@ -177,11 +176,9 @@ void Lexer::scan_helper(Token *tok)
return;
}
switch (s._tokenKind) {
case T_EOF_SYMBOL:
break;
case T_COMMENT:
case T_DOXY_COMMENT: {
if (s._tokenKind == T_EOF_SYMBOL) {
// skip
} else if (s._tokenKind == T_COMMENT || s._tokenKind == T_DOXY_COMMENT) {
const int originalKind = s._tokenKind;
while (_yychar) {
@@ -201,10 +198,8 @@ void Lexer::scan_helper(Token *tok)
goto again;
tok->f.kind = originalKind;
return; // done
}
case T_CPP_COMMENT:
case T_CPP_DOXY_COMMENT: {
return;
} else if (s._tokenKind == T_CPP_COMMENT || s._tokenKind == T_CPP_DOXY_COMMENT) {
const Kind originalKind = (Kind)s._tokenKind;
tok->f.joined = true;
if (f._scanCommentTokens)
@@ -212,8 +207,7 @@ void Lexer::scan_helper(Token *tok)
_state = 0;
scanCppComment(originalKind);
return;
}
default: // Strings
} else { // strings
tok->f.joined = true;
tok->f.kind = s._tokenKind;
_state = 0;