sequence 0.1.0 → 0.2.0

data/README.txt

@@ -1,3 +1,8 @@
+= sequence
+
+* http://sequence.rubyforge.org/
+
+== DESCRIPTION:
 Sequence provides a unified api for access to sequential data types, like
 Strings, Arrays, Files, IOs, and Enumerations. Each sequence encapsulates
 some data and a current position within it. Some operations apply to data
@@ -24,6 +29,34 @@ Array-like cursors contain objects.
  
 
 
+== KNOWN PROBLEMS:
+Buffered does not work at all
+Shifting's modify methods don't work reliably
+No unit tests at all for array-like sequences
+(tho Reg's unit test does test OfArray at least somewhat...)
+
+== SYNOPSIS:
+
+  require 'rubygems'
+  require 'sequence'
+  require 'sequence/indexed'
+
+  seq="........some arbitrary text............".to_sequence
+  seq.pos # => 0
+  seq.scan_until /some .* text/    # => "........some arbitrary text"
+  seq.pos # => 27
+  #and much much more
+
+== INSTALL:
+
+* Just run: gem install sequence
+
+== LICENSE:
+
+Copyright (C) 2006,2008  Caleb Clausen  
+Distributed under the terms of Ruby's license. (See the file COPYING.)
+
+== USING:
 
 Stuff that's  unworking at the moment is marked with **
 
@@ -289,7 +322,7 @@ derived sequences:
   Circular       #loops base sequence data over and over
   SubSeq         #extracts a contiguous subset of base sequence 
                  #data into a new seq
-  List      (**) #logically concatenates its base sequences
+  List           #logically concatenates its base sequences
   Overlay (**)   #intercepts writes to the base seq
   Position       #an independant position within the base seq
   
@@ -308,13 +341,5 @@ Future:
   IndexedList   (**)
   
  
-known problems:
-Some unit tests fail
-Buffered does not work at all
-Shifting's modify methods don't work reliably
-Some write operations failing for List
-No unit tests at all for array-like sequences
-(tho Reg's unit test does test OfArray at least somewhat...)
 
-Copyright (C) 2006  Caleb Clausen  
-Distributed under the terms of Ruby's license.
+

data/lib/sequence.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2006  Caleb Clausen
+# Copyright (C) 2006,2008  Caleb Clausen
 # Distributed under the terms of Ruby's license.
 # = sequence.rb - external iterators with capabilities like a text editor cursor
 # $Id$
@@ -104,11 +104,13 @@ class Sequence
     
     #read data behind the current  position, leaving position unchanged
     def readbehind(len)
+      len>pos and len=pos
       read move( -len)
     end
         
     #read data behind the current  position, leaving position just before the data read.
     def readback(len)
+      len>pos and len=pos
       readahead move( -len )
     end
 
@@ -158,7 +160,7 @@ class Sequence
     #$ and \Z match at the end of the sequence. 
     #when scanning backward, ^ and \A match at the beginning of sequence and $ and
     #\Z match at the current position.
-    #^ and $ still match at beginning and end of lines, as usual.
+    #^ and $ still match at begining and end of lines, as usual.
 
     #when scanning or matching backwards, ^ has some special problems:
 # these won't work....
@@ -351,7 +353,9 @@ class Sequence
     # The (positive) amount actually moved is returned (<+len+ if reached beginning/end).
     def move(len)
       oldpos=pos
-      goto oldpos+len
+      newpos=oldpos+len
+      newpos<0 and newpos=0
+      goto newpos
       return (pos-oldpos).abs
     end
     # move to end of the remaining elements.

data/lib/sequence/indexed.rb

@@ -1,5 +1,5 @@
 # $Id$
-# Copyright (C) 2006  Caleb Clausen
+# Copyright (C) 2006,2008  Caleb Clausen
 # Distributed under the terms of Ruby's license.
 
 require 'sequence'
@@ -119,50 +119,70 @@ class OfString < Indexed
 
   include StringLike
   def scan(pat)
-    holding?{case pat
-    when Regexp:
+    case pat
+    when Regexp
       if (m=match pat,true)
         @pos= m.end(0)
-        m.to_s
+        return m.to_s
       end
-    when Integer: (res=@data[@pos])==pat and @pos+=1 and res 
-    when String: @data[@pos...@pos+=pat.size]==pat and pat
-    end}
+    when Integer 
+      res=@data[@pos]
+      if res==pat
+        @pos+=1 
+        return res.chr
+      end
+    when String 
+      if @data[@pos...@pos+pat.size]==pat
+        @pos+=pat.size
+        return pat
+      end
+    end
   end
 
   def scanback(pat)
-    holding?{case pat
-    when Regexp:
-      if m=matchback(pat,true) 
+    case pat
+    when Regexp
+      if (m=matchback pat,true)
         @pos= m.begin(0)
-        m.to_s
+        return m.to_s
+      end
+    when Integer 
+      res=@data[@pos]
+      if res==pat
+        @pos-=1 
+        return res.chr
       end
-    when Integer:  @data[@pos-=1]==pat and pat.chr 
-    when String: @data[@pos-=pat.size,pat.size]==pat and pat
-    end}
+    when String 
+      if @data[@pos...@pos-pat.size]==pat
+        @pos-=pat.size
+        return pat
+      end
+    end
   end
 
   def scan_until(pat)
     if Regexp===pat
-      return(if (m=match pat,false) 
+      if (m=match pat,false) 
         @pos= m.end(0)
         m.pre_match+m.to_s
-      end)
+      end
+    else
+      i=@data.index(pat,pos) and
+        @data[@pos...@pos=i]
     end
-    i=@data.index(pat,pos) or return
-    @data[@pos...@pos=i]
   end
   
   def scanback_until(pat)
     if Regexp===pat
-      return(if (m=matchback pat,true)
+      if (m=matchback pat,true)
         @pos= m.begin(0) 
         m.to_s+m.post_match
-      end)
+      end
+    else
+      i=@data.rindex(pat,pos) or return
+      oldpos=@pos
+      @data[@pos=i...oldpos]
     end
-    i=@data.rindex(pat,pos) or return
-    oldpos=@pos
-    @data[@pos=i...oldpos]
   end
   
   def match pat,anchored=true,len=size

data/lib/sequence/list.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2006  Caleb Clausen
+# Copyright (C) 2006,2008  Caleb Clausen
 # Distributed under the terms of Ruby's license.
 class Sequence
   class Circular < Sequence; end
@@ -9,7 +9,6 @@ class Sequence
       @current_idx=0
       @pos=0
       @start_pos=[0]
-      _rebuild_idxs
       
       @list=@list.inject([]){|li,seq|
         Circular===seq and raise 'no circular seqs in lists'
@@ -17,9 +16,12 @@ class Sequence
         if List===seq then li+seq.list else li<<seq end
       }
       @list.each{|seq| seq.on_change_notify(self) }
+      _rebuild_idxs
       
       extend seqs.first.like
     end
+ 
+    attr :list
     
     def change_notification(cu,first,oldsize,newsize)
       idx=@list.each_with_index{|item,i| cu.equal? item and break i}
@@ -176,12 +178,14 @@ class Sequence
         def subseq(*)
           result=super
           result.instance_eval(& Overlaid)
+          return result
         end
       end
     end
 
     def modify(*args)
       result=repldata=args.pop
+      
             
       repllen=repldata.size
 #      unless repldata.empty?
@@ -194,9 +198,15 @@ class Sequence
       replseqs=[repldata]
 
       first,len,only1=_parse_slice_args(*args)
-      
+      if len.zero? and repllen.zero? 
+        notify_change self,first,len,repllen
+        return result
+      end
+
       f_idx=first.zero?? 0 : _lookup_idx(first-1) 
-      l_idx=_lookup_idx(first+len)
+      last_item_i=first+len-1
+      last_item_i=0 if last_item_i<0
+      l_idx=_lookup_idx(last_item_i)
 
       assert f_idx <= l_idx
 
@@ -204,11 +214,11 @@ class Sequence
       fragrest_l=first+len-@start_pos[l_idx]
 
       #@list[i] can be nil here... maybe because i==@list.size?
-      assert fragrest_f < @list[i].size
-      assert fragrest_l <= @list[l_idx].size unless l_idx == @list.size and fragrest_l.zero?
+      assert fragrest_f <= @list[i].size
+#      assert fragrest_l <= @list[l_idx].size unless l_idx == @list.size and fragrest_l.zero?
 
       #merge replacement data with adjacent seq(s) if also overlaid
-      if fragrest_f.nonzero?
+      if fragrest_f.nonzero? #if inserted chunklet won't be empty
         replseqs.unshift( item=@list[i].subseq(0...fragrest_f) )
         if item.respond_to? :overlaid?
           repldata.prepend item.all_data
@@ -216,7 +226,7 @@ class Sequence
         end
       end
          
-      if  fragrest_l.nonzero?
+      if  fragrest_l < @list[l_idx].size #if inserted chunklet won't be empty
         replseqs.push( item=@list[l_idx].subseq(fragrest_l..-1) )
         if item.respond_to? :overlaid?
           repldata.append item.all_data
@@ -225,7 +235,7 @@ class Sequence
       end
 
       
-      replseqs.delete_if{|cu| cu.empty? }
+      replseqs.delete_if{|cu| !cu or cu.empty? }
 
       #now remove those elements in between and
       #insert replacement data at the same point
@@ -234,7 +244,7 @@ class Sequence
       assert f_idx < @list.size
       assert l_idx <= @list.size
       assert f_idx <= l_idx
-      @list[i...l_idx]=replseqs
+      @list[i..l_idx]=replseqs
       #base=f_idx.zero?? 0 :  @start_idx[f_idx-1]
       #@start_idx[f_idx...l_idx]=[base+repldata.size]
       
@@ -289,4 +299,4 @@ class Sequence
 #      result
 #    end
 #  end
-end
+end

data/lib/sequence/stringlike.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2006  Caleb Clausen
+# Copyright (C) 2006,2008  Caleb Clausen
 # Distributed under the terms of Ruby's license.
 require 'sequence/subseq'
 
@@ -54,7 +54,7 @@ class Sequence
              self.pos-=m.post_match.length+1
              #'self.' shouldn't be needed... but is
   
-             blocks.push m.pre_match if m.pre_match.length>0
+             blocks<<m.pre_match if m.pre_match.length>0
              break
           end
           blocks<<block
@@ -217,7 +217,8 @@ class Sequence
     groups=matchdata.to_a
     begins=[]
     ends=[]
-    (0...matchdata.length).each{|i| 
+    matchdata.to_a.each_with_index{|substr,i| 
+      next unless substr
       begins<<matchdata.begin(i)+pos_adjust
       ends<<matchdata.end(i)+pos_adjust
     }

data/lib/sequence/version.rb

@@ -1,5 +1,5 @@
-# Copyright (C) 2006  Caleb Clausen
+# Copyright (C) 2006,2008  Caleb Clausen
 # Distributed under the terms of Ruby's license.
 class Sequence
-  VERSION='0.1.0'
+  VERSION='0.2.0'
 end

data/test/test_rexscan.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2006  Caleb Clausen
+# Copyright (C) 2006,2008  Caleb Clausen
 # Distributed under the terms of Ruby's license.
 $VERBOSE=1
 require 'test/unit'
@@ -210,11 +210,19 @@ $Debug=true
 
     class ListRandomized < Indexed
       def a_seq
+        reuse=defined? @saved_lens
+        @saved_lens||=[]
+        saved_lens=@saved_lens.dup
         maxchunk=DATA.size/5
         idx=0
         list=[]
         begin
-          len=rand(maxchunk)+1
+          if reuse
+            len=saved_lens.shift
+          else
+            len=rand(maxchunk)+1
+            @saved_lens<<len
+          end
           list<<DATA[idx,len].to_sequence
           idx+=len
 
@@ -241,12 +249,11 @@ $Debug=true
       #need to disable tests that move cursor position back or modify data
       undef_method(*(MOVEPOSMETHODS+MODIFYMETHODS))
     end
-
     
      module SmallScanBuffered
       SequenceTests.constants.each{|k|
         xk= SequenceTests.const_get(k)
-        next unless (xk.is_a? Class and xk<=Indexed)
+        next unless (xk.is_a? Class and xk<=::SequenceTests::Indexed)
         const_set k, xk=Class.new(xk)
         xk.instance_eval do
           define_method :a_seq do
@@ -257,6 +264,54 @@ $Debug=true
         end
       }
     end 
+
+    module ListWrapped
+      SequenceTests.constants.each{|k|
+        xk= SequenceTests.const_get(k)
+        next unless (xk.is_a? Class and xk<=::SequenceTests::Indexed)
+        next if /Circular/===xk.name
+        const_set k, xk=Class.new(xk)
+        xk.instance_eval do
+          define_method :a_seq do
+            result=Sequence::List.new([wrappee=super])
+            result.pos=wrappee.pos
+            return result
+          end
+        end
+      }
+    end
+
+
+    module ListWrappedAndChunkReified
+      SequenceTests.constants.each{|k|
+        xk= SequenceTests.const_get(k)
+        next unless (xk.is_a? Class and xk<=::SequenceTests::Indexed)
+        next if /Circular/===xk.name
+        const_set k, xk=Class.new(xk)
+        xk.instance_eval do
+          define_method :a_seq do
+            result=Sequence::List.new([wrappee=super])
+            chunk=rand_pos_pair
+            chunk=chunk.first..chunk.last
+            result[chunk]=result[chunk]
+            result.pos=wrappee.pos
+            return result
+          end
+        end
+      }
+      class ListMaxxed
+        undef test__lookup_idx
+      end
+      class List
+        undef test__lookup_idx
+      end
+      class IO
+        def test_size; end  #why can't i just undef it? dunno...
+      end
+
+    end
+
+
  
 =begin disabled for now; too many failures
      module Buffered
@@ -272,7 +327,6 @@ $Debug=true
         end
       }
     end 
-=end
  
      module Shifting
       SequenceTests.constants.each{|k|
@@ -287,6 +341,7 @@ $Debug=true
         end
       }
     end 
+=end
  
     class Indexed
     RANDOMIZED_METHODS=[:test_slice,:test_insert,:test_delete,:test_modify]
@@ -617,7 +672,7 @@ $Debug=true
       verify_scan_methods( /th(is|at)/,OFFSET,"that",
         [%W[that at],[OFFSET,OFFSET+2], 
          "", " tough guy talk\ndon't make you a dog", false] )
-=begin
+#=begin
       _=(seq =a_seq).scan /th(is|at)/
       assert_equal "that", _
       verify_aftermatch_status(
@@ -645,13 +700,13 @@ $Debug=true
         seq,12,%W[that at],[OFFSET,OFFSET+2],
         "", " tough guy talk\ndon't make you a dog", false
       )
-=end      
+#=end      
       
       verify_scan_until_methods( /[mb]ake/, OFFSET, "that tough guy talk\ndon't ", "make",
         [%W[make],[OFFSET+26],
         "that tough guy talk\ndon't "," you a dog", false] )
   
-=begin          
+#=begin          
       _=(seq =a_seq).scan_until /[mb]ake/
       assert_equal "that tough guy talk\ndon't make", _
       verify_aftermatch_status(
@@ -679,7 +734,7 @@ $Debug=true
         seq,OFFSET,%W[make],[OFFSET+26],
         "that tough guy talk\ndon't "," you a dog", false
       )
-=end      
+#=end      
       
       #ok, and now with anchors
       verify_failmatch_status :scan_until, /[cr]at\Z/
@@ -702,7 +757,7 @@ $Debug=true
       verify_scan_until_methods( /(d([^d]+))\Z/,OFFSET,"",      "that tough guy talk\ndon't make you a dog",
       [%W[dog dog og],[OFFSET+37,OFFSET+37,OFFSET+38],"that tough guy talk\ndon't make you a ", "", true] )
 
-=begin      
+#=begin      
       _=(seq =a_seq).scan_until /(d([^d]+))\Z/
       assert_equal "that tough guy talk\ndon't make you a dog", _
       verify_aftermatch_status(
@@ -730,7 +785,7 @@ $Debug=true
         seq,52,%W[dog dog og],[49,49,50],
         "that tough guy talk\ndon't make you a ","", true
       )      
-=end
+#=end
       end
 
       #implicitly anchored with anchors
@@ -755,7 +810,7 @@ $Debug=true
       [%W[dog dog og],[OFFSET+37,OFFSET+37,OFFSET+38],"", "", true] )
 
 
-=begin    
+#=begin    
   _=(seq =a_seq)
       seq.pos=49 #at 'dog'
       _= seq.scan /(d([^d]+))\Z/
@@ -787,7 +842,7 @@ $Debug=true
       verify_aftermatch_status(
         seq,52,%W[dog dog og],[49,49,50],"","", true
       )  
-=end
+#=end
       end
       #$ as anchor
       verify_failmatch_status :scan_until, /[cr]at$/
@@ -807,7 +862,7 @@ $Debug=true
       [%W[dog dog og],[OFFSET+37,OFFSET+37,OFFSET+38],"that tough guy talk\ndon't make you a ", "", true] )
 
 
