rio 0.5.1 → 0.6.0

data/lib/rio/state.rb

@@ -1,6 +1,6 @@
 #--
 # ===========================================================================
-# Copyright (c) 2005-2012 Christopher Kleckner
+# Copyright (c) 2005-2017 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -22,14 +22,6 @@
 #++
 #
 
-
-#require 'rio/context'
-#require 'rio/context/methods'
-#require 'rio/ext'
-#require 'rio/filter'
-#require 'rio/fs/native'
-#require 'rio/fwd'
-
 require 'rio/exception/state'
 require 'rio/state/data'
 require 'rio/symantics'
@@ -65,13 +57,6 @@ module RIO
       kiosyms << :eql?
       kiosyms << :load
       kiosyms << :to_a
-      #kiosyms << :split
-      #kiosyms << :sub
-      #kiosyms << :sub!
-      #kiosyms << :gsub
-      #kiosyms << :gsub!
-      #kiosyms << :chop
-      #kiosyms << :getc
 
       # In 1.8 #to_a is inherited from Object
       # For 1.9 we create this -- only to undef it immediatly.
@@ -95,7 +80,6 @@ module RIO
       
       attr_reader :data
       def initialize(iv)
-        #p "State#initialize(#{iv.keys.inspect})"
         @data = State::Data.new
         iv.keys.each do |k|
           @data[k] = iv[k]
@@ -111,12 +95,9 @@ module RIO
         data.ioh = other.data.ioh.clone if other.data.ioh
       end
 
-      extend Forwardable
-      def_instance_delegators(:rl,:path,:netpath,:to_s,:fspath,:length)
-
       extend RIO::Fwd
-      fwd :data,:rl,:cx
-      fwd :data,:ioh
+      fwd_readers :rl,:path,:netpath,:to_s,:fspath,:length
+      fwd :data,:rl,:cx,:ioh
       alias :ior :ioh
       alias :iow :ioh
 
@@ -127,10 +108,6 @@ module RIO
         new(other.data)
       end
 
-
-
-
-
       # Section: State Switching
 
       # the method for changing states
@@ -138,7 +115,6 @@ module RIO
       # and change the value in the handle that is shared with the rio object
       def become(new_class,*args)
         p "become : #{self.class.to_s} => #{new_class.to_s} (#{self.mode?})" if $trace_states
-        #p "BECOME #{new_class}: #{cx['ss_type']}"
         return self if new_class == self.class
 
         new_state = try_state[new_class,*args]
@@ -146,12 +122,9 @@ module RIO
         new_state
       end
       def became(obj)
-        #RIO::Ext.became(obj)
       end
       def method_missing_trace_str(sym,*args)
-        # "missing: "+self.class.to_s+'['+self.to_url+" {#{self.rl.fs}}"+']'+'.'+sym.to_s+'('+args.join(',')+')'
           "missing: "+self.class.to_s+'['+self.to_url+']'+'.'+sym.to_s+'('+args.join(',')+')'
-        #"missing: "+self.class.to_s+'['+self.to_url+""+']'+'.'+sym.to_s+'('+args.join(',')+')'
       end
 
       def method_missing(sym,*args,&block)
@@ -159,7 +132,6 @@ module RIO
 
         obj = when_missing(sym,*args)
         raise RuntimeError,"when_missing returns nil" if obj.nil?
-        #p "STATE: METHOD_MISSING",obj.to_s,sym,args
         obj.__send__(sym,*args,&block) #unless obj == self
       end
       
@@ -169,12 +141,10 @@ module RIO
       def base_state() Factory.instance.reset_state(rl) end
 
       def softreset 
-        #p "softreset(#{self.class}) => #{self.base_state}"
         cx['retrystate'] = nil
         become(self.base_state) 
       end
       def retryreset 
-        #p "retryreset(#{self.class}) => #{self.base_state}"
         become(self.base_state) 
       end
       def reset
@@ -196,8 +166,6 @@ module RIO
       def to_rl() self.rl.rl end
       def fs() self.rl.fs end
 
-      #def_instance_delegators(:uri,:path,:netpath,:to_s,:fspath,:length)
-
       def ==(other) rl == other end
       def ===(other) self == other end
       def =~(other) other =~ self.to_str end
@@ -209,7 +177,6 @@ module RIO
       def to_ary() nil end
 
       def hash() rl.to_s.hash end
-      #def eql?(other) @rl.to_s.eql?(other.to_s) end
 
       def stream?() false end
 
@@ -227,7 +194,6 @@ module RIO
       def clone_rio()
         cp = Rio.new(self.rl)
         cp.cx = self.cx.clone
-        #cp.ioh = self.ioh.clone unless self.ioh.nil?
         cp.rl = self.rl.clone
         cp
       end
@@ -242,7 +208,7 @@ module RIO
       def ensure_cmd_rio(arg)
         case arg
         when ::String then new_rio("cmdio:"+arg)
