cursor 0.8 → 0.9

data/cursor/buffered.rb

@@ -1,4 +1,4 @@
-# $Id: buffered.rb,v 1.11 2005/07/21 15:15:38 eric_mahurin Exp $
+# $Id: buffered.rb,v 1.12 2005/08/31 14:41:16 eric_mahurin Exp $
 
 require 'cursor'
 require 'cursor/split'
@@ -68,8 +68,8 @@ class Buffered < Cursor
         @buffer.insert1after(v)
     end
     public
-    def pos(reverse=false) # :yield:
-        if reverse
+    def pos(reverse=false,&code) # :yield:
+        if code or reverse
             super
         else
             @buffer.pos+@output_pos

data/cursor/circular.rb

@@ -1,4 +1,4 @@
-# $Id: circular.rb,v 1.19 2005/07/21 15:15:38 eric_mahurin Exp $
+# $Id: circular.rb,v 1.20 2005/08/08 02:06:28 eric_mahurin Exp $
 
 require 'cursor'
 
@@ -233,6 +233,8 @@ class Circular < Cursor
     end
     # :startdoc:
     undef_method(:scan_until)
+    undef_method(:scan_pattern_until)
+    undef_method(:scan_pattern_while)
     undef_method(:modify)
     undef_method(:each)
     undef_method(:collect!)

data/cursor/io.rb

@@ -1,4 +1,4 @@
-# $Id: io.rb,v 1.15 2005/07/21 15:15:38 eric_mahurin Exp $
+# $Id: io.rb,v 1.17 2005/10/14 00:22:58 eric_mahurin Exp $
 
 require 'cursor'
 require 'cursor/usenext'
@@ -76,8 +76,12 @@ class IO < Cursor
     def skip1before
         @io.pos.zero? ? nil : true
     end
+    def scan1next(v)
+        v0 = @io.getc
+        (v0.nil? || v==v0) ? v0 : (@io.ungetc(v0);nil)
+    end
     def read(len,hold=false,buffer=nil)
-        len.nonzero? or return(buffer||"")
+        len.nonzero? or return(buffer ? 0 : "")
         reverse = len<0
         len = len.abs
         if reverse                   
@@ -118,12 +122,12 @@ class IO < Cursor
             else
                 buffer1.each_byte { |c| buffer << c }
             end
+            buffer1.size
         else
             buffer = buffer1
         end
-        buffer
     end
-    def read!(reverse=false,hold=false,buffer=new_data)
+    def read!(reverse=false,hold=false,buffer=nil)
         if reverse                   
             len = @io.pos.nonzero? or return
             @io.seek(0,::IO::SEEK_SET)
@@ -158,10 +162,10 @@ class IO < Cursor
             else
                 buffer1.each_byte { |c| buffer << c }
             end
+            buffer1.size
         else
             buffer = buffer1
         end
-        buffer
     end
     def skip(len,hold=false)
         len.nonzero? or return(0)
@@ -243,6 +247,7 @@ class IO < Cursor
             end
             value1 = value1.reverse if reverse
         end
+        len_written = len
         if reverse
             if hold.nil?
                 @positions && _adjust_insert(len)
@@ -261,7 +266,7 @@ class IO < Cursor
                 else
                     @io.seek(-len_overwrite,::IO::SEEK_CUR)
                     if overwrite_only
-                        len = len_overwrite.nonzero? or return
+                        len_written = len_overwrite.nonzero? or return
                     else
                         @positions && _adjust_insert(len_insert)
                         buffer2 = @io.read(nil)
@@ -274,7 +279,7 @@ class IO < Cursor
                     @io.write(value1[len_insert,len_overwrite])
                     
                 end
-                @io.seek(-len,::IO::SEEK_CUR) if !hold
+                @io.seek(-len_written,::IO::SEEK_CUR) if !hold
             end
         else
             if hold.nil?
@@ -292,23 +297,23 @@ class IO < Cursor
                     if @io.eof?
                         p0 = @io.pos
                         @io.seek(0,::IO::SEEK_END)
