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

C++: fix lexing POUND_POUND token with digraphs.

Browse Source 
Change-Id: I9204b827c60b283cc4e6b88c810b31eb7587c7db
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
This commit is contained in:
Francois Ferrand
2015-03-12 23:15:38 +01:00
parent 41b232962a
commit dc7b6ca6c3
2 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -263,8 +263,8 @@ void Lexer::scan_helper(Token *tok)
case '#': case '#':
if (_yychar == '#') { if (_yychar == '#') {
tok->f.kind = T_POUND_POUND;
yyinp(); yyinp();
tok->f.kind = T_POUND_POUND;
} else { } else {
tok->f.kind = T_POUND; tok->f.kind = T_POUND;
} }
@@ -515,7 +515,13 @@ void Lexer::scan_helper(Token *tok)
tok->f.kind = T_RBRACE; tok->f.kind = T_RBRACE;
} else if (_yychar == ':') { } else if (_yychar == ':') {
yyinp(); yyinp();
if (_yychar == '%' && *(_currentChar + 1) == ':') {
yyinp();
yyinp();
tok->f.kind = T_POUND_POUND;
} else {
tok->f.kind = T_POUND; tok->f.kind = T_POUND;
}
} else { } else {
tok->f.kind = T_PERCENT; tok->f.kind = T_PERCENT;
} }

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

@@ -70,6 +70,8 @@ private slots:
void literals_data(); void literals_data();
void preprocessor(); void preprocessor();
void preprocessor_data(); void preprocessor_data();
void digraph();
void digraph_data();
void trigraph(); void trigraph();
void trigraph_data(); void trigraph_data();
@@ -740,6 +742,36 @@ void tst_SimpleLexer::incremental_data()
<< (TokenKindList() << T_IDENTIFIER); << (TokenKindList() << T_IDENTIFIER);
} }
void tst_SimpleLexer::digraph()
{
QFETCH(QByteArray, source);
QFETCH(TokenKindList, expectedTokenKindList);
run(source, toTokens(expectedTokenKindList), false, CompareKind);
}
void tst_SimpleLexer::digraph_data()
{
QTest::addColumn<QByteArray>("source");
QTest::addColumn<TokenKindList>("expectedTokenKindList");
QTest::newRow("lbracket_digraph") << _("<:") << (TokenKindList() << T_LBRACKET);
QTest::newRow("rbracket_digraph") << _(":>") << (TokenKindList() << T_RBRACKET);
QTest::newRow("lbrace_digraph") << _("<%") << (TokenKindList() << T_LBRACE);
QTest::newRow("rbrace_digraph") << _("%>") << (TokenKindList() << T_RBRACE);
QTest::newRow("pound_digraph") << _("%:") << (TokenKindList() << T_POUND);
QTest::newRow("pound_pound_digraph") << _("%:%:") << (TokenKindList() << T_POUND_POUND);
QTest::newRow("pound_pound_mixed_digraph_1") << _("#%:") << (TokenKindList() << T_POUND << T_POUND);
QTest::newRow("pound_pound_mixed_digraph_2") << _("%:#") << (TokenKindList() << T_POUND << T_POUND);
}
void tst_SimpleLexer::trigraph() void tst_SimpleLexer::trigraph()
{ {
QFETCH(QByteArray, source); QFETCH(QByteArray, source);