[GR-17457] Move MatchData byte_begin and byte_end to Primitive

PullRequest: truffleruby/2363

Author: bjfish

lib/truffle/strscan.rb

@@ -195,7 +195,7 @@ def matched?
   end
 
   def matched_size
-    @match.byte_end(0) - @match.byte_begin(0) if @match
+    Primitive.match_data_byte_end(@match, 0) - Primitive.match_data_byte_begin(@match, 0) if @match
   end
 
   def matchedsize
@@ -208,7 +208,7 @@ def post_match
   end
 
   def pre_match
-    @string.byteslice(0, match.byte_begin(0)) if @match
+    @string.byteslice(0, Primitive.match_data_byte_begin(match, 0)) if @match
   end
 
   def reset_state
@@ -317,7 +317,7 @@ def scan_internal(pattern, advance_pos, getstr, headonly)
     @match = Truffle::RegexpOperations.match_onwards pattern, @string, pos, headonly
     return nil unless @match
 
-    fin = @match.byte_end(0)
+    fin = Primitive.match_data_byte_end(@match, 0)
 
     @prev_pos = @pos
     @pos = fin if advance_pos

spec/tags/truffle/methods_tags.txt

@@ -63,8 +63,6 @@ fails:Public methods on Proc should not include bound_method=
 fails:Public methods on Proc should not include ruby_method
 fails:Public methods on Proc should not include ruby_method=
 fails:Public methods on Proc should include hash
-fails:Public methods on MatchData should not include byte_begin
-fails:Public methods on MatchData should not include byte_end
 fails:Public methods on MatchData should include hash
 fails:Public methods on Method should include clone
 fails:Public methods on Method should include original_name

src/main/java/org/truffleruby/core/regexp/MatchDataNodes.java

@@ -20,7 +20,6 @@
 import org.truffleruby.builtins.CoreMethod;
 import org.truffleruby.builtins.CoreMethodArrayArgumentsNode;
 import org.truffleruby.builtins.CoreModule;
-import org.truffleruby.builtins.NonStandard;
 import org.truffleruby.builtins.Primitive;
 import org.truffleruby.builtins.PrimitiveArrayArgumentsNode;
 import org.truffleruby.builtins.UnaryCoreMethodNode;
@@ -521,9 +520,8 @@ protected boolean inBounds(RubyMatchData matchData, int index) {
         }
     }
 
-    @NonStandard
-    @CoreMethod(names = "byte_begin", required = 1, lowerFixnum = 1)
-    public abstract static class ByteBeginNode extends CoreMethodArrayArgumentsNode {
+    @Primitive(name = "match_data_byte_begin", lowerFixnum = 1)
+    public abstract static class ByteBeginNode extends PrimitiveArrayArgumentsNode {
 
         @Specialization(guards = "inBounds(matchData, index)")
         protected Object byteBegin(RubyMatchData matchData, int index) {
@@ -540,9 +538,8 @@ protected boolean inBounds(RubyMatchData matchData, int index) {
         }
     }
 
-    @NonStandard
-    @CoreMethod(names = "byte_end", required = 1, lowerFixnum = 1)
-    public abstract static class ByteEndNode extends CoreMethodArrayArgumentsNode {
+    @Primitive(name = "match_data_byte_end", lowerFixnum = 1)
+    public abstract static class ByteEndNode extends PrimitiveArrayArgumentsNode {
 
         @Specialization(guards = "inBounds(matchData, index)")
         protected Object byteEnd(RubyMatchData matchData, int index) {

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

@@ -243,8 +243,8 @@ def self.path_split(str)
       last_match = nil
 
       while match = %r!/+!.match_from(str, start)
-        cur_start = match.byte_begin(0)
-        cur_end = match.byte_end(0)
+        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)
         ret << str.byteslice(cur_start, cur_end - cur_start)
 

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

@@ -160,7 +160,7 @@ def split_type_regexp(string, pattern, limit, block)
 
           collapsed = Truffle::RegexpOperations.collapsing?(match)
 
-          unless collapsed && (match.byte_begin(0) == last_match_end)
+          unless collapsed && (Primitive.match_data_byte_begin(match, 0) == last_match_end)
             substring = Truffle::RegexpOperations.pre_match_from(match, last_match_end)
             empty_count = add_substring(string, ret, substring, empty_count, block)
 
@@ -174,13 +174,13 @@ def split_type_regexp(string, pattern, limit, block)
             count += 1
           end
 
-          start = match.byte_end(0)
+          start = Primitive.match_data_byte_end(match, 0)
           if collapsed
             start += 1
           end
 
           last_match = match
-          last_match_end = last_match.byte_end(0)
+          last_match_end = Primitive.match_data_byte_end(last_match, 0)
         end
 
         if last_match

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

@@ -237,7 +237,7 @@ def scan(pattern, &block)
     ret = block_given? ? self : []
 
     while match = pattern.match_from(self, index)
-      fin = match.byte_end(0)
+      fin = Primitive.match_data_byte_end(match, 0)
 
       if Truffle::RegexpOperations.collapsing?(match)
         if char = Primitive.string_find_character(self, fin)

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

@@ -96,7 +96,7 @@ def =~(pattern)
     when Regexp
       match_data = Truffle::RegexpOperations.search_region(pattern, str, 0, str.bytesize, true)
       Primitive.regexp_last_match_set(Primitive.caller_special_variables, match_data)
-      match_data.byte_begin(0) if match_data
+      Primitive.match_data_byte_begin(match_data, 0) if match_data
     when String
       raise TypeError, 'type mismatch: String given'
     else

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

@@ -169,14 +169,15 @@ def self.match_stats
     end
 
     def self.collapsing?(match)
-      match.byte_begin(0) == match.byte_end(0)
+      Primitive.match_data_byte_begin(match, 0) == Primitive.match_data_byte_end(match, 0)
     end
 
     def self.pre_match_from(match, idx)
       source = Primitive.match_data_get_source(match)
-      return source.byteslice(0, 0) if match.byte_begin(0) == 0
+      match_byte_begin = Primitive.match_data_byte_begin(match, 0)
+      return source.byteslice(0, 0) if match_byte_begin == 0
 
-      nd = match.byte_begin(0) - 1
+      nd = match_byte_begin - 1
       source.byteslice(idx, nd-idx+1)
     end
   end

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

@@ -87,7 +87,7 @@ def self.gsub_internal_core(orig, pattern)
       ret = orig.byteslice(0, 0) # Empty string and string subclass
 
       while match
-        offset = match.byte_begin(0)
+        offset = Primitive.match_data_byte_begin(match, 0)
 
         str = Truffle::RegexpOperations.pre_match_from(match, last_end)
         Primitive.string_append(ret, str) if str
@@ -103,11 +103,11 @@ def self.gsub_internal_core(orig, pattern)
             offset += 1
           end
         else
-          offset = match.byte_end(0)
+          offset = Primitive.match_data_byte_end(match, 0)
         end
 
         last_match = match
-        last_end = match.byte_end(0)
+        last_end = Primitive.match_data_byte_end(match, 0)
 
         if String === pattern
           index = byte_index(orig, pattern, offset)