From 30af2fcd737484f8b091e3f83b702cae2c0eec1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Sat, 17 Oct 2015 18:25:27 +0200
Subject: [PATCH] iscast: handle '(ulong)~0' better
---
lib/tokenlist.cpp | 5 +++--
test/testtokenize.cpp | 4 ++++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/lib/tokenlist.cpp b/lib/tokenlist.cpp
index a70460f5a..d0f9c6f16 100644
--- a/lib/tokenlist.cpp
+++ b/lib/tokenlist.cpp
@@ -448,9 +448,10 @@ static bool iscast(const Token *tok)
tok2 = tok2->link()->next();
if (tok2->str() == ")")
- return type || tok2->strAt(-1) == "*" ||
+ return type || tok2->strAt(-1) == "*" || Token::Match(tok2, ") &|~") ||
(Token::Match(tok2, ") %any%") &&
- (tok2->strAt(1) == "&" || (!tok2->next()->isOp() && !Token::Match(tok2->next(), "[[]);,?:.]"))));
+ !tok2->next()->isOp() &&
+ !Token::Match(tok2->next(), "[[]);,?:.]"));
if (!Token::Match(tok2, "%name%|*|&|::"))
return false;
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
index b3d4d184c..dfe4e22cb 100644
--- a/test/testtokenize.cpp
+++ b/test/testtokenize.cpp
@@ -8235,11 +8235,15 @@ private:
ASSERT_EQUALS("ac&(=", testAst("a = (long)&c;"));
ASSERT_EQUALS("ac*(=", testAst("a = (Foo*)*c;"));
ASSERT_EQUALS("ac-(=", testAst("a = (long)-c;"));
+ ASSERT_EQUALS("ac~(=", testAst("a = (b)~c;"));
ASSERT_EQUALS("ac(=", testAst("a = (some<strange, type>)c;"));
ASSERT_EQUALS("afoveon_avgimage((foveon_avgimage((+=", testAst("a = foveon_avg(((short(*)[4]) image)) + foveon_avg(((short(*)[4]) image));"));
ASSERT_EQUALS("c(40<<return", testAst("return (long long)c << 40;"));
ASSERT_EQUALS("ab-(=", testAst("a = ((int)-b)")); // Multiple subsequent unary operators (cast and -)
ASSERT_EQUALS("xdouble123(i*(=", testAst("x = (int)(double(123)*i);"));
+
+ // not cast
+ ASSERT_EQUALS("AB||", testAst("(A)||(B)"));
}
void astlambda() {