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

CPlusPlus: Fix parsing of ??< ??> ??( ??) trigraphs

Browse Source 
Almost most useful feature ever.

Task-number: QTCREATORBUG-2474
Change-Id: If1ad661fab58ffb4a0b9ddb8ba771f2fde3b54ec
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
hjk
2013-11-26 15:23:28 +01:00
committed by Nikolai Kosjar
parent d179a59650
commit 5c5240815a
2 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -297,7 +297,24 @@ void Lexer::scan_helper(Token *tok)
break; break;
case '?': case '?':
if (_yychar == '?') {
yyinp();
if (_yychar == '(') {
yyinp();
tok->f.kind = T_LBRACKET;
} else if (_yychar == ')') {
yyinp();
tok->f.kind = T_RBRACKET;
} else if (_yychar == '<') {
yyinp();
tok->f.kind = T_LBRACE;
} else if (_yychar == '>') {
yyinp();
tok->f.kind = T_RBRACE;
}
} else {
tok->f.kind = T_QUESTION; tok->f.kind = T_QUESTION;
}
break; break;
case '+': case '+':

7
tests/auto/cplusplus/lexer/tst_lexer.cpp
View File

@@ -165,6 +165,13 @@ void tst_SimpleLexer::doxygen_comments_data()
<< T_INT << T_IDENTIFIER << T_SEMICOLON << T_CPP_DOXY_COMMENT << T_INT << T_IDENTIFIER << T_SEMICOLON << T_CPP_DOXY_COMMENT
<< T_INT << T_IDENTIFIER << T_SEMICOLON << T_CPP_DOXY_COMMENT << T_CPP_DOXY_COMMENT; << T_INT << T_IDENTIFIER << T_SEMICOLON << T_CPP_DOXY_COMMENT << T_CPP_DOXY_COMMENT;
QTest::newRow(source) << source << expectedTokenKindList; QTest::newRow(source) << source << expectedTokenKindList;
source = "?""?(?""?)?""?<?""?>a?b:c";
expectedTokenKindList = QList<unsigned>()
<< T_LBRACKET << T_RBRACKET << T_LBRACE << T_RBRACE
<< T_IDENTIFIER << T_QUESTION << T_IDENTIFIER << T_COLON << T_IDENTIFIER;
QTest::newRow(source) << source << expectedTokenKindList;
} }
QTEST_APPLESS_MAIN(tst_SimpleLexer) QTEST_APPLESS_MAIN(tst_SimpleLexer)