aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@nokia.com>2011-05-17 17:03:24 +0200
committerhjk <qtc-committer@nokia.com>2011-05-17 17:38:02 +0200
commit7cb66c544b8ab467ca7e8b4a0c46a67d0f54e332 (patch)
tree7834bb58de9bfd318592e893cb0b15d00116ea8a
parent5ded3e2f62c8d81669b8fc298648ca5cd81547f8 (diff)
Fixed invalid parsing of boolean expression "x < y && z > this".
Task-number: QTCREATORBUG-4362 Reviewed-by: Roberto Raggi (cherry picked from commit b83932708cb4d5e0f54cd01ecf9a5c50c7ecb2b0)
-rw-r--r--src/shared/cplusplus/Parser.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/shared/cplusplus/Parser.cpp b/src/shared/cplusplus/Parser.cpp
index d7b6132697..21800a34e1 100644
--- a/src/shared/cplusplus/Parser.cpp
+++ b/src/shared/cplusplus/Parser.cpp
@@ -4282,6 +4282,7 @@ bool Parser::parseNameId(NameAST *&name)
case T_LPAREN:
return true;
+ case T_THIS:
case T_IDENTIFIER:
case T_STATIC_CAST:
case T_DYNAMIC_CAST: