Fix bug in Array#rindex that broke 2 rubyspecs

opal · Sep 20, 2013 · 5ec2bdf · 5ec2bdf
1 parent e80a425
commit 5ec2bdf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/corelib/array.rb b/corelib/array.rb
@@ -853,7 +853,14 @@ def reverse_each(&block)
 
   def rindex(object = undefined, &block)
     %x{
-      if (block !== nil) {
+      if (object != null) {
+        for (var i = #{self}.length - 1; i >= 0; i--) {
+          if (#{`#{self}[i]` == `object`}) {
+            return i;
+          }
+        }
+      }
+      else if (block !== nil) {
         for (var i = #{self}.length - 1, value; i >= 0; i--) {
           if ((value = block(#{self}[i])) === $breaker) {
             return $breaker.$v;
@@ -864,12 +871,8 @@ def rindex(object = undefined, &block)
           }
         }
       }
-      else {
-        for (var i = #{self}.length - 1; i >= 0; i--) {
-          if (#{`#{self}[i]` == `object`}) {
-            return i;
-          }
-        }
+      else if (object == null) {
+        return #{enum_for :rindex};
       }
 
       return nil;

diff --git a/spec/filters/bugs/array/rindex.rb b/spec/filters/bugs/array/rindex.rb
@@ -1,6 +1,4 @@
 opal_filter "Array#rindex" do
-  fails "Array#rindex given no argument and no block produces an Enumerator"
   fails "Array#rindex rechecks the array size during iteration"
-  fails "Array#rindex ignore the block if there is an argument"
   fails "Array#rindex returns the first index backwards from the end where element == to object"
 end