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

C++: remove reserved names.

Browse Source 
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:
Erik Verbruggen
2014-08-28 14:56:04 +02:00
committed by Nikolai Kosjar
parent 12642cc49a
commit 703f36a4b8
15 changed files with 169 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libs/cplusplus/pp-engine.cpp
View File

@@ -834,13 +834,13 @@ void Preprocessor::pushToken(Preprocessor::PPToken *tk)
void Preprocessor::lex(PPToken *tk)
{
_Lagain:
again:
if (m_state.m_tokenBuffer) {
// There is a token buffer, so read from there.
if (m_state.m_tokenBuffer->tokens.empty()) {
// The token buffer is empty, so pop it, and start over.
m_state.popTokenBuffer();
goto _Lagain;
goto again;
}
*tk = m_state.m_tokenBuffer->tokens.front();
m_state.m_tokenBuffer->tokens.pop_front();
@@ -859,17 +859,17 @@ _Lagain:
// Adjust token's line number in order to take into account the environment reference.
tk->lineno += m_state.m_lineRef - 1;
_Lclassify:
reclassify:
if (! m_state.m_inPreprocessorDirective) {
if (tk->newline() && tk->is(T_POUND)) {
handlePreprocessorDirective(tk);
goto _Lclassify;
goto reclassify;
} else if (tk->newline() && skipping()) {
ScopedBoolSwap s(m_state.m_inPreprocessorDirective, true);
do {
lex(tk);
} while (isContinuationToken(*tk));
goto _Lclassify;
goto reclassify;
} else if (tk->is(T_IDENTIFIER) && !isQtReservedWord(tk->tokenStart(), tk->bytes())) {
m_state.updateIncludeGuardState(State::IncludeGuardStateHint_OtherToken);
if (m_state.m_inCondition && tk->asByteArrayRef() == "defined") {
@@ -877,7 +877,7 @@ _Lclassify:
} else {
synchronizeOutputLines(*tk);
if (handleIdentifier(tk))
goto _Lagain;
goto again;
}
} else if (tk->isNot(T_COMMENT) && tk->isNot(T_EOF_SYMBOL)) {
m_state.updateIncludeGuardState(State::IncludeGuardStateHint_OtherToken);