diff options
| author | hjk <hjk121@nokiamail.com> | 2013-11-26 15:23:28 +0100 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2013-11-27 16:24:30 +0100 |
| commit | 5c5240815a9577fdb2e5b5ed90fa64f9b57fee44 (patch) | |
| tree | 57308ec7c2798be2ee8e692e43e8cce08bc58b89 /src/libs/3rdparty/cplusplus/Lexer.cpp | |
| parent | d179a59650c8a5864b33e50f23f5a984dd9c0109 (diff) | |
CPlusPlus: Fix parsing of ??< ??> ??( ??) trigraphs
Almost most useful feature ever.
Task-number: QTCREATORBUG-2474
Change-Id: If1ad661fab58ffb4a0b9ddb8ba771f2fde3b54ec
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Diffstat (limited to 'src/libs/3rdparty/cplusplus/Lexer.cpp')
| -rw-r--r-- | src/libs/3rdparty/cplusplus/Lexer.cpp | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/libs/3rdparty/cplusplus/Lexer.cpp b/src/libs/3rdparty/cplusplus/Lexer.cpp index 6e6e6c2feb..0e0d1f4330 100644 --- a/src/libs/3rdparty/cplusplus/Lexer.cpp +++ b/src/libs/3rdparty/cplusplus/Lexer.cpp @@ -297,7 +297,24 @@ void Lexer::scan_helper(Token *tok) break; case '?': - tok->f.kind = T_QUESTION; + 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; + } break; case '+': |