reg 0.4.7 → 0.4.8

data/forward_to.rb

@@ -1,6 +1,6 @@
 =begin copyright
     reg - the ruby extended grammar
-    Copyright (C) 2005  Caleb Clausen
+    Copyright (C) 2005,2009  Caleb Clausen
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -37,13 +37,13 @@ protected
     
     eval names.pop.map{|myname,targetname| 
       "def #{myname}(*args,&block) (#{target}).#{targetname}(*args,&block) end\n" 
-    }.to_s if Hash===names.last 
+    }.join if Hash===names.last 
     eval names.map{|name| 
       "def #{name}(*args,&block) (#{target}).#{name}(*args,&block) end\n" 
-    }.to_s
+    }.join
   end
 end
 
 class Module
   public :forward_to
-end
+end

data/item_thattest.rb

@@ -24,11 +24,11 @@ require 'test/unit'
       res=pristine_inspect
       res[/^#</] or return res
       res=["#<",self.class,": ",instance_variables.sort.collect{|v| 
-        [v,"=",instance_variable_get(v).inspect," "]
+        [v,"=",instance_variable_get(v).inspect," "].join
       }]
-      res.last.pop
+      res.last.chop!
       res.push('>')
-      res.to_s
+      res.join
     end
   end
   class T411 < Test::Unit::TestCase

data/reg.gemspec

@@ -3,7 +3,7 @@ require 'rubygems'
 spec = Gem::Specification.new do |s|
     s.name = 'reg'
     s.rubyforge_project = 'reg'
-    s.version = '0.4.7'
+    s.version = '0.4.8'
     s.summary = 'The reg pattern matching/replacement language'
     s.files = %w[item_thattest.rb regbackref.rb regknows.rb regtest.rb
                  numberset.rb regbind.rb reglogic.rb regvar.rb
@@ -16,12 +16,14 @@ spec = Gem::Specification.new do |s|
     s.require_path = '.'
     s.has_rdoc = false
     s.requirements=["none"]
-    s.add_dependency("cursor", [">= 0.9"])
+    s.add_dependency("sequence", [">= 0.2.3"])
     s.author = 'Caleb Clausen'
+    s.email = 'caleb @at@ inforadical.net'
+    s.homepage = 'http://github.com/coatl/reg'
 end
 
 
 if $0==__FILE__
-  Gem::manage_gems
+#  Gem::manage_gems
   Gem::Builder.new(spec).build
 end

data/reg.rb

@@ -1,6 +1,6 @@
 =begin copyright
     reg - the ruby extended grammar
-    Copyright (C) 2005  Caleb Clausen
+    Copyright (C) 2005,2009  Caleb Clausen
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -16,6 +16,7 @@
     License along with this library; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 =end
+
 require 'regcore'
 require 'reglogic'
 require 'reghash'

data/regarray.rb

@@ -1,6 +1,6 @@
 =begin copyright
     reg - the ruby extended grammar
-    Copyright (C) 2005  Caleb Clausen
+    Copyright (C) 2005,2009  Caleb Clausen
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -253,7 +253,7 @@ module Reg
             INFINITY
           else
             rl*tl
-           end
+          end
     end
 
 
@@ -358,7 +358,7 @@ module Reg
 
   private
     def mmatch_multiple(arr,start)
-      mat=i=nil
+      mat=nil
       @regs.each_with_index{|r,i|
         if r.respond_to? :mmatch
           mat=r.mmatch(arr,start) or next

data/regcore.rb

@@ -1,6 +1,6 @@
 =begin copyright
     reg - the ruby extended grammar
-    Copyright (C) 2005  Caleb Clausen
+    Copyright (C) 2005,2009  Caleb Clausen
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -28,7 +28,7 @@ module Reg  #namespace
     result= [ Float::MAX**Float::MAX, Float::MAX**2,  Float::MAX*2].max
     result.infinite? ? result : 
       begin result=1.0/0
-      rescue: Float::MAX  #maybe 1.0/0 doesn't work on some systems?
+      rescue; Float::MAX  #maybe 1.0/0 doesn't work on some systems?
       end
   )
   #there's also this way: 999999999999999999999999999999999999999999999999e999999999999999999999999999999
@@ -137,7 +137,7 @@ module Reg  #namespace
     #--------------------------
     def Reg.interesting_matcher?(mat) #a hack
       case mat
-        when ItemThatLike,BackrefLike,Module,Set,Regexp,Range,::Reg::Reg: true
+        when ItemThatLike,BackrefLike,Module,Set,Regexp,Range,::Reg::Reg; true
         #when Symbol,Pathname: false
         else
           /^#<UnboundMethod: .*\(Kernel\)#===>$/===mat.method(:===).unbind.inspect and return false
@@ -204,20 +204,19 @@ module Reg  #namespace
       #--------------------------
           
         #eventually, this will be a list of all tla mappings
+        ::Reg::TLAs=Hash.new{|h,k| h[k]={} }
         RegMethods=proc do
-          @@TLAs={}
           define_method :assign_TLA do |*args|
             hash=args.pop   #extract hash from args
             noconst,*bogus=*args #peel noconst off front of args 
             hash.each{|k,v| 
-              v=@@TLAs[k]= noconst ? [v,true] : v #fold noconst into v (longname) and store in @@TLAs
+              v=TLAs[self][k]= noconst ? [v,true] : v #fold noconst into v (longname) and store in ::Reg::TLAs
               TLA_aliases k,v  #always alias the TLA into ::Reg namespace
             }
           end
           
           
           alias_method :assign_TLAs, :assign_TLA
-
           define_method :TLA_aliases do |short,long_args,*rest| myself=rest.first||::Object
             long=nil
             if ::Array===long_args 
@@ -236,7 +235,7 @@ module Reg  #namespace
           (class<<mod;self;end).instance_eval( &RegMethods    )
         end
  
-    TLA_pirate= proc {         @@TLAs.each{|k,v| Reg.TLA_aliases k,v,self}       }
+    TLA_pirate= proc {         ::Reg::TLAs[self].each{|k,v| Reg.TLA_aliases k,v,self}       }
       
 
   end

data/regdeferred.rb

@@ -50,7 +50,7 @@ module Reg
       othermod.instance_eval {
         instance_methods.each { |m| 
           alias_method "##{m}", m #archive m
-          undef_method m unless m =~ /^__/ || m=='instance_eval'
+          undef_method m unless m =~ /^__/ || m=='instance_eval' || m==:instance_eval
         }
         extend BlankSlate::ClassMethods      
       }
@@ -131,4 +131,4 @@ module Reg
 
 
 
-end
+end

data/regitem_that.rb

@@ -1,6 +1,6 @@
 =begin copyright
     reg - the ruby extended grammar
-    Copyright (C) 2005  Caleb Clausen
+    Copyright (C) 2005,2009  Caleb Clausen
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -51,7 +51,7 @@ module Reg
     def eeee(val)
       @klass and @klass===val || return
       begin call(val)
-      rescue: false
+      rescue; false
       end
     end
     alias === eeee #does nothing in includers.... why?
@@ -67,7 +67,7 @@ module Reg
   #just an ancestor for ItemThat and RegThat
     def eee(item)
       begin formula_value item
-      rescue: false
+      rescue; false
       end
     end
     alias === eee #this doesn't work!!! WHY????
@@ -143,4 +143,4 @@ module Reg
     
   end
 
-end
+end

data/reglookab.rb

@@ -31,13 +31,15 @@ module Reg
     end
     
     def mmatch(pr)
-      @reg.mmatch(pr.subprogress pr.cursor.position,@reg)
+      @reg.mmatch(pr.subprogress( pr.cursor.position,@reg ))
     end
     
     def itemrange; 0..0 end
     
-    #most methods should be forwarded to @reg... tbd
+    def subregs; [@reg] end
   
+    #most methods should be forwarded to @reg... tbd
+
   end
   
   
@@ -88,7 +90,9 @@ module Reg
       #the subsequence and all but it's middle element.
     end
 
+    def subregs; [@reg] end
+
     #most methods should be forwarded to @reg... tbd
   end
 
-end
+end

data/regold.rb

@@ -1,6 +1,6 @@
 =begin copyright
     reg - the ruby extended grammar
-    Copyright (C) 2005  Caleb Clausen
+    Copyright (C) 2005,2009  Caleb Clausen
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -35,7 +35,7 @@ for name in ["And", "Array","Equals", "Fixed", "Hash", "Literal",
                    end
                  end
                endeval
-              else
+             else
                eval <<-endeval
                  module ::Reg#{name}; include Reg::#{name}
                    def self.included(*args,&block)
@@ -45,7 +45,7 @@ for name in ["And", "Array","Equals", "Fixed", "Hash", "Literal",
                  end
                endeval
                 
-              end
+             end
              
 #  Object.const_set "Reg"+name, (Reg.const_get name)
 end

data/regprogress.rb

@@ -1,6 +1,6 @@
 =begin copyright
     reg - the ruby extended grammar
-    Copyright (C) 2005  Caleb Clausen
+    Copyright (C) 2005,2009  Caleb Clausen
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -18,11 +18,11 @@
 =end
 begin
   require 'rubygems'
-rescue #do nothing
+rescue LoadError #do nothing
 end
 
-require 'cursor'
-require 'cursor/indexed'
+require 'sequence'
+require 'sequence/indexed'
 
 
 =begin the internal api
@@ -128,7 +128,7 @@ module Reg
       #matchset_stack should be 1 smaller than matchfail_todo
       assert @matchfail_todo.size-1==@matchset_stack.size
 
-      @cursor.skip inc  #do nothing if no param given
+      @cursor.move inc  #do nothing if no param given
       @position_stack.push @cursor.pos  #push the start position of the next match
       @matchfail_todo.last.position_inc+=1
       @regsidx+=1
@@ -197,7 +197,7 @@ module Reg
       result.matchfail_todo=[MatchFailRec.new]
       result.cursor=
         if cursor
-          unless Cursor===cursor
+          unless Sequence===cursor
             huh #convert other data to a cursor...
           end
           cursor
@@ -337,13 +337,13 @@ module Reg
       assert @cursor.pos <= @cursor.size
       assert origpos >= 0
       assert posinc >= 0
-      assert( (0..match_steps)===@regsidx)
+      assert( (0...match_steps)===@regsidx)
       assert Integer===@position_stack.first
       assert check_result
       loop do #loop over regs to match
         assert @cursor.pos <= @cursor.size
         assert posinc >= 0
-        assert( (0..match_steps)===@regsidx)
+        assert( (0...match_steps)===@regsidx)
 
         if trace_enabled?
           puts [@matcher, clean_result].map{|i|  i.inspect  }.join(' ')
@@ -371,7 +371,7 @@ module Reg
                 m=nil
               end
         else
-          if r===(item=@cursor.read1after)
+          if r===(item=@cursor.readahead1)
             mat=RR[item]
             matchlen=1
           end
@@ -405,7 +405,7 @@ module Reg
 
         assert check_result
         return to_result,posinc,@regsidx if @regsidx>=match_steps
-        assert( (0..match_steps)===@regsidx)
+        assert( (0...match_steps)===@regsidx)
 
       end #loop
 
@@ -449,7 +449,7 @@ module Reg
 
       assert diinc
       assert @cursor.pos+diinc <= @cursor.size
-      @cursor.skip diinc
+      @cursor.move diinc
       #@regsidx-=matchfail_todo.position_inc #should be done in push_match...
       @matchfail_todo.push MatchFailRec.new
       push_match
@@ -484,7 +484,7 @@ module Reg
   
   
       #verify correct types in @-variables
-      assert Cursor===@cursor
+      assert Sequence===@cursor
       assert @matcher.respond_to?( :update_di)
       assert @regsidx >=0
       @matchset_stack.each{|ms| assert MatchSet===ms  }
@@ -496,10 +496,10 @@ module Reg
       @undos_stack.each {|i|
         case i
         #every element of @variables should also be a sym in @undos_stack
-          when Symbol: 
+          when Symbol 
             vars_copy.delete(i) or assert(false)
             
-          when Later:
+          when Later
           else assert(false)
         end
       }
@@ -526,8 +526,8 @@ module Reg
     def succ_stack_ok(stk=@matchsucceed_stack)
       stk.each{|elem|
         case elem
-          when Array: succ_stack_ok(elem)
-          when Later: true
+          when Array; succ_stack_ok(elem)
+          when Later; true
           else
         end or return
       }
@@ -548,9 +548,7 @@ module Reg
           ms.clean_result
 
         else
-          @cursor.position{ #retain current pos while Cursor#[]
-            @cursor[@position_stack[i], @position_stack[i+1]-@position_stack[i]] 
-          }
+          @cursor[@position_stack[i], @position_stack[i+1]-@position_stack[i]] 
         end
       }
     
@@ -617,7 +615,7 @@ if defined? $MMATCH_PROGRESS  #ultimately, mmatch will take a progress, but unti
       result,di,bogus=pr.bt_match
       result and SubseqMatchSet.new(pr,di)
     end
-   end
+  end
 
   #---------------------------------------------
   class Repeat
@@ -627,7 +625,7 @@ if defined? $MMATCH_PROGRESS  #ultimately, mmatch will take a progress, but unti
       start=cu.pos
       start+@times.begin <= cu.size or return nil  #enough room left in input?
       i=-1
-      (0...@times.end).each do |i|
+      (0...@times.end).each do |i2| i=i2
         start+i<cu.size or break(i-=1)
         @reg===cu.read1 or break(i-=1)
       end
@@ -755,14 +753,14 @@ else #... not $MMATCH_PROGRESS
     def mmatch_multiple(arr,start)
       #in this version, at least one of @regs is a multiple reg
       assert( (0..arr.size).include?( start))
-      cu=Cursor::Indexed.new(arr); cu.pos=start
+      cu=Sequence::Indexed.new(arr); cu.pos=start
       pr=Progress.new(self,cu)
       result,di,bogus=pr.bt_match
       result and SubseqMatchSet.new(pr,di)
     end
   end
   
-  class ::Cursor
+  class ::Sequence
     class Indexed
       def data?; @data end
     end
@@ -771,7 +769,7 @@ else #... not $MMATCH_PROGRESS
   class Repeat
     def mmatch(arr,start)
       i=-1
-      (0...@times.end).each do |i|
+      (0...@times.end).each do |i2| i=i2
         start+i<arr.size or break(i-=1)
         @reg===arr[start+i] or break(i-=1)
       end
@@ -788,7 +786,7 @@ else #... not $MMATCH_PROGRESS
       assert start <= arr.size
       r=[RR[]]
 
-      cu=Cursor::Indexed.new(arr); cu.pos=start
+      cu=Sequence::Indexed.new(arr); cu.pos=start
       pr=Progress.new(self,cu)
 
       #first match the minimum number
@@ -1044,7 +1042,8 @@ end # $MMATCH_PROGRESS
   class Array
     def ===(other)
       ::Array===other or return false #need to be more generous eventually
-      progress=Progress.new(self,(Cursor::Indexed.new other))
+      @regs.empty? and return other.empty?
+      progress=Progress.new(self,(Sequence::Indexed.new other))
       result,di,bogus=progress.bt_match
       assert di.nil? || di <= other.size
       return(di==other.size && result)
@@ -1053,15 +1052,3 @@ end # $MMATCH_PROGRESS
 
 end
 
-#if false  #work-around warnings in cursor
-propNiller=proc do 
-    old_init=instance_method:initialize
-    
-    define_method:initialize do|*args|
-      @positions||=@prop||=nil    
-      old_init.bind(self)[*args]
-    end
-end
-Cursor::Indexed.instance_eval( &propNiller)
-Cursor::Position.instance_eval( &propNiller)
-#end

data/regsugar.rb

@@ -1,6 +1,6 @@
 =begin copyright
     reg - the ruby extended grammar
-    Copyright (C) 2005  Caleb Clausen
+    Copyright (C) 2005,2009  Caleb Clausen
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -134,7 +134,7 @@ module ::Reg
     end
     
     
-    module Kernel
+    module ::Kernel
       forward_to ::Reg,   :item_that, :item_is, :regproc  #last need a better name
     end
 
@@ -180,10 +180,10 @@ module ::Reg
       
       def alphabetic_name(meth)
         @@oplookup[meth] or case meth
-          when /\?$/: :"op_#{meth[0...-1]}_p"
-          when /!$/: :"op_#{meth[0...-1]}_bang"
-          when /=$/: :"op_#{meth[0...-1]}_setter"
-          when /^op_/: :"op_#{meth}"
+          when /\?$/; :"op_#{meth[0...-1]}_p"
+          when /!$/; :"op_#{meth[0...-1]}_bang"
+          when /=$/; :"op_#{meth[0...-1]}_setter"
+          when /^op_/; :"op_#{meth}"
           else meth
         end
       end

data/regtest.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby -w 
 =begin copyright
     reg - the ruby extended grammar
-    Copyright (C) 2005  Caleb Clausen
+    Copyright (C) 2005,2009  Caleb Clausen
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -30,7 +30,7 @@ require 'getoptlong'
 
 #require 'test/unit'  #gets in the way of my debug output
 class TC_Reg #< Test::Unit::TestCase
-  class <<self
+class <<self
 
 
   def randsym
@@ -105,13 +105,13 @@ class TC_Reg #< Test::Unit::TestCase
     product=1
     nestlevel.times { 
       op=case rand(3)
-           when 0: :*
-           when 1: :+
-           when 2: :-
+           when 0; :*
+           when 1; :+
+           when 2; :-
          end
       num=rand(6)+1
       product*=num
-      pat=["(",pat,")",op,num].to_s 
+      pat=["(",pat,")",op,num].join 
       product>50 and break
     }
     
@@ -133,11 +133,11 @@ eat_unworking=<<'#end unworking'
 
 
 
-$RegTraceEnable=1 #debugging zone:
      h={}
      h.default=:b
      test_hash_matcher Rah(:a=>:b), :matches=>h 
 
+$RegTraceEnable=1 #debugging zone:
 $RegTraceEnable=false#end debug zone
 
      assert_eee Reg[OB*2*(1..2)*2, OB*2], [:foo]*6
@@ -184,8 +184,11 @@ $RegTraceEnable=false#end debug zone
 
      assert_eee(  +[], []  )
      assert_ene(  +[], [:q]  )
+     assert_ene(  +[], [nil]  )
      assert_eee(  +[:q], [:q]  )
      assert_eee(  +[-[]], []  )
+     assert_ene(  +[-[]], [:q]  )
+     assert_ene(  +[-[]], [nil]  )
      assert_eee(  +[-[:q]], [:q]  )
      assert_eee(  +[-[:q]*1], [:q]  )
      assert_eee(  +[-[:q, :q]*1], [:q,:q]  )

metadata

@@ -1,33 +1,35 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
-specification_version: 1
 name: reg
 version: !ruby/object:Gem::Version 
-  version: 0.4.7
-date: 2006-10-30 00:00:00 -08:00
-summary: The reg pattern matching/replacement language
-require_paths: 
-- .
-email: 
-homepage: 
-rubyforge_project: reg
-description: 
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: false
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.4.8
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Caleb Clausen
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2010-01-03 00:00:00 -08:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: sequence
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.2.3
+    version: 
+description: 
+email: caleb @at@ inforadical.net
+executables: []
+
+extensions: []
+
+extra_rdoc_files: []
+
 files: 
 - item_thattest.rb
 - regbackref.rb
@@ -63,25 +65,31 @@ files:
 - regarrayold.rb
 - regitem_that.rb
 - regsugar.rb
-test_files: []
-
+has_rdoc: false
+homepage: http://github.com/coatl/reg
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: []
-
-executables: []
-
-extensions: []
-
+require_paths: 
+- .
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: 
 - none
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: cursor
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0.9"
-    version: 
+rubyforge_project: reg
+rubygems_version: 1.3.1
+signing_key: 
+specification_version: 2
+summary: The reg pattern matching/replacement language
+test_files: []
+