From d08c1e1eb5408aeec3987fd7b986c3846143ccee Mon Sep 17 00:00:00 2001
From: Basile Burg <basile.b@gmx.com>
Date: Mon, 13 Feb 2017 18:15:52 +0100
Subject: [PATCH] fix #400 - TypeCtors, false positive for unmodified variable

---
 src/analysis/unmodified.d | 41 +++++++++++++++++++++++++++++++++++----
 1 file changed, 37 insertions(+), 4 deletions(-)

diff --git a/src/analysis/unmodified.d b/src/analysis/unmodified.d
index fe9005d..4c53aa1 100644
--- a/src/analysis/unmodified.d
+++ b/src/analysis/unmodified.d
@@ -238,7 +238,7 @@ private:
 		import std.algorithm : canFind, map, filter;
 
 		return !dec.attributes.map!(a => a.attribute)
-			.filter!(a => a == cast(IdType) tok!"immutable" || a == cast(IdType) tok!"const").empty;
+			.filter!(a => a == tok!"immutable" || a == tok!"const").empty;
 	}
 
 	bool canFindImmutable(const VariableDeclaration dec)
@@ -257,8 +257,15 @@ private:
 		}
 		if (dec.type !is null)
 		{
-			if (dec.type.typeConstructors.canFind(cast(IdType) tok!"immutable"))
-				return true;
+			foreach (tk; dec.type.typeConstructors)
+				if (tk == tok!"immutable" || tk == tok!"const")
+					return true;
+			if (dec.type.type2)
+			{
+				const tk = dec.type.type2.typeConstructor;
+				if (tk == tok!"immutable" || tk == tok!"const")
+					return true;
+			}
 		}
 		return false;
 	}
@@ -276,7 +283,7 @@ private:
 		foreach (vi; tree[$ - 1])
 		{
 			immutable string errorMessage = "Variable " ~ vi.name
-				~ " is never modified and could have been declared const" ~ " or immutable.";
+				~ " is never modified and could have been declared const or immutable.";
 			addErrorMessage(vi.line, vi.column, "dscanner.suspicious.unmodified", errorMessage);
 		}
 		tree = tree[0 .. $ - 1];
@@ -306,3 +313,29 @@ bool isValueTypeSimple(const Type type) pure nothrow @nogc
 		return false;
 	return type.type2.builtinType != tok!"" && type.typeSuffixes.length == 0;
 }
+
+@system unittest
+{
+    import analysis.config : StaticAnalysisConfig, Check;
+    import analysis.helpers : assertAnalyzerWarnings;
+    import std.stdio : stderr;
+    import std.format : format;
+
+    StaticAnalysisConfig sac;
+    sac.could_be_immutable_check = Check.enabled;
+
+    // pass
+
+    assertAnalyzerWarnings(q{
+        void foo(){const(int) i;}
+    }, sac);
+
+	assertAnalyzerWarnings(q{
+        void foo(){immutable(int)* i;}
+    }, sac);
+
+	assertAnalyzerWarnings(q{
+        void foo(){enum i = 1;}
+    }, sac);
+
+}