Refactor IO and move .normalize_options method to IOOperations

Author: andrykonchin

lib/truffle/stringio.rb

@@ -143,7 +143,7 @@ def initialize(string = nil, mode = nil, **options)
       warn 'StringIO::new() does not take block; use StringIO::open() instead'
     end
 
-    mode, _binary, _external, _internal, _autoclose, _perm = IO.normalize_options(mode, nil, options)
+    mode, _binary, _external, _internal, _autoclose, _perm = Truffle::IOOperations.normalize_options(mode, nil, options)
 
     if Primitive.nil?(string)
       mode ||= IO::RDWR

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

@@ -1164,7 +1164,7 @@ def initialize(path_or_fd, mode = nil, perm = nil, **options)
       @path = nil
     else
       path = Truffle::Type.coerce_to_path path_or_fd
-      nmode, _binary, _external, _internal, _autoclose, perm = IO.normalize_options(mode, perm, options)
+      nmode, _binary, _external, _internal, _autoclose, perm = Truffle::IOOperations.normalize_options(mode, perm, options)
       fd = IO.sysopen(path, nmode, perm)
 
       @path = path

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

@@ -337,7 +337,7 @@ def self.binwrite(file, string, offset = nil, **options)
     default_mode = File::CREAT | File::RDWR | File::BINARY
     default_mode |= File::TRUNC unless offset
 
-    mode, _binary, external, _internal, _autoclose, perm = IO.normalize_options(nil, nil, options, default_mode)
+    mode, _binary, external, _internal, _autoclose, perm = Truffle::IOOperations.normalize_options(nil, nil, options, default_mode)
 
     File.open(file, mode, encoding: (external || 'ASCII-8BIT'), perm: perm) do |f|
       f.seek(offset) if offset
@@ -502,7 +502,7 @@ def self.write(file, string, offset = nil, **options)
       default_mode = File::CREAT | File::WRONLY
       default_mode |= File::TRUNC unless offset
 
-      mode, _binary, external, _internal, _autoclose, perm = IO.normalize_options(nil, nil, options, default_mode)
+      mode, _binary, external, _internal, _autoclose, perm = Truffle::IOOperations.normalize_options(nil, nil, options, default_mode)
 
       open_args = [mode]
       open_kw = { encoding: (external || 'ASCII-8BIT'), perm: perm }
@@ -569,99 +569,6 @@ def self.try_convert(obj)
     Truffle::Type.rb_check_convert_type obj, IO, :to_io
   end
 
-  def self.normalize_options(mode, perm, options, default_mode = nil)
-    autoclose = true
-
-    if mode
-      mode = (Truffle::Type.try_convert(mode, Integer, :to_int) or
-              Truffle::Type.coerce_to(mode, String, :to_str))
-    end
-
-    if options
-      if optmode = options[:mode]
-        optmode = (Truffle::Type.try_convert(optmode, Integer, :to_int) or
-                   Truffle::Type.coerce_to(optmode, String, :to_str))
-      end
-
-      if mode && optmode
-        raise ArgumentError, 'mode specified twice'
-      end
-
-      mode ||= optmode
-      mode ||= default_mode
-
-      if flags = options[:flags]
-        flags = Truffle::Type.rb_convert_type(flags, Integer, :to_int)
-
-        if Primitive.nil?(mode)
-          mode = flags
-        elsif Primitive.is_a?(mode, Integer)
-          mode |= flags
-        else # it's a String
-          mode = Truffle::IOOperations.parse_mode(mode)
-          mode |= flags
-        end
-      end
-
-      if optperm = options[:perm]
-        optperm = Truffle::Type.try_convert(optperm, Integer, :to_int)
-      end
-
-      if perm
-        raise ArgumentError, 'perm specified twice' if optperm
-      else
-        perm = optperm
-      end
-
-      autoclose = Primitive.as_boolean(options[:autoclose]) if options.key?(:autoclose)
-    end
-
-    mode ||= default_mode
-
-    if Primitive.is_a?(mode, String)
-      mode, external, internal = mode.split(':', 3)
-      raise ArgumentError, 'invalid access mode' unless mode
-
-      binary = true  if mode.include?(?b)
-      binary = false if mode.include?(?t)
-    elsif mode
-      binary = true  if (mode & BINARY) != 0
-    end
-
-    if options
-      if options[:textmode] and options[:binmode]
-        raise ArgumentError, 'both textmode and binmode specified'
-      end
-
-      if Primitive.nil? binary
-        binary = options[:binmode]
-      elsif options.key?(:textmode) or options.key?(:binmode)
-        raise ArgumentError, 'text/binary mode specified twice'
-      end
-
-      if !external and !internal
-        external = options[:external_encoding]
-        internal = options[:internal_encoding]
-      elsif options[:external_encoding] or options[:internal_encoding] or options[:encoding]
-        raise ArgumentError, 'encoding specified twice'
-      end
-
-      if !external and !internal
-        encoding = options[:encoding]
-
-        if Primitive.is_a?(encoding, Encoding)
-          external = encoding
-        elsif !Primitive.nil?(encoding)
-          encoding = StringValue(encoding)
-          external, internal = encoding.split(':', 2)
-        end
-      end
-    end
-    external = Encoding::BINARY if binary and !external and !internal
-    perm ||= 0666
-    [mode, binary, external, internal, autoclose, perm]
-  end
-
   def self.open(*args, **options)
     io = new(*args, **options)
 
