sequence 0.2.3 → 0.2.4

data/lib/sequence/arraylike.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2006  Caleb Clausen
+# Copyright (C) 2006, 2011  Caleb Clausen
 # Distributed under the terms of Ruby's license.
 class Sequence
   module ArrayLike

data/lib/sequence/buffered.rb

@@ -1,5 +1,5 @@
 # $Id$
-# Copyright (C) 2006  Caleb Clausen
+# Copyright (C) 2006, 2011  Caleb Clausen
 # Distributed under the terms of Ruby's license.
 
 require 'sequence'

data/lib/sequence/circular.rb

@@ -1,51 +1,51 @@
 # $Id$
-# Copyright (C) 2006  Caleb Clausen
+# Copyright (C) 2006, 2011  Caleb Clausen
 # Distributed under the terms of Ruby's license.
 
 require 'sequence'
 
 class Sequence
-# This Sequence class is used to represent a circular buffer.  You can think of
-# this as having no beginning/end or the current location is always both at the
-# beginning/end.  Because of the circular nature, the methods
-# #scan_until, #modify, 
-# #each, #collect!, and #map!
-# are not defined.
-class Circular < Sequence
+  # This Sequence class is used to represent a circular buffer.  You can think of
+  # this as having no beginning/end or the current location is always both at the
+  # beginning/end.  Because of the circular nature, the methods
+  # #scan_until, #modify,
+  # #each, #collect!, and #map!
+  # are not defined.
+  class Circular < Sequence
     # Create a circular sequence from a normal finite one.
     def initialize(sequence,pos=sequence.pos)
-        @seq = sequence
-        @pos=pos
-        @size=sequence.size
-        extend sequence.like
-        
-        @seq.on_change_notify self
-    end
-    
-    #the default _parse_slice_args isn't forgiving enough about large 
+      @seq = sequence
+      @pos=pos
+      @size=sequence.size
+      extend sequence.like
+
+      @seq.on_change_notify self
+    end
+
+    #the default _parse_slice_args isn't forgiving enough about large
     #(positive or negative) indexes
     def _normalize_pos pos, size=nil
       pos
     end
-    
+
     def change_notification(cu,first,oldsize,newsize)
       assert(cu.equal?( @seq ))
       @pos =_adjust_pos_on_change(@pos, first,oldsize,newsize)
       @size+=newsize-oldsize
       assert @size==@seq.size
-      notify_change(self,first,oldsize,newsize) 
+      notify_change(self,first,oldsize,newsize)
     end
-    
+
 =begin
     def _adjust_delete(len=1,reverse=false)
-        pos = _pos(false)
-        ret = nil
-        @positions.each { |p| ret = p.__send__(:_deletion,pos,len,reverse,ret) }
+      pos = _pos(false)
+      ret = nil
+      @positions.each { |p| ret = p.__send__(:_deletion,pos,len,reverse,ret) }
     end
     def _adjust_insert(len=1)
-        pos = _pos(false)
-        ret = nil
-        @positions.each { |p| ret = p.__send__(:_insertion,pos,len,ret) }
+      pos = _pos(false)
+      ret = nil
+      @positions.each { |p| ret = p.__send__(:_insertion,pos,len,ret) }
     end
 =end
     attr_reader :pos,:size
@@ -59,7 +59,7 @@ class Circular < Sequence
     def new_data
         @seq.new_data
     end
-=begin **    
+=begin **
     def read1next
         v0 = @seq.read1next
         v0.nil? && @seq.move!(true) && (v0 = @seq.read1next)
@@ -186,21 +186,21 @@ class Circular < Sequence
     end
     alias end! begin!
     alias end begin
-    # Compare to +other+.  
+    # Compare to +other+.
     def <=>(other)
-        position?(other) and pos<=>other.pos
+      position?(other) and pos<=>other.pos
     end
 
 =begin ***
     # insert an element before the position and return self
     def << (value)
-        insert1before(value)
-        self
+      insert1before(value)
+      self
     end
     # insert an element after the position and return self
     def >> (value)
-        insert1after(value)
-        self
+      insert1after(value)
+      self
     end
 =end
     # :stopdoc:
@@ -208,27 +208,27 @@ class Circular < Sequence
     def data
       @seq
     end
-    
+
     def each
       po=position
       yield read1 until self==position
       po.close
     end
-    
+
     def eof?; false end
-    
+
     def readahead(len)
       result=@seq[@pos%size,len]
       len-=result.size
       len.zero? and return result
       loops=len/size
-      
+
       result+=@seq[0...size]*loops if loops.nonzero?
