[GR-17457] Remove extra methods Regexp#{match_from, option_to_string}

PullRequest: truffleruby/2368

Author: bjfish

spec/tags/truffle/methods_tags.txt

@@ -68,8 +68,6 @@ fails:Public methods on Method should include clone
 fails:Public methods on Method should include original_name
 fails:Public methods on UnboundMethod should include clone
 fails:Public methods on UnboundMethod should include original_name
-fails:Public methods on Regexp should not include match_from
-fails:Public methods on Regexp should not include option_to_string
 fails:Public methods on Struct should include filter
 fails:Public methods on Symbol should not include eql?
 fails:Public methods on Symbol should not include hash

src/main/ruby/truffleruby/core/dir_glob.rb

@@ -245,7 +245,7 @@ def self.path_split(str)
 
       last_match = nil
 
-      while match = %r!/+!.match_from(str, start)
+      while match = Truffle::RegexpOperations.match_from(%r!/+!, str, start)
         cur_start = Primitive.match_data_byte_begin(match, 0)
         cur_end = Primitive.match_data_byte_end(match, 0)
         ret << str.byteslice(start, cur_start - start)

src/main/ruby/truffleruby/core/regexp.rb

@@ -191,7 +191,7 @@ def ===(other)
       end
     end
 
-    if match = match_from(other, 0)
+    if match = Truffle::RegexpOperations.match_from(self, other, 0)
       Primitive.regexp_last_match_set(Primitive.caller_special_variables, match)
       true
     else
@@ -211,7 +211,7 @@ def eql?(other)
   def inspect
     # the regexp matches any / that is after anything except for a \
     escape = source.gsub(%r!(\\.)|/!) { $1 || '\/' }
-    str = "/#{escape}/#{option_to_string(options)}"
+    str = "/#{escape}/#{Truffle::RegexpOperations.option_to_string(options)}"
     str << 'n' if (options & NOENCODING) > 0
     str
   end
@@ -236,19 +236,6 @@ def casefold?
     (options & IGNORECASE) > 0 ? true : false
   end
 
-  def match_from(str, count)
-    return nil unless str
-    Truffle::RegexpOperations.search_region(self, str, count, str.bytesize, true)
-  end
-
-  def option_to_string(option)
-    string = +''
-    string << 'm' if (option & MULTILINE) > 0
-    string << 'i' if (option & IGNORECASE) > 0
-    string << 'x' if (option & EXTENDED) > 0
-    string
-  end
-
   #
   # call-seq:
   #    rxp.named_captures  => hash

src/main/ruby/truffleruby/core/string.rb

@@ -236,7 +236,7 @@ def scan(pattern, &block)
     last_match = nil
     ret = block_given? ? self : []
 
-    while match = pattern.match_from(self, index)
+    while match = Truffle::RegexpOperations.match_from(pattern, self, index)
       fin = Primitive.match_data_byte_end(match, 0)
 
       if Truffle::RegexpOperations.collapsing?(match)
@@ -681,7 +681,7 @@ def sub!(pattern, replacement=undefined, &block)
     end
 
     pattern = Truffle::Type.coerce_to_regexp(pattern, true) unless pattern.kind_of? Regexp
-    match = pattern.match_from(self, 0)
+    match = Truffle::RegexpOperations.match_from(pattern, self, 0)
 
     Primitive.regexp_last_match_set(Primitive.proc_special_variables(block), match) if block
     Primitive.regexp_last_match_set(Primitive.caller_special_variables, match)
@@ -1291,7 +1291,7 @@ def index(str, start=undefined)
       Primitive.encoding_ensure_compatible self, str
 
       start = Primitive.string_byte_index_from_char_index(self, start)
-      if match = str.match_from(self, start)
+      if match = Truffle::RegexpOperations.match_from(str, self, start)
         Primitive.regexp_last_match_set(Primitive.caller_special_variables, match)
         return match.begin(0)
       else

src/main/ruby/truffleruby/core/truffle/regexp_operations.rb

@@ -168,6 +168,14 @@ def self.match_stats
       Hash[*match_stats_array]
     end
 
+    def self.option_to_string(option)
+      string = +''
+      string << 'm' if (option & Regexp::MULTILINE) > 0
+      string << 'i' if (option & Regexp::IGNORECASE) > 0
+      string << 'x' if (option & Regexp::EXTENDED) > 0
+      string
+    end
+
     def self.collapsing?(match)
       Primitive.match_data_byte_begin(match, 0) == Primitive.match_data_byte_end(match, 0)
     end

src/main/ruby/truffleruby/core/truffle/string_operations.rb

@@ -113,7 +113,7 @@ def self.gsub_internal_core(orig, pattern)
           index = byte_index(orig, pattern, offset)
           match = index ? Primitive.matchdata_create_single_group(pattern, orig.dup, index, index + pattern.bytesize) : nil
         else
-          match = pattern.match_from orig, offset
+          match = Truffle::RegexpOperations.match_from(pattern, orig, offset)
         end
       end