-                        len -= p0-@io.pos
-                        len.nonzero? or return
-                        value1 = value1[0,len]
+                        len_written -= p0-@io.pos
+                        len_written.nonzero? or return
+                        value1 = value1[0,len_written]
                     end
-                    @io.seek(-len,::IO::SEEK_CUR)
+                    @io.seek(-len_written,::IO::SEEK_CUR)
                 end
                 @io.write(value1)
-                @io.seek(-len,::IO::SEEK_CUR) if hold
+                @io.seek(-len_written,::IO::SEEK_CUR) if hold
             end
         end
-        len
+        len_written==len ? len : -len_written
     end
     def scan_until(value,reverse=false,hold=false,buffer=nil)
         if String===value && !reverse && hold==false && !buffer && !value.empty?
             @io.gets(value)
         else
-            super(value,reverse,hold,buffer||value.class.new)
+            super(value,reverse,hold,buffer)
         end
     end
     def pos=(p)

data/cursor/position.rb

@@ -1,4 +1,4 @@
-# $Id: position.rb,v 1.18 2005/07/18 14:46:28 eric_mahurin Exp $
+# $Id: position.rb,v 1.19 2005/08/31 14:41:16 eric_mahurin Exp $
 
 require 'cursor'
 
@@ -11,7 +11,7 @@ class Position < Cursor # :nodoc:
     def initialize(parent,reverse=false)
         @parent = parent
         @anchor_after = reverse
-        @pos = @parent.__send__(:pos)
+        @pos = @parent.pos
         prop(nil,@parent.prop)
     end
     def new_data
@@ -19,7 +19,7 @@ class Position < Cursor # :nodoc:
     end
     public
     localMethods = %w(
-        prop pos pos= to_s to_i position position= position? position!
+        prop pos pos? pos= to_s to_i position position= position? position!
         close closed? each collect! map!)
     stableMethods = %w(
         read1after read1before skip1after skip1before
@@ -61,8 +61,10 @@ class Position < Cursor # :nodoc:
         end")
     }
     
-    def pos(reverse=false)
-        if reverse.nil? ? @anchor_after : reverse
+    def pos(reverse=false,&code)
+        if code
+            super
+        elsif reverse.nil? ? @anchor_after : reverse
             (@pos.to_i-@parent.size).nonzero? || -0.0
         else
             @pos
@@ -100,22 +102,18 @@ class Position < Cursor # :nodoc:
     def position?(p=nil,&code) # :yield:
         if code
             super
-        elsif p
-            @parent.position?(p)
         else
-            nil
+            @parent.position?(p)
         end
     end
-    def position!(p=nil)
-        if p
-            @parent.position!(p)
-            self
-        else
-            nil
-        end
+    undef_method(:_delete_position)
+    # Returns the parent of this Position.
+    # Should only be used by parent Cursor.
+    def _parent # :nodoc:
+        @parent
     end
     def close
-        @parent.position!(self)
+        @parent._delete_position(self)
         super
     end
     protected

data/cursor/reversed.rb

@@ -1,4 +1,4 @@
-# $Id: reversed.rb,v 1.10 2005/07/21 15:15:38 eric_mahurin Exp $
+# $Id: reversed.rb,v 1.11 2005/08/31 14:41:16 eric_mahurin Exp $
 
 require 'cursor'
 
@@ -101,7 +101,8 @@ class Reversed < Cursor
     def modify1prev(lookup)
         @cursor.modify1next(lookup)
     end
-    def pos(reverse=false) # :yield:
+    def pos(reverse=false,&code) # :yield:
+        code ? super :
         -(@cursor.pos(!reverse).nonzero? or return(reverse ? -0.0 : 0))
     end
     def pos=(p)

data/cursor/split.rb

@@ -1,4 +1,4 @@
-# $Id: split.rb,v 1.3 2005/07/21 15:15:38 eric_mahurin Exp $
+# $Id: split.rb,v 1.4 2005/08/31 14:41:16 eric_mahurin Exp $
 
 require 'cursor'
 require 'cursor/usedeleteinsert'