-        when ::Fixnum then new_rio(arg)
+        when ::Integer then new_rio(arg)
         when Rio then arg.clone
         else ensure_rio(arg)
         end

data/lib/rio/state/data.rb

@@ -1,6 +1,6 @@
 #--
 # ===========================================================================
-# Copyright (c) 2005-2012 Christopher Kleckner
+# Copyright (c) 2005-2017 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -22,8 +22,6 @@
 #++
 #
 
-require 'forwardable'
-
 module RIO
   module State
 
@@ -38,8 +36,9 @@ module RIO
       def initialize_copy(other)
         @store = other.store.clone
       end
-      extend Forwardable
-      def_delegators :@store,:[],:[]=,:keys
+      extend RIO::Fwd
+      fwd :@store,:[]
+      fwd_readers :@store,:keys
         
       def method_missing(sym,*args,&block)
         if sym.to_s.end_with?('=')

data/lib/rio/state/error.rb

@@ -1,6 +1,6 @@
 #--
 # ===========================================================================
-# Copyright (c) 2005-2012 Christopher Kleckner
+# Copyright (c) 2005-2017 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -34,17 +34,13 @@ module RIO
       def when_missing(sym,*args) self end
       def method_missing(sym,*args,&block)
         emsg = sprintf("Can't Handle %s[%s].%s(%s)",@obj.class.to_s,@obj.to_s,sym.to_s,args.join(','))
- #       emsg += "\n  "+@msg unless @msg.nil? or @msg.empty?
- #       emsg = @msg
         raise Exception::CantHandle.new(@obj,sym,*args),emsg
       end
       def self.error(emsg,obj,sym,*args)
         require 'rio/exception'
         msg = sprintf("%s[%s].%s(%s)",obj.class.to_s,obj.to_s,sym.to_s,args.join(','))
         msg += "\n  "+emsg unless emsg.nil? or emsg.empty?
-        state = new(obj: obj, sym: sym, msg: msg)
-        state
-#        raise CantHandle.new(obj,sym,*args),emsg
+        new(obj: obj, sym: sym, msg: msg)
       end
     end
   end 

data/lib/rio/stream.rb

@@ -1,6 +1,6 @@
 #--
 # ===========================================================================
-# Copyright (c) 2005-2012 Christopher Kleckner
+# Copyright (c) 2005-2017 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -38,17 +38,12 @@ require 'rio/ops/stream/input'
 require 'rio/ops/stream/output'
 require 'rio/ext'
 require 'rio/filter/gzip'
-#require 'rio/filter/yaml'
-#require 'rio/filter/chomp'
-#require 'rio/filter/strip'
-#require 'rio/filter/closeoneof'
 
 module RIO
 
   module Stream #:nodoc: all
     class Reset < Base
       # Mixin the appropriate ops
-      #include Ops::Path::Str
       include Ops::Stream::Reset
 
       def check?() true end
@@ -56,8 +51,6 @@ module RIO
     end
 
     class IOBase < Base
-
-
       # Mixin the appropriate ops
       include Ops::Path::Str
       include Ops::Stream::Status
@@ -84,9 +77,6 @@ module RIO
           ioh.extend(mod)
         end
       end
-#      def open_(*args)
-#        self
-#      end
       def rectype_mod
         case cx['stream_rectype']
         when 'lines' then RIO::RecType::Lines
@@ -103,7 +93,6 @@ module RIO
         super
         @recno = -1
         @get_selrej,@get_rangetops = create_selrej()
-        # @cursor = io_enum
         self
       end
     end
@@ -112,13 +101,11 @@ module RIO
       include Ini
       include Filters
 
-
       def add_extensions()
         #p callstr('add_extensions')
         Ext::Input.add_extensions(self)
       end
       def add_filters
-        #p "IN stream#add_filters"
         if gzip?
           gz = Zlib::GzipReader.new(self.ioh.ios)
           gz.extend Filter::GZipMissing
@@ -130,16 +117,8 @@ module RIO
           require 'rio/ext/csv/filter' if $USE_FASTER_CSV
           self.extend(::RIO::Ext::CSV::Input)
           add_csv_filter() if $USE_FASTER_CSV
-#          csvio = CSV.new(self.ioh.ios,*cx['csv_args'])
-#          self.ioh.ios = csvio
         end
-       #add_filter(Filter::YAML) if yaml?
         add_line_filters()
-#        add_filter(Filter::FasterCSV) if csv?
-#        if closeoneof?
-#          add_filter(Filter::CloseOnEOF)
-#          ioh.oncloseproc = proc { self.on_closeoneof }
-#        end
         self
       end
       def add_rec_methods()
@@ -167,11 +146,7 @@ module RIO
           require 'rio/ext/csv/filter'  if $USE_FASTER_CSV
           self.extend(::RIO::Ext::CSV::Output)
           add_csv_filter() if $USE_FASTER_CSV
-#          csvio = CSV.new(self.ioh.ios,*cx['csv_args'])
-#          self.ioh.ios = csvio
         end