-=begin
+#=begin
       _=(seq =a_seq).scan_until /(d([^d]+))$/
       assert_equal "that tough guy talk\ndon't make you a dog", _
       verify_aftermatch_status(
@@ -835,12 +890,12 @@ $Debug=true
         seq,52,%W[dog dog og],[49,49,50],
         "that tough guy talk\ndon't make you a ","", true
       )      
-=end
+#=end
       end
             
       verify_scan_until_methods( /(st|[bt])alk$/,OFFSET,"",      "that tough guy talk",
       [%W[talk t],[OFFSET+15,OFFSET+15],"that tough guy ","\ndon't make you a dog", false] )
-=begin
+#=begin
       _=(seq =a_seq).scan_until /(st|[bt])alk$/
       assert_equal "that tough guy talk", _
       verify_aftermatch_status(seq,31,%W[talk t],[27,27],"that tough guy ","\ndon't make you a dog",false)
@@ -856,7 +911,7 @@ $Debug=true
       _=(seq =a_seq).skip_until /(st|[bt])alk$/
       assert_equal 19, _
       verify_aftermatch_status(seq,31,%W[talk t],[27,27],"that tough guy ","\ndon't make you a dog",false)
-=end      
+#=end      
       verify_failmatch_status :scan_until, /(bob|talk\Z|(dou(gh)?))/
       verify_failmatch_status :check_until, /(bob|talk\Z|(dou(gh)?))/
       verify_failmatch_status :skip_until, /(bob|talk\Z|(dou(gh)?))/

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.4
 specification_version: 1
 name: sequence
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2006-10-05 00:00:00 -07:00
+  version: 0.2.0
+date: 2008-08-29 00:00:00 +01:00
 summary: A single api for reading and writing sequential data types.
 require_paths: 
 - lib
-- test
 email: sequence-owner @at@ inforadical .dot. net
 homepage: http://sequence.rubyforge.org/
 rubyforge_project: sequence
@@ -68,10 +67,12 @@ files:
 - GPL
 test_files: 
 - test/test_all.rb
-rdoc_options: []
-
-extra_rdoc_files: []
-
+rdoc_options: 
+- --main
+- README.txt
+extra_rdoc_files: 
+- Manifest.txt
+- README.txt
 executables: []
 
 extensions: []
@@ -86,5 +87,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.5
+        version: 1.5.1
     version: