Merge pull request #1417 from AndrejMitrovic/Fix4540

Issue 4540 - Better diagnostic for wrong switch type.
dlang · Jan 11, 2013 · 98e20bc · 98e20bc
2 parents c7215bc + 8ab6ab2
commit 98e20bc
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/statement.c b/src/statement.c
@@ -3183,7 +3183,8 @@ Statement *SwitchStatement::semantic(Scope *sc)
     }
     else
     {   condition = condition->integralPromotions(sc);
-        condition->checkIntegral();
+        if (!condition->type->isintegral())
+            error("'%s' must be of integral or string type, it is a %s", condition->toChars(), condition->type->toChars());
     }
     condition = condition->optimize(WANTvalue);
 

diff --git a/test/fail_compilation/diag4540.d b/test/fail_compilation/diag4540.d
@@ -0,0 +1,16 @@
+/*
+TEST_OUTPUT:
+---
+fail_compilation/diag4540.d(4): Error: 'x' must be of integral or string type, it is a float
+---
+*/
+
+#line 1
+void main()
+{
+    float x;
+    switch (x)
+    {
+        default:
+    }
+}