* Fixed a bug in IListOps.ReverseIndex (core/array/rindex specs were …

…passing, this bug was triggered under certain conditions different from the ones defined in the specs) * Fixed ArrayOps.ReverseEach to make it not fail when elemens in the array are removed from inside a block.
nrk · Apr 23, 2009 · d2b18f5 · d2b18f5
1 parent 722dd4d
commit d2b18f5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/...al.LCA_RESTRICTED/Languages/IronRuby/mspec/ironruby-tags/core/array/reverse_each_tags.txt b/...al.LCA_RESTRICTED/Languages/IronRuby/mspec/ironruby-tags/core/array/reverse_each_tags.txt
diff --git a/Merlin/Main/Languages/Ruby/Libraries.LCA_RESTRICTED/Builtins/ArrayOps.cs b/Merlin/Main/Languages/Ruby/Libraries.LCA_RESTRICTED/Builtins/ArrayOps.cs
@@ -558,11 +558,15 @@ private sealed class BreakException : Exception {
                 throw RubyExceptions.NoBlockGiven();
             }
 
-            for (int i = self.Count - 1; i >= 0; --i) {
+            for (int originalSize = self.Count, i = originalSize - 1; i >= 0; i--) {
                 object result;
                 if (block.Yield(self[i], out result)) {
                     return result;
                 }
+                if (self.Count < originalSize) {
+                    i = originalSize - i - 1 + self.Count;
+                    originalSize = self.Count;
+                }
             }
             return self;
         }

diff --git a/Merlin/Main/Languages/Ruby/Libraries.LCA_RESTRICTED/Extensions/IListOps.cs b/Merlin/Main/Languages/Ruby/Libraries.LCA_RESTRICTED/Extensions/IListOps.cs
@@ -1040,6 +1040,7 @@ public static class IListOps {
                 }
                 if (self.Count < originalSize) {
                     i = originalSize - i - 1 + self.Count;
+                    originalSize = self.Count;
                 }
             }
             return null;