aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/3rdparty/cplusplus
diff options
context:
space:
mode:
authorPhilip Lorenz <philip@bithub.de>2015-09-22 23:21:08 +0200
committerOrgad Shaneh <orgads@gmail.com>2016-06-22 17:46:40 +0000
commitc0f3094866923f27692e654f94cd55546f5c87d5 (patch)
tree372b8f6aa393e8e268ad5ad9e3c49e3fb0b2cd8f /src/libs/3rdparty/cplusplus
parentc8ef91f7892c3c12ddd92d7ca5b4bdc9936c7f07 (diff)
C++: Fix lexing of >> / >>=
The current code always ends up setting the token to T_GREATER_GREATER. Change-Id: If75ff1f5bccffd5918ec2bf491724cd0981220ae Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/libs/3rdparty/cplusplus')
-rw-r--r--src/libs/3rdparty/cplusplus/Lexer.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/3rdparty/cplusplus/Lexer.cpp b/src/libs/3rdparty/cplusplus/Lexer.cpp
index feddf3a5d0..efaaaf9165 100644
--- a/src/libs/3rdparty/cplusplus/Lexer.cpp
+++ b/src/libs/3rdparty/cplusplus/Lexer.cpp
@@ -630,9 +630,9 @@ void Lexer::scan_helper(Token *tok)
if (_yychar == '=') {
yyinp();
tok->f.kind = T_GREATER_GREATER_EQUAL;
- } else
- tok->f.kind = T_LESS_LESS;
- tok->f.kind = T_GREATER_GREATER;
+ } else {
+ tok->f.kind = T_GREATER_GREATER;
+ }
} else if (_yychar == '=') {
yyinp();
tok->f.kind = T_GREATER_EQUAL;