opal · Apr 29, 2015 · Apr 29, 2015
Showing with 32 additions and 77 deletions.

+29 −63 opal/corelib/regexp.rb

+1 −1 spec/corelib

+0 −7 spec/filters/bugs/regexp.rb

+0 −6 spec/filters/bugs/string.rb

+2 −0 spec/filters/unsupported/regular_expressions.rb
diff --git a/opal/corelib/regexp.rb b/opal/corelib/regexp.rb
@@ -50,38 +50,7 @@ def ===(str)
   end
 
   def =~(string)
-    if `string === nil`
-      $~ = nil
-
-      return
-    end
-
-    string = Opal.coerce_to(string, String, :to_str).to_s
-
-    %x{
-      var re = self;
-
-      if (re.global) {
-        // should we clear it afterwards too?
-        re.lastIndex = 0;
-      }
-      else {
-        // rewrite regular expression to add the global flag to capture pre/post match
-        re = new RegExp(re.source, 'g' + (re.multiline ? 'm' : '') + (re.ignoreCase ? 'i' : ''));
-      }
-
-      var result = re.exec(string);
-
-      if (result) {
-        #{$~ = MatchData.new(`re`, `result`)};
-
-        return result.index;
-      }
-      else {
-        #{$~ = nil};
-        return nil;
-      }
-    }
+    return match(string) && $~.begin(0)
   end
 
   alias eql? ==
@@ -91,49 +60,46 @@ def inspect
   end
 
   def match(string, pos = undefined, &block)
-    if `string === nil`
-      $~ = nil
-
-      return
-    end
-
-    if `string.$$is_string == null`
-      unless string.respond_to? :to_str
-        raise TypeError, "no implicit conversion of #{string.class} into String"
-      end
-
-      string = string.to_str
-    end
-
     %x{
-      var re = self;
-
-      if (re.global) {
-        // should we clear it afterwards too?
-        re.lastIndex = 0;
+      if (pos === undefined) {
+        pos = 0;
+      } else {
+        pos = #{Opal.coerce_to(pos, Integer, :to_int)};
       }
-      else {
-        re = new RegExp(re.source, 'g' + (re.multiline ? 'm' : '') + (re.ignoreCase ? 'i' : ''));
+
+      if (string === nil) {
+        return #{$~ = nil};
       }
 
-      var result = re.exec(string);
+      string = #{Opal.coerce_to(string, String, :to_str)};
 
-      if (result) {
-        result = #{$~ = MatchData.new(`re`, `result`)};
+      if (pos < 0) {
+        pos += string.length;
+        if (pos < 0) {
+          return #{$~ = nil};
+        }
+      }
 
-        if (block === nil) {
-          return result;
+      var md, re = new RegExp(self.source, 'gm' + (self.ignoreCase ? 'i' : ''));
+
+      while (true) {
+        md = re.exec(string);
+        if (md === null) {
+          return #{$~ = nil};
         }
-        else {
-          return #{block.call(`result`)};
+        if (md.index >= pos) {
+          #{$~ = MatchData.new(`re`, `md`)}
+          return block === nil ? #{$~} : #{block.call($~)};
         }
-      }
-      else {
-        return #{$~ = nil};
+        re.lastIndex = md.index + 1;
       }
     }
   end
 
+  def ~
+    self =~ $_
+  end
+
   def source
     `self.source`
   end

diff --git a/spec/corelib b/spec/corelib
diff --git a/spec/filters/bugs/regexp.rb b/spec/filters/bugs/regexp.rb
@@ -1,9 +1,2 @@
 opal_filter "RegExp" do
-  fails "Regexp#eql? is true if self and other have the same character set code"
-  fails "Regexp#== is true if self and other have the same character set code"
-  fails "Regexp#~ matches against the contents of $_"
-  fails "Regexp#match uses the start as a character offset"
-  fails "Regexp#match matches the input at a given position"
-  fails "Regexp#match with [string, position] when given a positive position matches the input at a given position"
-  fails "Regexp#match with [string, position] when given a negative position matches the input at a given position"
 end
diff --git a/spec/filters/bugs/string.rb b/spec/filters/bugs/string.rb
@@ -66,12 +66,6 @@
   fails "String#initialize with no arguments does not raise an exception when frozen"
   fails "String#initialize is a private method"
 
-  fails "String#match matches a literal Regexp that uses ASCII-only UTF-8 escape sequences"
-  fails "String#match raises a TypeError if pattern is not a regexp or a string"
-  fails "String#match matches \\G at the start of the string"
-  fails "String#match with [pattern, position] when given a positive position matches the pattern against self starting at an optional index"
-  fails "String#match with [pattern, position] when given a negative position matches the pattern against self starting at an optional index"
-
   fails "String#to_c returns a Complex object"
   fails "String#to_c understands integers"
   fails "String#to_c understands negative integers"

diff --git a/spec/filters/unsupported/regular_expressions.rb b/spec/filters/unsupported/regular_expressions.rb
@@ -9,4 +9,6 @@
   fails "String#gsub with pattern and replacement returns a copy of self with all occurrences of pattern replaced with replacement" #Only fails str.gsub(/\Ah\S+\s*/, "huh? ").should == "huh? homely world. hah!"
 
   fails "String#scan supports \\G which matches the end of the previous match / string start for first match"
+
+  fails "String#match matches \\G at the start of the string"
 end