-        #add_filter(Filter::FasterCSV) if csv?
-        #add_filter(Filter::YAML) if yaml?
         self
       end
 
@@ -194,11 +169,6 @@ module RIO
 
       def add_filters
         add_line_filters()
-
- #       if closeoneof?
- #         add_filter(Filter::CloseOnEOF)
- #         ioh.oncloseproc = proc { self.on_closeoneof }
- #       end
         self
       end
 

data/lib/rio/stream/base.rb

@@ -1,6 +1,6 @@
 #--
 # ===========================================================================
-# Copyright (c) 2005-2012 Christopher Kleckner
+# Copyright (c) 2005-2017 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -33,11 +33,7 @@ module RIO
       end
       def initialize_copy(other)
         super
-        #data.ioh = other.data.ioh
       end
-      #fwd :data,:ioh
-      #alias :ior :ioh
-      #alias :iow :ioh
 
       def iostate(*args) self end
       def stream?() true end

data/lib/rio/stream/duplex.rb

@@ -1,6 +1,6 @@
 #--
 # ===========================================================================
-# Copyright (c) 2005-2012 Christopher Kleckner
+# Copyright (c) 2005-2017 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -32,7 +32,6 @@ module RIO
       module Ops
         module Output
           def wclose()
-            p "wclose #{self}"
             ioh.close_write
             return self.close.softreset if ioh.closed?
             self
@@ -48,11 +47,8 @@ module RIO
   module Stream
     module Duplex
       module Ops
-        extend Forwardable
         extend RIO::Fwd
         def base_state() 'Stream::Duplex::Close' end
-        #def ior() fibproc.pipe.rd end
-        #def iow() fibproc.pipe.wr end
         def ior() ioh() end
         def iow() ioh end
       end
@@ -63,13 +59,11 @@ module RIO
         def output() stream_state('Stream::Duplex::Output') end
         def input()  stream_state('Stream::Duplex::Input')  end
         def inout()  stream_state('Stream::Duplex::InOut')  end
-        #def fibproc() input.fibproc() end
         protected
 
         def open_(*args)
           #p callstr('open_',args.inspect)+" mode='#{mode?}' (#{mode?.class}) ioh=#{self.ioh} open?=#{open?}"
           self.ioh = self.rl.open(mode?,*args) unless open?
-          #p data
           self
         end
       end
@@ -83,28 +77,19 @@ module RIO
         include Ops
         fwd :data,:fibproc
         def base_state() 'Stream::Duplex::Close' end
-        #include Ops::Output
       end
       
       class InOut < RIO::Stream::InOut
         include Ops
         fwd :data,:fibproc
         def base_state() 'Stream::Duplex::Close' end
-        #include Ops::Output
-        #include Ops::Input
         def get()
           until self.eof?
             raw_rec = self._get_rec
             return to_rec_(raw_rec) if @get_selrej.match?(raw_rec,@recno)
           end
-          #loop do
-          #  raw_rec = self._get_rec
-          #  return to_rec_(raw_rec) if @get_selrej.match?(raw_rec,@recno)
-          #  break if self.eof?
-          #end
           self.close if closeoneof?
           nil
-#          (closeoneof? ? self.on_eof_close{ nil } : nil)
         end
 
       end

data/lib/rio/stream/open.rb

@@ -1,6 +1,6 @@
 #--
 # ===========================================================================
-# Copyright (c) 2005-2012 Christopher Kleckner
+# Copyright (c) 2005-2017 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -22,11 +22,7 @@
 #++
 #
 
-
-#require 'rio/ioh'
 require 'rio/stream/base'
-#require 'rio/ops/stream'
-#require 'rio/ops/path'
 require 'rio/cp'
 require 'rio/piper/cp'
 require 'rio/util'
@@ -39,7 +35,6 @@ module RIO
       include Ops::Path::URI
       include Cp::Open::Output
       include Cp::Open::Input
-      ##include Piper::Cp::Input
 
       def check?() true end
 
@@ -72,9 +67,6 @@ module RIO
 
       public
 
-      #def size() self.contents.size end
-      #def empty?() self.eof? end
-
       def iostate(sym)
         if mode? && mode?.allows_both?
           open_.inout()
@@ -98,7 +90,6 @@ module RIO
 
       def stream_state(cl)
         #p callstr('stream_state',cl)
-        #p "LOOP: retry:#{cx['retrystate']} => #{cl}" 
         return nil if cx['retrystate'] == cl
         cx['retrystate'] = cl
 
@@ -172,7 +163,6 @@ module RIO
       def close_() 
         #p callstr('close_')+" mode='#{mode?}' ioh=#{self.ioh} open?=#{open?}"
         return self unless self.open? 
-        #clear_selection
         self.ioh.close 
         self.ioh = nil
         self.rl.close

data/lib/rio/symantics.rb

@@ -1,6 +1,6 @@
 #--
 # ===========================================================================
-# Copyright (c) 2005-2012 Christopher Kleckner
+# Copyright (c) 2005-2017 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.