Changeset 1264

Timestamp:

02/07/08 13:16:52 (4 years ago)

Author:

chuck

Message:

Fixed: The results of a for-expression cannot be assigned back to the list variable to works on. Example: words = for word in words where word.trim.length

Location:

cobra/trunk

Files:

• Source/CobraLang.cs (modified) (2 diffs)
• Source/Expr.cobra (modified) (1 diff)
• Tests/240-generics/100-use-generics-collections/610-for-expr-generic-list.cobra (modified) (1 diff)

cobra/trunk/Source/CobraLang.cs

@@ -603 +603 @@
     public delegate bool ForWhereGet<TIn, TOut>(TIn inValue, out TOut outValue);
 
-    static public IList<TOut> For<TIn, TOut>(IList<TIn> list, ForGet<TIn, TOut> forGet) {
+    static public List<TOut> For<TIn, TOut>(IList<TIn> list, ForGet<TIn, TOut> forGet) {
         // TODO: if possible, it might be nice to get the generic type of the list coming in and then make a constructed type from it with TOut.
         List<TOut> results = new List<TOut>(list.Count);
@@ -611 +611 @@
     }
 
-    static public IList<TOut> For<TIn, TOut>(IList<TIn> list, ForWhereGet<TIn, TOut> forWhereGet) {
-        IList<TOut> results = new List<TOut>();
+    static public List<TOut> For<TIn, TOut>(IList<TIn> list, ForWhereGet<TIn, TOut> forWhereGet) {
+        List<TOut> results = new List<TOut>();
         foreach (TIn item in list) {
             TOut value;

cobra/trunk/Source/Expr.cobra

@@ -830 +830 @@
                 _whereExpr = TruthExpr(_whereExpr).bindAll to TruthExpr  # CC: axe cast when have "as same"
         _getExpr.bindImp
-        ilist = .compiler.libraryBox('System.Collections.Generic.IList<of>')
+        ilist = .compiler.libraryBox('System.Collections.Generic.List<of>')
         _type = ilist.constructedTypeFor([_getExpr.type to !])
 

cobra/trunk/Tests/240-generics/100-use-generics-collections/610-for-expr-generic-list.cobra

@@ -42 +42 @@
 
         # where with a non bool-typed expression
-        stuff = 'aoeu   aoeu'
+        stuff = 'aoeu   asdf'
         words = for rawWord in stuff.split where rawWord.trim.length get rawWord.trim
-        assert words == ['aoeu', 'aoeu']
+        assert words == ['aoeu', 'asdf']
+        words = for word in words where word <> 'asdf'   # assign for expr back to source variable
+        assert words == ['aoeu']