Revert "Revert "Map/map! are collect/collect!. Fix for collect! retur…

…n val.""

This reverts commit bf88c4d.

Signed-off-by: Ted Reed <ted.reed@gmail.com>

src/classes/Array.pir

@@ -1142,6 +1142,11 @@ Creates a new Array containing the results and returns it.
     .return (result)
 .end
 
+.sub 'map' :method
+    .param pmc block :named( "!BLOCK" )
+    .tailcall self.'collect'( "!BLOCK" => block )
+.end
+
 .sub 'collect!' :method
     .param pmc block :named('!BLOCK')
     .local int i, len
@@ -1158,8 +1163,15 @@ Creates a new Array containing the results and returns it.
     goto loop
 
   done:
+    .return (self)
 .end
 
+.sub 'map!' :method
+    .param pmc block :named( "!BLOCK" )
+    .tailcall self.'collect!'( "!BLOCK" => block )
+.end
+
+
 =item flatten
 
  recursively flatten any inner arrays into a single outer array
@@ -2173,7 +2185,7 @@ Returns the elements of LIST in the opposite order.
     .return(array)
 .end
 
-## TODO: join map reduce sort zip
+## TODO: join reduce sort zip
 
 =back
 

t/array/collect.t

@@ -1,6 +1,6 @@
 require 'Test'
 include Test
-plan 3
+plan 4
 
 a = [ "a", "b", "c", "d" ]
 b = a.collect {|x| x + "!" } 
@@ -10,3 +10,6 @@ is b, [ "a!", "b!", "c!", "d!" ], ".collect on Array returns new array"
 
 a.collect! {|x| x + "?"}
 is a, ["a?","b?","c?","d?"], ".collect!"
+
+b=a.collect! {|x| x + "!"}
+is b, ["a?!","b?!","c?!","d?!"], ".collect!"