Remove extra public methods on IO

Author: eregon

spec/tags/truffle/methods_tags.txt

@@ -23,21 +23,13 @@ fails:Public methods on Hash should not include sort
 fails:Public methods on IO should include fdatasync
 fails:Public methods on IO should include pread
 fails:Public methods on IO should include pwrite
-fails:Public methods on IO should not include buffer_empty?
 fails:Public methods on IO should not include descriptor
 fails:Public methods on IO should not include descriptor=
 fails:Public methods on IO should not include dup
 fails:Public methods on IO should not include encode_with
 fails:Public methods on IO should not include eof!
-fails:Public methods on IO should not include external
-fails:Public methods on IO should not include external=
 fails:Public methods on IO should not include force_read_only
 fails:Public methods on IO should not include force_write_only
-fails:Public methods on IO should not include increment_lineno
-fails:Public methods on IO should not include internal
-fails:Public methods on IO should not include internal=
-fails:Public methods on IO should not include mode
-fails:Public methods on IO should not include mode=
 fails:Public methods on IO should not include mode_read_only?
 fails:Public methods on IO should not include mode_write_only?
 fails:Public methods on IO should not include nonblock

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

@@ -349,9 +349,6 @@ def inspect # :nodoc:
   end
 
   attr_accessor :descriptor
-  attr_accessor :external
-  attr_accessor :internal
-  attr_accessor :mode
 
   def mode_read_only?
     @mode & ACCMODE == RDONLY
@@ -964,7 +961,9 @@ def self.select(readables=nil, writables=nil, errorables=nil, timeout=nil)
         Truffle::Type.coerce_to(readables, Array, :to_ary).map do |obj|
           if obj.kind_of? IO
             raise IOError, 'closed stream' if obj.closed?
-            return [[obj],[],[]] unless obj.buffer_empty?
+            unless obj.__send__(:buffer_empty?)
+              return [[obj],[],[]]
+            end
             obj
           else
             io = Truffle::Type.coerce_to(obj, IO, :to_io)
@@ -1131,7 +1130,7 @@ def self.setup(io, fd, mode=nil, sync=false)
     io.close if io.descriptor != -1
 
     io.descriptor = fd
-    io.mode       = mode || cur_mode
+    io.instance_variable_set(:@mode, mode || cur_mode)
     io.sync       = !!sync
     io.autoclose  = true
     io.instance_variable_set :@ibuffer, IO::InternalBuffer.new
@@ -1248,8 +1247,9 @@ def binmode
   def binmode?
     !@binmode.nil?
   end
+
   # Used to find out if there is buffered data available.
-  def buffer_empty?
+  private def buffer_empty?
     @ibuffer.empty?
   end
 
@@ -1391,7 +1391,7 @@ def read_to_separator
           s = IO.read_encode(@io, s)
           s.taint
 
-          $. = @io.increment_lineno
+          $. = @io.__send__(:increment_lineno)
           @buffer.discard @skip if @skip
 
           yield s
@@ -1422,7 +1422,7 @@ def read_to_separator_with_limit
           str = IO.read_encode(@io, str)
           str.taint
 
-          $. = @io.increment_lineno
+          $. = @io.__send__(:increment_lineno)
           @buffer.discard @skip if @skip
 
           yield str
@@ -1436,7 +1436,7 @@ def read_to_separator_with_limit
             str = @buffer.read_to_char_boundary(@io, str)
             str.taint
 
-            $. = @io.increment_lineno
+            $. = @io.__send__(:increment_lineno)
             @buffer.discard @skip if @skip
 
             yield str
@@ -1477,7 +1477,7 @@ def read_to_limit
           str = @buffer.read_to_char_boundary(@io, str)
           str.taint
 
-          $. = @io.increment_lineno
+          $. = @io.__send__(:increment_lineno)
           yield str
 
           str = +''
@@ -1495,13 +1495,13 @@ def yield_string(str)
       unless str.empty?
         str = IO.read_encode(@io, str)
         str.taint
-        $. = @io.increment_lineno
+        $. = @io.__send__(:increment_lineno)
         yield str
       end
     end
   end
 
-  def increment_lineno
+  private def increment_lineno
     @lineno += 1
   end