-      
+
       len%=size
-      
+
       len.zero? and return result
-      
+
       result+=@seq[0,len]
     end
 
@@ -237,35 +237,35 @@ class Circular < Sequence
       move len
       result
     end
-    
+
     def modify(*args)
       data=args.last
       first,len,only1=_parse_slice_args(*args[0...-1])
       first %= size
-      
+
       len>size and raise( ArgumentError, "dst len too long")
       first+len>size and raise( ArgumentError, "wraparound modify in circular")
 
       @seq.modify(*args)
     end
-    
+
     #when reversed and circular, always put the Circular outermost.
     def reverse
       Circular.new @seq.reverse
     end
-    
-    def nearbegin(len,at=pos) 
+
+    def nearbegin(len,at=pos)
       false
     end
-    
+
     def nearend(len,at=pos)
       false
     end
-    
+
     def closed?
       super or @seq.closed?
     end
-end
+  end
 end
 
 

data/lib/sequence/enum.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2006  Caleb Clausen
+# Copyright (C) 2006, 2011  Caleb Clausen
 # Distributed under the terms of Ruby's license.
 require 'thread'
 require 'sequence/arraylike'

data/lib/sequence/file.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2006  Caleb Clausen
+# Copyright (C) 2006, 2011  Caleb Clausen
 # Distributed under the terms of Ruby's license.
 # $Id$
 
@@ -163,10 +163,3 @@ class File
        Sequence::File.new(self)
     end
 end
-
-class StringIO
-    # convert an StringIO to a seq
-    def to_sequence
-       Sequence::File.new(self)
-    end
-end

data/lib/sequence/functional.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2006  Caleb Clausen
+# Copyright (C) 2006, 2011  Caleb Clausen
 # Distributed under the terms of Ruby's license.
   
 class Sequence
@@ -149,4 +149,4 @@ end
 class Proc
   has_side_effect *%w[[] call]
   no_side_effect "arity"
-end
+end

data/lib/sequence/generator.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+#Copyright (c) 2011 Caleb Clausen
 #--
 # $Idaemons: /home/cvs/rb/generator.rb,v 1.8 2001/10/03 08:54:32 knu Exp $
 # $RoughId: generator.rb,v 1.10 2003/10/14 19:36:58 knu Exp $

data/lib/sequence/indexed.rb

@@ -1,5 +1,5 @@
 # $Id$
-# Copyright (C) 2006,2008  Caleb Clausen
+# Copyright (C) 2006,2008, 2011  Caleb Clausen
 # Distributed under the terms of Ruby's license.
 
 require 'sequence'

data/lib/sequence/io.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2006  Caleb Clausen
+# Copyright (C) 2006, 2011  Caleb Clausen
 # Distributed under the terms of Ruby's license.
 require 'sequence/stringlike'
 require 'fcntl'

data/lib/sequence/list.rb

@@ -1,24 +1,27 @@
-# Copyright (C) 2006,2008  Caleb Clausen
+# Copyright (C) 2006,2008, 2011  Caleb Clausen
 # Distributed under the terms of Ruby's license.
 class Sequence
   class Circular < Sequence; end
   class List < Sequence
     def initialize(seqs)
-      seqs.empty? and raise ArgumentError
+      seqs.empty? and raise( ArgumentError, 'empty List not allowed' )
       @list=seqs
       @current_idx=0
       @pos=0
       @start_pos=[0]
       
       @list=@list.inject([]){|li,seq|
-        Circular===seq and raise 'no circular seqs in lists'
-        Sequence===seq or raise ArgumentError
-        if List===seq then li+seq.list else li<<seq end
+        seq=seq.to_sequence
+        case seq
+        when Circular; raise ArgumentError, 'no circular seqs in lists'
+        when List; li+seq.list 
+        else li<<seq 
+        end
       }
       @list.each{|seq| seq.on_change_notify(self) }
       _rebuild_idxs
       
-      extend seqs.first.like
+      extend @list.first.like
     end
  
     attr :list
@@ -170,7 +173,13 @@ class Sequence
       return idx
     end
     
-
+    module Overlaid
+        def overlaid?; true end
+        def subseq(*)
+          super.extend Overlaid
+        end
+    end
+=begin was
     Overlaid =proc do
       class<<self
         def overlaid?; true end
@@ -181,6 +190,7 @@ class Sequence
         end
       end
     end
+=end
 
     def modify(*args)
       result=repldata=args.pop
@@ -192,7 +202,8 @@ class Sequence
 
       
         #mark replacement data as overlaid