@@ -35,8 +35,8 @@ class Split < Cursor
         true
     end
     public
-    def pos(reverse=false)
-        reverse ? -(@after.size.nonzero?||0.0) : @before.size
+    def pos(reverse=false,&code)
+        code ? super : reverse ? -(@after.size.nonzero?||0.0) : @before.size
     end
     # :startdoc:
 end

data/cursor/test.rb

@@ -1,5 +1,5 @@
 
-# $Id: test.rb,v 1.22 2005/07/21 15:15:38 eric_mahurin Exp $
+# $Id: test.rb,v 1.25 2005/08/31 14:41:16 eric_mahurin Exp $
 
 require 'test/unit'
 require 'cursor'
@@ -61,7 +61,7 @@ class Test < ::Test::Unit::TestCase
                     !(methods=~matchdata[1])
             end
         }
-        @flags = flags
+        @flags = flags.to_i
         @use_positions = @flags[0].zero?
         @use_branches = true
         @allow_pruning = false
@@ -89,7 +89,7 @@ class Test < ::Test::Unit::TestCase
         elements[rand((weight*(elements.size+offset)).to_i)]
     end
     def self.sequence(offset=0,weight=2,value=empty)
-        while v = element(offset,weight)
+        until (v = element(offset,weight)).nil?
             value << v
         end
         value
@@ -143,7 +143,7 @@ class Test < ::Test::Unit::TestCase
     def teardown
         if not passed?
             if @@output_level>=::Test::Unit::UI::PROGRESS_ONLY
-                puts("\n#{self.class}")
+                puts("\n#{self}")
                 puts("random_seed: #{@@random_seed}")
                 puts(@call)
             end
@@ -238,6 +238,32 @@ class Test < ::Test::Unit::TestCase
             i==0 ? ret0 = ret : assert_equal(ret0,ret,message)
         }
     end
+    def _test_matchdata(name,*args,&block)
+        ret0 = nil
+        _multi_test(name,*(args << block)) {
+            |i,ret,cursor,message|
+            if i==0
+                ret0 = ret
+            elsif ret0.nil?
+                assert_nil(ret)
+            else
+                assert_equal(ret0.to_a,ret.to_a)
+            end
+        }
+    end
+    def _test_match(name,*args,&block)
+        ret0 = nil
+        _multi_test(name,*(args << block)) {
+            |i,ret,cursor,message|
+            if i==0
+                ret0 = ret
+            elsif ret0.nil?
+                assert_nil(ret)
+            else
+                assert_equal(ret0[0,ret0.size-1],ret[0,ret.size-1])
+            end
+        }
+    end
     def _exec_position?(cursor,name,*args,&block)
         cursor.position? { cursor.__send__(name,*args,&block) }
     end
@@ -369,6 +395,57 @@ class Test < ::Test::Unit::TestCase
         end
         value
     end
+    # responds to [int]
+    def _read_pattern_sequence
+        self.class.sequence(0,3,"")
+    rescue TypeError
+        throw(:invalid_test)
+    end
+    def _pattern(variable)
+        n = 0
+        seq1 = self.class.sequence(0,2,"")
+        n = seq1.size
+        seq1 = Regexp.escape(seq1)
+        if n>=1 and rand(2).zero?
+            seq1 = "[#{seq1}]"
+            n = 1
+        end
+        alt1 = self.class.sequence(0,2,"")
+        alt2 = self.class.sequence(0,2,"")
+        n += alt1.size>alt2.size ? alt1.size : alt2.size
+        alt1 = Regexp.escape(alt1)
+        alt2 = Regexp.escape(alt2)
+        if alt1.empty?
+            if alt2.empty?
+                seq2 = ""
+            else
+                seq2 = "(#{alt2})?"
+            end
+        else
+            if alt2.empty?
+                seq2 = "(#{alt1})?"
+            else
+                if alt1[0]==alt2[0]
+                    seq2 = alt1
+                else
+                    seq2 = "(#{alt1}|#{alt2})"
+                end
+            end
+        end
+        if rand(2).zero?
+            pat = seq1+seq2
+        else
+            pat = seq2+seq1
+        end
+        pat = "(?:#{pat})*" if variable
+        pat = '\A'+pat if false==variable && rand(2).zero?
+        pat = Regexp.new(pat)
+        n += rand(2)
+        n = -n if rand(2).zero?
+        [pat,n]
+    rescue TypeError
+        throw(:invalid_test)
+    end
     def _pos
         pos = rand(
             self.class.instance_eval{@cursors_root}[:trunk][0].size.abs.to_i+1
@@ -430,6 +507,13 @@ class Test < ::Test::Unit::TestCase
             @cursor.position? { @cursor.read1next==elements[1] }
         }
     end
