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

C++: fix trigraph parsing in macros.

Browse Source 
Trigraphs must only be parsed before/during preprocessing. The preprocessor
will now replace trigraphs with their standard form, and re-lexing in
TranslationUnit will not try to parse any trigraph.

Also added a few missing trigraphs: ??=, ??', ??! and ??-.

Task-number: QTCREATORBUG-13253
Change-Id: I1723ed53b00090b878c22b83b7e963b647b65f72
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
This commit is contained in:
Francois Ferrand
2014-10-24 14:55:43 +02:00
parent 9057143228
commit 41b232962a
6 changed files with 131 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -336,20 +336,62 @@ void Lexer::scan_helper(Token *tok)
break;
case '?':
if (_yychar == '?') {
if (_yychar == '?' && f._ppMode) {
yyinp();
if (_yychar == '(') {
yyinp();
tok->f.kind = T_LBRACKET;
tok->f.trigraph = true;
} else if (_yychar == ')') {
yyinp();
tok->f.kind = T_RBRACKET;
tok->f.trigraph = true;
} else if (_yychar == '<') {
yyinp();
tok->f.kind = T_LBRACE;
tok->f.trigraph = true;
} else if (_yychar == '>') {
yyinp();
tok->f.kind = T_RBRACE;
tok->f.trigraph = true;
} else if (_yychar == '=') {
yyinp();
tok->f.trigraph = true;
if (_yychar == '?' && *(_currentChar + 1) == '?' && *(_currentChar + 2) == '=') {
yyinp();
yyinp();
yyinp();
tok->f.kind = T_POUND_POUND;
} else {
tok->f.kind = T_POUND;
}
} else if (_yychar == '\'') {
yyinp();
if (_yychar == '=') {
yyinp();
tok->f.kind = T_CARET_EQUAL;
} else {
tok->f.kind = T_CARET;
}
tok->f.trigraph = true;
} else if (_yychar == '!') {
yyinp();
if (_yychar == '=') {
yyinp();
tok->f.kind = T_PIPE_EQUAL;
} else {
tok->f.kind = T_PIPE;
}
tok->f.trigraph = true;
} else if (_yychar == '-') {
yyinp();
if (_yychar == '=') {
yyinp();
tok->f.kind = T_TILDE_EQUAL;
} else {
tok->f.kind = T_TILDE;
}
tok->f.trigraph = true;
}
} else {
tok->f.kind = T_QUESTION;