@@ -720,7 +627,7 @@ def self.popen(*args)
       end
     end
 
-    mode, binary, external, internal, _autoclose, _perm = IO.normalize_options(mode, nil, io_options)
+    mode, binary, external, internal, _autoclose, _perm = Truffle::IOOperations.normalize_options(mode, nil, io_options)
     mode_int = Truffle::IOOperations.parse_mode mode
 
     readable = false
@@ -941,7 +848,7 @@ def initialize(fd, mode = nil, **options)
     @external = nil
     @pid = nil
 
-    mode, binary, external, internal, autoclose_tmp, _perm = IO.normalize_options(mode, nil, options)
+    mode, binary, external, internal, autoclose_tmp, _perm = Truffle::IOOperations.normalize_options(mode, nil, options)
 
     fd = Truffle::Type.coerce_to(fd, Integer, :to_int)
     sync = fd == 2 # stderr is always unbuffered, see setvbuf(3)

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

@@ -432,5 +432,98 @@ def self.rb_io_ext_int_to_encs(mode, external, internal)
 
       [external, internal]
     end
+
+    def self.normalize_options(mode, perm, options, default_mode = nil)
+      autoclose = true
+
+      if mode
+        mode = (Truffle::Type.try_convert(mode, Integer, :to_int) or
+          Truffle::Type.coerce_to(mode, String, :to_str))
+      end
+
+      if options
+        if optmode = options[:mode]
+          optmode = (Truffle::Type.try_convert(optmode, Integer, :to_int) or
+            Truffle::Type.coerce_to(optmode, String, :to_str))
+        end
+
+        if mode && optmode
+          raise ArgumentError, 'mode specified twice'
+        end
+
+        mode ||= optmode
+        mode ||= default_mode
+
+        if flags = options[:flags]
+          flags = Truffle::Type.rb_convert_type(flags, Integer, :to_int)
+
+          if Primitive.nil?(mode)
+            mode = flags
+          elsif Primitive.is_a?(mode, Integer)
+            mode |= flags
+          else # it's a String
+            mode = Truffle::IOOperations.parse_mode(mode)
+            mode |= flags
+          end
+        end
+
+        if optperm = options[:perm]
+          optperm = Truffle::Type.try_convert(optperm, Integer, :to_int)
+        end
+
+        if perm
+          raise ArgumentError, 'perm specified twice' if optperm
+        else
+          perm = optperm
+        end
+
+        autoclose = Primitive.as_boolean(options[:autoclose]) if options.key?(:autoclose)
+      end
+
+      mode ||= default_mode
+
+      if Primitive.is_a?(mode, String)
+        mode, external, internal = mode.split(':', 3)
+        raise ArgumentError, 'invalid access mode' unless mode
+
+        binary = true  if mode.include?(?b)
+        binary = false if mode.include?(?t)
+      elsif mode
+        binary = true  if (mode & BINARY) != 0
+      end
+
+      if options
+        if options[:textmode] and options[:binmode]
+          raise ArgumentError, 'both textmode and binmode specified'
+        end
+
+        if Primitive.nil? binary
+          binary = options[:binmode]
+        elsif options.key?(:textmode) or options.key?(:binmode)
+          raise ArgumentError, 'text/binary mode specified twice'
+        end
+
+        if !external and !internal
+          external = options[:external_encoding]
+          internal = options[:internal_encoding]
+        elsif options[:external_encoding] or options[:internal_encoding] or options[:encoding]
+          raise ArgumentError, 'encoding specified twice'
+        end
+
+        if !external and !internal
+          encoding = options[:encoding]
+
+          if Primitive.is_a?(encoding, Encoding)
+            external = encoding
+          elsif !Primitive.nil?(encoding)
+            encoding = StringValue(encoding)
+            external, internal = encoding.split(':', 2)
+          end
+        end
+      end
+      external = Encoding::BINARY if binary and !external and !internal
+      perm ||= 0666
+      [mode, binary, external, internal, autoclose, perm]
+    end
   end
 end