+    def _pos_code
+        elements = self.class.elements
+        proc {
+            @cursor.scan1next(elements[0]) ||
+            @cursor.position? { @cursor.read1next==elements[1] }
+        }
+    end
 
 
     public
@@ -469,23 +553,28 @@ class Test < ::Test::Unit::TestCase
     define_method("test_skip!"       ){_test_equal(:skip!,*_opt(_boolean,_booleannil))}
     define_method("test_write"       ){_test_equal(:write,_write_sequence,*_opt(_boolean,_booleannil,_boolean))}
     define_method("test_write?"      ){_test_equal(:write?,_write_sequence,*_opt(_boolean,_boolean,_read_sequence))}
-    define_method("test_scan"        ){_test_position?(:scan,_scan_sequence,*_opt(_boolean,_booleannil,_read_sequence))}
-    define_method("test_scan_until"  ){_test_equal(:scan_until,_scan_sequence)} #,*_opt(_boolean,_booleannil,_read_sequence)
-    define_method("test_scan_partial"){_test_equal(:scan_partial,_scan_sequence,*_opt(_boolean,_boolean,_read_sequence))}
-    define_method("test_modify"      ){_test_equal(:modify,_replacer,*_opt(_boolean,_boolean,_read_sequence))}
-    define_method("test_pos"         ){_test_equal(:pos,*_opt(_boolean))}
+    define_method("test_scan"        ){_test_equal(:scan,_scan_sequence,*_opt(_boolean,_booleannil,_read_sequence))}
+    define_method("test_scan_until"  ){_test_equal(:scan_until,_scan_sequence,*_opt(_boolean,_booleannil,_read_sequence))}
+    define_method("test_1scan_pattern"){_test_equal(:scan_pattern,*(_pattern(false)+_opt(_boolean)))}
+    define_method("test_2scan_pattern"){_test_matchdata(:scan_pattern,*(_pattern(false) << _boolean << _read_pattern_sequence))}
+    define_method("test_1scan_pattern_until"){_test_equal(:scan_pattern_until,*(_pattern(nil)+_opt(_boolean)))}
+    define_method("test_2scan_pattern_until"){_test_match(:scan_pattern_until,*(_pattern(nil)+[_boolean]+[_read_pattern_sequence]+_opt(rand(2))))}
+    define_method("test_scan_pattern_while"){_test_equal(:scan_pattern_while,*(_pattern(true)+_opt(_boolean,_read_pattern_sequence,rand(2))))}
+    define_method("test_1pos"        ){_test_equal(:pos,*_opt(_boolean))}
+    define_method("test_2pos"        ){_test_equal(:pos,*_opt(_boolean),&_pos_code)}
+    define_method("test_pos="        ){_test_equal(:pos=,_pos)}
+    define_method("test_1pos?"       ){_test_equal(:pos?,_pos+rand(5)-2)}
+    define_method("test_2pos?"       ){_test_equal(:pos?,*_opt(_boolean),&_pos_code)}
     define_method("test_to_i"        ){_test_equal(:to_i)}
     define_method("test_to_s"        ){_test_equal(:to_s)}
