Ticket #158: numForBroke.patch

Source/Cobra.Lang/Native.cs

@@ -520 +520 @@
         return results;
     }
 
-    /* Numeric forExpr */
-    static public List<int> For<TIn, TOut>(int start, int stop, int step, ForGet<int, int> forGet) {
+
+    /* Numeric forExpr - ints in, any type returned */        
+    static public List<TOut> For<TIn, TOut>(int start, int stop, int step, ForGet<int, TOut> forGet) {
         if ((step > 0 && start > stop) || 
             (step < 0 && start < stop) || step == 0)
                 throw new IndexOutOfRangeException(string.Format("for expression will never terminate; start={0} stop={1} step={2}", start, stop, step));
-        List<int> results = new List<int>();
+        List<TOut> results = new List<TOut>();
         for (int item = start; 
             (step > 0 && item < stop) || (step < 0 && item > stop);
             item += step)
@@ -533 +534 @@
         return results;
     }
 
-    static public List<int> For<TIn, TOut>(int start, int stop, int step, ForWhereGet<int, int> forWhereGet) {
+    static public List<TOut> For<TIn, TOut>(int start, int stop, int step, ForWhereGet<int, TOut> forWhereGet) {
         if ((step > 0 && start > stop) || 
             (step < 0 && start < stop) || step == 0)
                 throw new IndexOutOfRangeException(string.Format("for expression will never terminate; start={0} stop={1} step={2}", start, stop, step));
-        List<int> results = new List<int>();
+        List<TOut> results = new List<TOut>();
         for (int item = start;
             (step > 0 && item < stop) || (step < 0 && item > stop);
             item += step) {
-            int value;
+            TOut value;
             if (forWhereGet(item, out value))
                 results.Add(value);
         }

Tests/110-basics-two/600-functional/122-for-expr-numeric-method.cobra

@@ +1 @@
+# test for compile failure for expr over numeric range calling method with non int param and return
+#  Numeric For broken ticket:158
+class NumFor
+
+    def main is shared
+        #n = [5,6]
+        n = 5
+        stuff = for i in n get i
+        #trace stuff
+        assert stuff.typeOf is List<of int>
+        assert stuff == [0, 1, 2, 3, 4]
+        
+        # this worked originally
+        stuffI = for i in 1:n get .thingI(i)
+        #trace stuffI
+        assert stuffI.typeOf is List<of int>
+        assert stuffI == [1, 4, 9, 16]
+        
+        # these didnt compile
+        stuffO = for i in 1:n get .thing(i)
+        #trace stuffO
+        assert stuffO.typeOf is List<of Object>
+        assert stuffO == [1, 4, 9, 16]
+        
+        stuffS = for i in 1:n get .thingS(i)
+        #trace stuffS
+        assert stuffS.typeOf is List<of String>
+        assert stuffS == ['1', '4', '9', '16']
+    
+        stuffX = for i in 1:n get .thingX("[i]")
+        #trace stuffX
+        assert stuffX.typeOf is List<of String>
+        assert stuffX == [r'-1-', r'-2-', r'-3-', r'-4-']
+    
+        # this worked originally
+        b = for i in 3 : 6 where i>=4 get .thingI(i)
+        assert b.typeOf is List<of int>
+        assert b == [16, 25]
+
+        # these didnt
+        bO = for i in 3 : 6 where i>=4 get .thing(i)
+        assert bO.typeOf is List<of Object>
+        assert bO == [16, 25]
+        
+        bS = for i in 3 : 6 where i>=4 get .thingS(i)
+        assert bS.typeOf is List<of String>
+        assert bS == ['16', '25']
+    
+        bX = for i in 3 : 6 where i>=4 get .thingX("[i]")
+        assert bX.typeOf is List<of String>
+        assert bX == ['-4-', '-5-']
+        
+        
+    # this worked originally
+    def thingI(i as int) as int is shared
+        return i*i
+    # these didnt   
+    def thing(i as int) as Object is shared
+        return i*i 
+        
+    def thingS(i as int) as String is shared
+        return '[i*i]' 
+        
+    def thingX(i as String) as String is shared
+        return '-[i]-' 
+        
+    

Developer/IntermediateReleaseNotes.text

@@ -395 +395 @@
 
 * Fixed: Non removal of intermediate file if -embed-run-time/ert specified and compilation fails. ticket:181
 
-+ * Fixed: to? should give warning if operation is redundant. ticket:76
+* Fixed: to? should give warning if operation is redundant. ticket:76
+
+* Fixed: numeric For expr broken: ticket:158