Small code cleanup and spec for StringScanner#scan_internal size.

Author: aardvark179

lib/truffle/strscan.rb

@@ -308,23 +308,30 @@ def peep(len)
     peek len
   end
 
-  def scan_check_args(pattern, headonly)
+  private def scan_check_args(pattern, headonly)
     unless pattern.kind_of? Regexp
       raise TypeError, "bad pattern argument: #{pattern.inspect}"
     end
     raise ArgumentError, 'uninitialized StringScanner object' unless @string
   end
 
-  def scan_internal(pattern, advance_pos, getstr, headonly)
+  # This method is kept very small so that it should fit within 100
+  # AST nodes and can be split. This is done to avoid indirect calls
+  # to TRegex.
+  private def scan_internal(pattern, advance_pos, getstr, headonly)
     scan_check_args(pattern, headonly)
 
     md = Truffle::RegexpOperations.match_in_region pattern, @string, pos, @string.bytesize, headonly, pos
-    Primitive.matchdata_fixup_positions(md, pos) if md
-    @match = md
-    scan_internal2(advance_pos, getstr)
+    if md
+      Primitive.matchdata_fixup_positions(md, pos)
+      @match = md
+      scan_internal_set_pos_and_str(advance_pos, getstr)
+    else
+      @match = nil
+    end
   end
 
-  def scan_internal2(advance_pos, getstr)
+  private def scan_internal_set_pos_and_str(advance_pos, getstr)
     return nil unless @match
 
     fin = Primitive.match_data_byte_end(@match, 0)
@@ -337,6 +344,5 @@ def scan_internal2(advance_pos, getstr)
 
     @string.byteslice(@prev_pos, width)
   end
-  private :scan_internal, :scan_internal2, :scan_check_args
 
 end

spec/truffle/strscan/strscan_spec.rb

@@ -0,0 +1,9 @@
+require_relative '../../ruby/spec_helper'
+
+require 'strscan'
+
+describe 'StringScanner' do
+  it 'has a `scan_internal` method of under 100 AST nodes' do
+    Truffle::Debug.ast_size(StringScanner.instance_method(:scan_internal)).should < 100
+  end
+end