-    define_method("test_pos="        ){_test_equal(:pos=,_pos)}
     define_method("test_prop"        ){_test_equal(:prop,_prop_name,*_opt(_prop_value))}
     define_method("test_closed?"     ){_test_equal(:closed?)}
     define_method("test_close"       ){_test_close(:close)}
     define_method("test_1position"   ){_test_position(:position,*_opt(_boolean))}
     define_method("test_2position"   ){_test_equal(:position,*_opt{_boolean},&_position_code)}
     define_method("test_position="   ){_test_equal(:position=,_position)}
-    define_method("test_1position?"  ){_test_equal(:position?,*_opt{_anyposition})}
+    define_method("test_1position?"  ){_test_equal(:position?,_anyposition)}
     define_method("test_2position?"  ){_test_equal(:position?,*_opt{_boolean},&_position_code)}
-    define_method("test_position!"   ){_test_self(:position!,*_opt{_deleteposition})}
     define_method("test_<=>"         ){_test_equal(:<=>,_position)}
     define_method("test_-"           ){_test_equal(:-,_position)}
     define_method("test_+"           ){_test_position(:+,_len)}

data/cursor/test_circulars.rb

@@ -1,6 +1,6 @@
 #!/bin/env ruby
 #
-# $Id: test_circulars.rb,v 1.10 2005/07/21 15:15:38 eric_mahurin Exp $
+# $Id: test_circulars.rb,v 1.12 2005/08/31 14:41:16 eric_mahurin Exp $
 #
 # Run this to test circular cursors.
 # Here is a list of the optional arguments:
@@ -40,7 +40,7 @@ class Cursor
 class Test
 class Circulars < Test
     def self.suite
-        @reject = /^(scan_until|modify|each|collect!|map!)$/
+        @reject = /^(scan_until|modify|each|collect!|map!|scan_pattern_(while|until))$/
         $0==__FILE__ ? super(*ARGV) : super()
     end
     def self.seed(before,after)
@@ -63,14 +63,14 @@ class Circulars < Test
         cursors
     end
     def self.plant
-        @characters = rand(2).zero?
+        @characters = @flags[1].nonzero?||rand(2).zero?
         super
     end
     def self.elements
-        @characters ? [?\n,?\0,?0] : [false,"",[]]
+        @flags[1].nonzero? ? [?A,?B,?C] : @characters ? [?\n,?\0,?0] : [false,"",[]]
     end
     def self.empty
-        @characters&&rand(2).zero? ? "" : []
+        @characters&&(@flags[1].nonzero?||rand(2).zero?) ? "" : []
     end
     def self.reject(name,*args,&block)
         case name

data/cursor/test_cursors.rb

@@ -1,6 +1,6 @@
 #!/bin/env ruby
 #
-# $Id: test_cursors.rb,v 1.6 2005/07/21 15:15:38 eric_mahurin Exp $
+# $Id: test_cursors.rb,v 1.9 2005/08/31 14:41:16 eric_mahurin Exp $
 #
 # Run this to test non-circular cursors.
 # Here is a list of the optional arguments:
@@ -69,7 +69,7 @@ class Cursors < Test
             Cursor::Lined.new(Cursor::Indexed.new(before+after,before.size)),
             Cursor::Reversed.new(Cursor::Indexed.new((before+after).reverse,after.size)),
         ]
-        if String===before
+        if @string = String===before
             io=StringIO.new(before+after)
             io.pos=before.size
             cursors << io.to_cursor
@@ -92,15 +92,16 @@ class Cursors < Test
         super
     end
     def self.elements
-        @characters ? [?\n,?\0,?0] : [false,"",[]]
+        @flags[1].nonzero? ? [?A,?B,?C] : @characters ? [?\n,?\0,?0] : [false,"",[]]
     end
     def self.empty
         @characters&&(@flags[1].nonzero?||rand(2).zero?) ? "" : []
     end
     def self.reject(name,*args,&block)
         case name
-        when :position! then !@use_positions && args[0].nil?
-        when :position? then !@use_positions && args[0].nil? && block.nil?
+        when :scan_pattern then !@string
+        when :scan_pattern_until then !@string
+        when :scan_pattern_while then !@string
         end
     end
 end