forked from qt-creator/qt-creator
C++: remove reserved names.
See [global.names] (17.6.4.3.2 in the C++11 spec.) Change-Id: I8434496dbe392b52d339d5f17cfaeee8dbd88995 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
committed by
Nikolai Kosjar
parent
12642cc49a
commit
703f36a4b8
14
src/libs/3rdparty/cplusplus/Lexer.cpp
vendored
14
src/libs/3rdparty/cplusplus/Lexer.cpp
vendored
@@ -137,7 +137,7 @@ void Lexer::scan(Token *tok)
|
||||
|
||||
void Lexer::scan_helper(Token *tok)
|
||||
{
|
||||
_Lagain:
|
||||
again:
|
||||
while (_yychar && std::isspace(_yychar)) {
|
||||
if (_yychar == '\n') {
|
||||
tok->f.joined = s._newlineExpected;
|
||||
@@ -198,7 +198,7 @@ void Lexer::scan_helper(Token *tok)
|
||||
}
|
||||
|
||||
if (! f._scanCommentTokens)
|
||||
goto _Lagain;
|
||||
goto again;
|
||||
|
||||
tok->f.kind = originalKind;
|
||||
return; // done
|
||||
@@ -232,7 +232,7 @@ void Lexer::scan_helper(Token *tok)
|
||||
switch (ch) {
|
||||
case '\\':
|
||||
s._newlineExpected = true;
|
||||
goto _Lagain;
|
||||
goto again;
|
||||
|
||||
case '"':
|
||||
scanStringLiteral(tok);
|
||||
@@ -404,7 +404,7 @@ void Lexer::scan_helper(Token *tok)
|
||||
scanCppComment(commentType);
|
||||
|
||||
if (! f._scanCommentTokens)
|
||||
goto _Lagain;
|
||||
goto again;
|
||||
|
||||
tok->f.kind = commentType;
|
||||
|
||||
@@ -419,7 +419,7 @@ void Lexer::scan_helper(Token *tok)
|
||||
yyinp();
|
||||
|
||||
if (ch == '*' && _yychar == '/')
|
||||
goto _Ldone;
|
||||
goto done;
|
||||
|
||||
if (_yychar == '<')
|
||||
yyinp();
|
||||
@@ -438,14 +438,14 @@ void Lexer::scan_helper(Token *tok)
|
||||
}
|
||||
}
|
||||
|
||||
_Ldone:
|
||||
done:
|
||||
if (_yychar)
|
||||
yyinp();
|
||||
else
|
||||
s._tokenKind = commentKind;
|
||||
|
||||
if (! f._scanCommentTokens)
|
||||
goto _Lagain;
|
||||
goto again;
|
||||
|
||||
tok->f.kind = commentKind;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user