-        repldata.instance_eval(&Overlaid)
+        #repldata.instance_eval(&Overlaid)
+        repldata.extend Overlaid
 #      end
       replseqs=[repldata]
 
@@ -266,7 +277,8 @@ class Sequence
           return self
         end
         data=data.dup.to_sequence
-        data.instance_eval(&Overlaid)
+        #data.instance_eval(&Overlaid)
+        data.extend Overlaid
         @list<<data
         @start_pos<<@start_pos.last+data.size  
         notify_change(self,@start_pos[-2], 0, data.size)
@@ -278,7 +290,8 @@ class Sequence
           return self
         end
         data=data.dup.to_sequence
-        data.instance_eval(&Overlaid)
+        #data.instance_eval(&Overlaid)
+        data.extend Overlaid
         @list[0,0]=data
 
         #insert data.size into beginning of @start_pos

data/lib/sequence/ofhash.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2006  Caleb Clausen
+# Copyright (C) 2006, 2011  Caleb Clausen
 # Distributed under the terms of Ruby's license.
 require 'sequence'
 require 'sequence/indexed'

data/lib/sequence/ofobjectivars.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2006  Caleb Clausen
+# Copyright (C) 2006, 2011  Caleb Clausen
 # Distributed under the terms of Ruby's license.
 require 'sequence'
 require 'sequence/indexed'

data/lib/sequence/ofobjectmethods.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2006  Caleb Clausen
+# Copyright (C) 2006, 2011  Caleb Clausen
 # Distributed under the terms of Ruby's license.
 require 'sequence'
 require 'sequence/indexed'

data/lib/sequence/position.rb

@@ -1,8 +1,8 @@
 # $Id$
-# Copyright (C) 2006  Caleb Clausen
+# Copyright (C) 2006, 2011  Caleb Clausen
 # Distributed under the terms of Ruby's license.
 
-require 'sequence'
+#require 'sequence'
 require 'sequence/usedata'
 
 class Sequence

data/lib/sequence/reversed.rb

@@ -1,5 +1,5 @@
 # $Id$
-# Copyright (C) 2006  Caleb Clausen
+# Copyright (C) 2006, 2011  Caleb Clausen
 # Distributed under the terms of Ruby's license.
 
 require 'sequence'

data/lib/sequence/shifting.rb

@@ -1,5 +1,5 @@
 # $Id$
-# Copyright (C) 2006  Caleb Clausen
+# Copyright (C) 2006, 2011  Caleb Clausen
 # Distributed under the terms of Ruby's license.
 
 require 'sequence'

data/lib/sequence/singleitem.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2006  Caleb Clausen
+# Copyright (C) 2006, 2011  Caleb Clausen
 # Distributed under the terms of Ruby's license.
 require 'sequence'
 

data/lib/sequence/stringio.rb

@@ -0,0 +1,9 @@
+#Copyright (c) 2011 Caleb Clausen
+require 'stringio'
+class StringIO < Data
+    # convert an StringIO to a seq
+    def to_sequence
+       Sequence::File.new(self)
+    end
+end
+

data/lib/sequence/stringlike.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2006,2008  Caleb Clausen
+# Copyright (C) 2006,2008, 2011  Caleb Clausen
 # Distributed under the terms of Ruby's license.
 require 'sequence/subseq'
 
@@ -216,7 +216,9 @@ class Sequence
   def _anchor(str,backwards=false,cache=true)
     cache and result=@@anchor_cache[[str,backwards]] and return result
     result=backwards ? "(?:#{str})\\Z" : "\\A(?:#{str})"
-    cache and return @@anchor_cache[[str,backwards]]||=Regexp.new( result )
+    cache and return @@anchor_cache[[str,backwards]]||=Regexp.new( result, 0, 'n' )
+      #is it really correct to force regexp to be binary encoding here? not sure
+      #maybe encoding of str should be detected and reused?
     return result
   end
  

data/lib/sequence/subseq.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2006  Caleb Clausen
+# Copyright (C) 2006, 2011  Caleb Clausen
 # Distributed under the terms of Ruby's license.
 require 'sequence'
 require 'sequence/usedata'

data/lib/sequence/usedata.rb

@@ -1,6 +1,6 @@
-# Copyright (C) 2006  Caleb Clausen
+# Copyright (C) 2006, 2011  Caleb Clausen
 # Distributed under the terms of Ruby's license.
-require 'sequence'
+#require 'sequence'
 class Sequence
   # define #read in terms of #data and @pos.
   # #data must support #[]
@@ -32,4 +32,4 @@ class Sequence
     def_delegators :@data, :<<
 
   end
-end
+end