opal · Mar 25, 2015 · Mar 25, 2015 · Mar 25, 2015 · Mar 25, 2015
Showing with 30 additions and 45 deletions.

+29 −31 opal/corelib/string.rb

+1 −1 spec/corelib

+0 −13 spec/filters/bugs/string.rb
diff --git a/opal/corelib/string.rb b/opal/corelib/string.rb
@@ -711,48 +711,46 @@ def reverse
 
   alias reverse! <<
 
-  # TODO handle case where search is regexp
   def rindex(search, offset = undefined)
     %x{
-      var search_type = (search == null ? Opal.NilClass : search.constructor);
-      if (search_type != String && search_type != RegExp) {
-        var msg = "type mismatch: " + search_type + " given";
-        #{raise TypeError.new(`msg`)};
-      }
-
-      if (self.length == 0) {
-        return search.length == 0 ? 0 : nil;
-      }
+      var i, m, r, _m;
 
-      var result = -1;
-      if (offset != null) {
+      if (offset === undefined) {
+        offset = self.length;
+      } else {
+        offset = #{Opal.coerce_to(`offset`, Integer, :to_int)};
         if (offset < 0) {
-          offset = self.length + offset;
-        }
-
-        if (search_type == String) {
-          result = self.lastIndexOf(search, offset);
-        }
-        else {
-          result = self.substr(0, offset + 1).$reverse().search(search);
-          if (result !== -1) {
-            result = offset - result;
+          offset += self.length;
+          if (offset < 0) {
+            return nil;
           }
         }
       }
-      else {
-        if (search_type == String) {
-          result = self.lastIndexOf(search);
-        }
-        else {
-          result = self.$reverse().search(search);
-          if (result !== -1) {
-            result = self.length - 1 - result;
+
+      if (search.$$is_regexp) {
+        m = null;
+        r = new RegExp(search.source, 'g' + (search.multiline ? 'm' : '') + (search.ignoreCase ? 'i' : ''));
+        while (true) {
+          _m = r.exec(self);
+          if (_m === null || _m.index > offset) {
+            break;
           }
+          m = _m;
+          r.lastIndex = m.index + 1;
         }
+        if (m === null) {
+          #{$~ = nil}
+          i = -1;
+        } else {
+          #{MatchData.new `r`, `m`};
+          i = m.index;
+        }
+      } else {
+        search = #{Opal.coerce_to(`search`, String, :to_str)};
+        i = self.lastIndexOf(search, offset);
       }
 
-      return result === -1 ? nil : result;
+      return i === -1 ? nil : i;
     }
   end
 

diff --git a/spec/corelib b/spec/corelib
diff --git a/spec/filters/bugs/string.rb b/spec/filters/bugs/string.rb
@@ -40,19 +40,6 @@
   fails "String#lines uses $/ as the separator when none is given"
   fails "String#lines yields subclass instances for subclasses"
 
-  fails "String#rindex with object raises a TypeError if obj isn't a String, Fixnum or Regexp"
-  fails "String#rindex with object tries to convert obj to a string via to_str"
-  fails "String#rindex with String ignores string subclasses"
-  fails "String#rindex with String returns nil if the substring isn't found"
-  fails "String#rindex with String raises a TypeError when given offset is nil"
-  fails "String#rindex with Regexp behaves the same as String#rindex(string) for escaped string regexps"
-  fails "String#rindex with Regexp returns the index of the first match from the end of string of regexp"
-  fails "String#rindex with Regexp sets $~ to MatchData of match and nil when there's none"
-  fails "String#rindex with Regexp starts the search at the given offset"
-  fails "String#rindex with Regexp supports \\G which matches at the given start offset"
-  fails "String#rindex with Regexp tries to convert start_offset to an integer via to_int"
-  fails "String#rindex with Regexp raises a TypeError when given offset is nil"
-
   fails "String#slice with Range calls to_int on range arguments"
 
   fails "String#split with String returns subclass instances based on self"