From 0ab7abded18e78956661960f20e1c3c2a1de6e90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Fri, 12 Sep 2014 06:43:52 +0200
Subject: [PATCH] AST: fixed cast for 'return (long long)c << 40;'

---
 lib/tokenlist.cpp     | 2 +-
 test/testtokenize.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/tokenlist.cpp b/lib/tokenlist.cpp
index 89c2e3ffc..01b1b7b8a 100644
--- a/lib/tokenlist.cpp
+++ b/lib/tokenlist.cpp
@@ -435,7 +435,7 @@ static bool iscast(const Token *tok)
     if (!Token::Match(tok, "( %var%"))
         return false;
 
-    if (tok->previous() && tok->previous()->isName())
+    if (tok->previous() && tok->previous()->isName() && tok->previous()->str() != "return")
         return false;
 
     if (Token::Match(tok, "( (| typeof (") && Token::Match(tok->link(), ") %num%"))
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
index 0d9c82a86..a0e0a8a38 100644
--- a/test/testtokenize.cpp
+++ b/test/testtokenize.cpp
@@ -10982,7 +10982,7 @@ private:
         ASSERT_EQUALS("ac-(=", testAst("a = (long)-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 -)
     }