foreach range uses same logic as ?: for type deduction

dlang · Sep 8, 2013 · 0b7e3a7 · 0b7e3a7
1 parent a3e447c
commit 0b7e3a7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/statement.c b/src/statement.c
@@ -2430,17 +2430,22 @@ Statement *ForeachRangeStatement::semantic(Scope *sc)
             /* Just picking the first really isn't good enough.
              */
             arg->type = lwr->type;
-            arg->type = arg->type->addStorageClass(arg->storageClass);
+        }
+        else if (lwr->type == upr->type)
+        {
+            /* Same logic as CondExp ?lwr:upr
+             */
+            arg->type = lwr->type;
         }
         else
         {
             AddExp ea(loc, lwr, upr);
             Expression *e = ea.typeCombine(sc);
             arg->type = ea.type;
-            arg->type = arg->type->addStorageClass(arg->storageClass);
             lwr = ea.e1;
             upr = ea.e2;
         }
+        arg->type = arg->type->addStorageClass(arg->storageClass);
     }
 
     /* Convert to a for loop:

diff --git a/test/compilable/test1878a.d b/test/compilable/test1878a.d
@@ -0,0 +1,8 @@
+void main()
+{
+  ubyte from, to;
+  foreach(i; from..to)
+  {
+    static assert(is(typeof(i) == ubyte));
+  }
+}