rbx-trepanning 0.0.6-universal-rubinius-1.2 → 0.0.7-universal-rubinius-1.2

data/.gitignore

@@ -0,0 +1,5 @@
+/*.rbc
+/*~
+/irc-discuss
+/pkg
+/tmp

data/ChangeLog

@@ -1,3 +1,164 @@
+2011-02-22  rocky <rockyb@rubyforge.org>
+
+	* app/breakpoint.rb, app/brkptmgr.rb, lib/trepanning.rb,
+	processor/breakpoint.rb, processor/main.rb, processor/stepping.rb,
+	test/unit/cmd-helper.rb, test/unit/test-app-brkpt.rb,
+	test/unit/test-cmd-finish.rb: Add finalization routine to remove
+	stepping and other breakpoints. Fixes the "no debugger" messages on
+	rake test.
+
+2011-02-22  rocky <rockyb@rubyforge.org>
+
+	* test/functional/test-finish.rb:  Adjust test check line number. In latest rubinius release line
+	 numbers for assignment statement are better, use LHS.
+
+2011-02-22  rocky <rockyb@rubyforge.org>
+
+	* app/breakpoint.rb, app/condition.rb, lib/trepanning.rb,
+	processor/command/condition.rb,
+	processor/command/info_subcmd/breakpoints.rb,
+	processor/location.rb, processor/validate.rb,
+	test/unit/test-app-condition.rb: Add breakpoint conditions. Not
+	showing # of hits right now though.
+
+2011-02-21  rocky <rockyb@rubyforge.org>
+
+	* processor/command/source.rb: Add first use of filename completion
+	on "source" command
+
+2011-02-20  rocky <rockyb@rubyforge.org>
+
+	* processor/command/backtrace.rb, processor/command/down.rb,
+	processor/command/up.rb: Sync with rb-trepanning
+
+2011-02-20  rocky <rockyb@rubyforge.org>
+
+	* processor/command/frame.rb, processor/command/up.rb,
+	processor/frame.rb: Improve range checking on frame, up and down
+	commands.
+
+2011-02-20  rocky <rockyb@rubyforge.org>
+
+	* io/input.rb: Try two kinds of Readline includes. Possibly I got it
+	right this time
+
+2011-02-19  rocky <rockyb@rubyforge.org>
+
+	Merge branch 'master' of github.com:rocky/rbx-trepanning
+
+2011-02-19  rocky <rockyb@rubyforge.org>
+
+	* processor/command/exit.rb, processor/command/kill.rb,
+	processor/command/show_subcmd/alias.rb: Add kill! alias and update
+	help
+
+2011-02-19  rocky <rockyb@rubyforge.org>
+
+	Merge branch 'master' of github.com:rocky/rbx-trepanning
+
+2011-02-19  rocky <rockyb@rubyforge.org>
+
+	* app/eventbuffer.rb, processor/command/base/subcmd.rb,
+	processor/command/info_subcmd/files.rb,
+	processor/command/info_subcmd/line.rb,
+	processor/command/info_subcmd/ruby.rb,
+	processor/command/set_subcmd/trace_subcmd/print.rb,
+	processor/command/show_subcmd/alias.rb,
+	processor/command/show_subcmd/auto_subcmd/irb.rb,
+	processor/command/show_subcmd/macro.rb,
+	processor/command/show_subcmd/trace_subcmd/print.rb,
+	processor/eventbuf.rb, processor/hook.rb, processor/main.rb: 
+	Basically same as what in HEAD
+
+2011-02-19  rocky <rockyb@rubyforge.org>
+
+	* app/eventbuffer.rb, processor/command/base/subcmd.rb,
+	processor/command/info_subcmd/files.rb,
+	processor/command/info_subcmd/line.rb,
+	processor/command/info_subcmd/ruby.rb,
+	processor/command/set_subcmd/trace_subcmd/buffer.rb,
+	processor/command/set_subcmd/trace_subcmd/print.rb,
+	processor/command/show_subcmd/alias.rb,
+	processor/command/show_subcmd/auto_subcmd/irb.rb,
+	processor/command/show_subcmd/macro.rb,
+	processor/command/show_subcmd/trace_subcmd/buffer.rb,
+	processor/command/show_subcmd/trace_subcmd/print.rb,
+	processor/eventbuf.rb, processor/hook.rb, processor/main.rb: Add
+	rudimentary event buffer save/print. Not fully functional. CMD
+	constant now saved automatically in subcommands. DRY some code.
+
+2011-02-19  rocky <rockyb@rubyforge.org>
+
+	* Rakefile, processor/command/backtrace.rb,
+	processor/command/frame.rb, processor/command/up.rb,
+	processor/frame.rb: Add frame number completion. Why not?
+
+2011-02-19  rocky <rockyb@rubyforge.org>
+
+	* processor/command/show_subcmd/alias.rb: Add completion for "show
+	aliases"
+
+2011-02-18  rocky <rockyb@rubyforge.org>
+
+	* processor/command/show_subcmd/macro.rb, processor/msg.rb: show
+	macro improvements: add "show macro *" and long help. Sync with
+	rb-trepanning.
+
+2011-02-18  rocky <rockyb@rubyforge.org>
+
+	* processor/command/eval.rb, processor/command/macro.rb,
+	processor/command/show_subcmd/macro.rb, processor/location.rb,
+	processor/main.rb, processor/msg.rb: Add eval? alias ev? to evaluate
+	current source line without leading "if", "while" "elsif" Add show
+	macro to see macros. Syntax highight that if desired.
+
+2011-02-18  rocky <rockyb@rubyforge.org>
+
+	* app/complete.rb, app/frame.rb, lib/trepanning.rb,
+	processor/command/base/subsubcmd.rb,
+	processor/command/base/subsubmgr.rb, processor/command/complete.rb,
+	processor/command/macro.rb,
+	processor/command/set_subcmd/different.rb, processor/load_cmds.rb,
+	processor/main.rb, test/unit/test-completion.rb,
+	test/unit/test-proc-load_cmds.rb: Sync with rb-trepanning. Had
+	broken completion in code refactor.
+
+2011-02-18  rocky <rockyb@rubyforge.org>
+
+	* test/unit/test-app-complete.rb: Redo completion somewhat to be
+	more general and much input line when there are abreviations less.
+
+2011-02-16  rocky <rockyb@rubyforge.org>
+
+	* app/run.rb, interface/user.rb: Sync with rb-trepanning
+
+2011-02-16  rocky <rockyb@rubyforge.org>
+
+	* app/default.rb, app/run.rb, interface/user.rb, io/input.rb,
+	processor/load_cmds.rb, test/unit/test-app-options.rb,
+	test/unit/test-completion.rb: Completion was totally borked and so
+	was handling of Readline. Fix. Fix completion of aliases and test
+	for that now.
+
+2011-02-16  rocky <rockyb@rubyforge.org>
+
+	* .gemspec, Rakefile, app/options.rb, rbx-trepanning.gemspec: Work
+	on packaging yet again. Steal from kpat's for good ideas.
+	options.rb: Correct usage one more time. In 0.0.7.dev now
+
+2011-02-15  rocky <rockyb@rubyforge.org>
+
+	* .gemspec: Repackage using rubinius 1.2 rather than 1.2.1
+
+2011-02-15  rocky <rockyb@rubyforge.org>
+
+	* .gemspec, NEWS, app/options.rb: Repackage using rubinius 1.2
+	rather than 1.2.1
+
+2011-02-15  rocky <rockyb@rubyforge.org>
+
+	* ChangeLog: Update ChangeLog for release
+
 2011-02-15  rocky <rockyb@rubyforge.org>
 
 	* .gemspec, Rakefile, app/options.rb: Get ready for 0.0.5 release

data/Makefile

@@ -0,0 +1,13 @@
+# I'll admit it -- I'm an absent-minded old-timer who has trouble
+# learning new tricks.
+.PHONY: all test
+
+all: test
+
+check: 
+	rake test
+test: 
+	rake test
+
+%: 
+	rake $@

data/NEWS

@@ -1,3 +1,14 @@
+Feb 22, 2011  (0.0.7)
+- Add gdb "condition" command
+- More complete command completion
+- Add kill! alias to force without prompting
+- Add eval (no args) and eval? to run current source line or source line
+  expression
+- Add "set/show trace buffer on/off" to keep a history of recent places
+  we've stopped in the debugger
+- Add "show macro *" to list all macro names.
+- A number of bug fixes
+
 Feb 15, 2011  (0.0.6)
 - Repackage using rubinus platform 1.2 rather than 1.2.1
 

data/Rakefile

@@ -1,9 +1,9 @@
 #!/usr/bin/env rake
 # Are we Rubinius? We'll test by checking the specific function we need.
-raise RuntimeError, 'This package is for Rubinius 1.2 or 1.2.1dev only!' unless
+raise RuntimeError, 'This package is for Rubinius 1.2.x only!' unless
   Object.constants.include?('Rubinius') && 
   Rubinius.constants.include?('VM') && 
-  %w(1.2.1 1.2.2dev).member?(Rubinius::VERSION)
+  Rubinius::VERSION =~ /1\.2.+/
 
 require 'rubygems'
 require 'rake/gempackagetask'
@@ -11,19 +11,20 @@ require 'rake/rdoctask'
 require 'rake/testtask'
 
 ROOT_DIR = File.dirname(__FILE__)
+Gemspec_filename = 'rbx-trepanning.gemspec'
 require File.join %W(#{ROOT_DIR} app options)
 
 def gemspec
-  @gemspec ||= eval(File.read('.gemspec'), binding, '.gemspec')
+  @gemspec ||= eval(File.read(Gemspec_filename), binding, Gemspec_filename)
 end
 
 desc "Build the gem"
 task :package=>:gem
 task :gem=>:gemspec do
   Dir.chdir(ROOT_DIR) do
-    sh "gem build .gemspec"
+    sh "gem build #{Gemspec_filename}"
     FileUtils.mkdir_p 'pkg'
-    FileUtils.mv("#{gemspec.file_name}", "pkg/#{gemspec.file_name}")
+    FileUtils.mv("#{gemspec.file_name}", "pkg/")
   end
 end
 

data/app/.gitignore

@@ -0,0 +1,2 @@
+/*.rbc
+/*~

data/app/breakpoint.rb

@@ -1,33 +1,30 @@
-# Copyright (C) 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# -*- coding: utf-8 -*-
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+
+# Breakpoint objects
 class Trepan
   class Breakpoint
-
     attr_accessor :condition # If non-nil, this is a String to be eval'd
                              # which must be true to enter the debugger
     attr_reader   :event     # Symbol. Optional type of event associated with
                              # breakpoint.
-    attr_accessor :hits      # Fixnum. The number of timea a breakpoint
+    attr_accessor :hits      # Fixnum. The number of times a breakpoint
                              # has been hit (with a true condition). Do
                              # we want to (also) record hits independent
                              # of the condition?
     attr_reader   :id        # Fixnum. Name of breakpoint
-
+    attr_reader   :ignore    # Fixnum. How many more times do we have
+                             # to encounter the breakpoint before we stop?
     @@next_id = 1
 
     BRKPT_DEFAULT_SETTINGS = {
       :condition => 'true',
       :enabled   => 'true',
+      :ignore    =>  0,
       :temp      =>  false,
       :event     =>  :Unknown,
     } unless defined?(BRKPT_DEFAULT_SETTINGS)
 
-    def self.for_ip(exec, ip, opts={})
-      name = opts[:name] || :anon
-      line = exec.line_from_ip(ip)
-
-      Breakpoint.new(name, exec, ip, line, nil, opts)
-    end
-
     def initialize(name, method, ip, line, id=nil, opts = {})
       @descriptor = name
       @id = id
@@ -47,12 +44,13 @@ class Trepan
       end
 
       @hits = 0
+
       # unless @id
       #   @id = @@next_id 
       #   @@next_id += 1
       # end
 
-      @set = false
+      @activated = false
     end
 
     attr_reader :method, :ip, :line, :descriptor
@@ -79,16 +77,27 @@ class Trepan
     end
 
     def activate
-      @set = true
+      @activated = true
       @method.set_breakpoint @ip, self
     end
 
-    # Return true if the breakpoint is relevant. That is, the
-    # breakpoint is either not a scoped or it is scoped and test_scope
-    # matches the desired scope. We also remove the breakpoint and any
-    # related breakpoints if it was hit and temporary.
+    def active?
+      @activated
+    end
+
+    # FIXME: give this a better name.
+    # Return true if the breakpoint is a temporary breakpoint and is
+    # relevant. By releveant we mean that, the breakpoint is either
+    # not a scoped breakpoint or it is scoped and test_scope matches
+    # the desired scope. We also remove the breakpoint and any related
+    # breakpoints if it was hit and temporary.  
+    # 
+    # If the breakpoint is not a temporary breakpoint, return nil.
+    # 
+    # See also "condition' below which is run to determine whether or 
+    # not to stop. 
     def hit!(test_scope)
-      return true unless @temp
+      return nil unless @temp
       return false if @scope && test_scope != @scope
 
       @related_bp.each { |bp| bp.remove! }
@@ -96,26 +105,26 @@ class Trepan
       return true
     end
 
-    # def condition?(bind)
-    #   if eval(@condition, bind)
-    #     if @ignore > 0
-    #       @ignore -= 1
-    #       return false
-    #     else
-    #       @hits += 1
-    #       return true
-    #     end
-    #   else
-    #     return false
-    #   end
-    # end
+    def condition?(bind)
+      if eval(@condition, bind)
+        if @ignore > 0
+          @ignore -= 1
+          return false
+        else
+          @hits += 1
+          return true
+        end
+      else
+        return false
+      end
+    end
 
     def delete!
       remove!
     end
 
     def describe
-      "#{descriptor} - #{location}"
+      "#{@descriptor} - #{location}"
     end
 
     def disable
@@ -147,9 +156,8 @@ class Trepan
     end
 
     def remove!
-      return unless @set
-
-      @set = false
+      return unless @activated
+      @activated = false
       @method.clear_breakpoint(@ip)
     end
 
@@ -157,6 +165,13 @@ class Trepan
       @temp
     end
 
+    def self.for_ip(exec, ip, opts={})
+      name = opts[:name] || :anon
+      line = exec.line_from_ip(ip)
+
+      Breakpoint.new(name, exec, ip, line, nil, opts)
+    end
+
   end
 
   class DeferredBreakpoint
@@ -212,8 +227,10 @@ end
 
 if __FILE__ == $0
   method = Rubinius::CompiledMethod.of_sender
-  bp = Trepan::Breakpoint.new '<start>', method, 1, 2, 0
+  bp = Trepan::Breakpoint.new '<start>', method, 0, 2, 0
   %w(describe location icon_char hits temp? enabled? condition).each do |field|
     puts "#{field}: #{bp.send(field.to_sym)}"
   end
+  bp.activate
+  bp.remove!
 end

data/app/brkptmgr.rb

@@ -13,6 +13,14 @@ class Trepan
       @set = Set.new
     end
 
+    # Remove all breakpoints that we have recorded
+    def finalize
+      @list.each do |bp|
+        bp.related_bp.each { |bp| bp.remove! }
+        bp.remove!
+      end
+    end
+
     def <<(brkpt)
       @list << brkpt
       @set.add(set_key(brkpt))
@@ -111,6 +119,7 @@ if __FILE__ == $0
   meth = Rubinius::CompiledMethod.of_sender
 
   brkpts = Trepan::BreakpointMgr.new
+  ObjectSpace.define_finalizer(brkpts, Proc.new {|arg| brkpts.finalize })
   brkpts.add("<start>", meth, 0, 0, 1)
   p brkpts[2]
   bp_status(brkpts, 1)
@@ -137,4 +146,5 @@ if __FILE__ == $0
   bp_status(brkpts, 6)
   brkpts.delete_by_brkpt(b3)
   bp_status(brkpts, 7)
+  brkpts.finalize
 end

data/app/complete.rb

@@ -1,5 +1,8 @@
 # Copyright (C) 2011 Rocky Bernstein <rockyb@rubyforge.net>
+
 class Trepan
+
+  # Command completion methods
   module Complete
 
     module_function
@@ -10,10 +13,11 @@ class Trepan
       complete_ary.select { |cmd| cmd.to_s.start_with?(prefix) }.sort
     end
     
-    def complete_token_with_next(complete_hash, prefix)
+    def complete_token_with_next(complete_hash, prefix, cmd_prefix='')
       result = []
       complete_hash.each do |cmd_name, cmd_obj| 
-        result << [cmd_name, cmd_obj] if cmd_name.to_s.start_with?(prefix)
+        result << [cmd_name.to_s[cmd_prefix.size..-1], cmd_obj] if 
+          cmd_name.to_s.start_with?(cmd_prefix + prefix)
       end
       result.sort{|a, b| a[0] <=> b[0]}
     end
@@ -41,6 +45,23 @@ class Trepan
       end
       result
     end
+
+    # Find the next token in str string from start_pos, we return
+    # the token and the next blank position after the token or 
+    # str.size if this is the last token. Tokens are delimited by
+    # white space.
+    def next_token(str, start_pos)
+      look_at = str[start_pos..-1]
+      next_nonblank_pos = start_pos + (look_at =~ /\S/ || 0)
+      next_blank_pos = 
+        if next_match = str[next_nonblank_pos..-1] =~ /\s/
+          next_nonblank_pos + next_match 
+        else
+          str.size
+        end
+      return [next_blank_pos, str[next_nonblank_pos...next_blank_pos]]
+    end
+    
   end
 end
 
@@ -49,4 +70,10 @@ if __FILE__ == $0
   hash = {'ab' => 1, 'aac' => 2, 'aa' => 3, 'b' => 4}
   p complete_token(hash.keys, 'a')
   p complete_token_with_next(hash, 'a')
+  ##   0         1
+  ##   0123456789012345678
+  x = '  now is  the  time'
+  [0, 2, 5, 8, 9, 13, 19].each do |pos|
+    p next_token(x, pos)
+  end
 end

data/app/condition.rb

@@ -0,0 +1,22 @@
+# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
+class Trepan
+  module Condition
+    def valid_condition?(str)
+      begin
+        Rubinius::Compiler.compile_string(str)
+      rescue SyntaxError
+        return nil
+      rescue
+        nil
+      end
+    end
+    module_function :valid_condition?
+  end
+end
+if __FILE__ == $0
+  include Trepan::Condition
+  p valid_condition?('a+2')
+  puts '-' * 20
+  p valid_condition?('1+')
+  puts '-' * 20
+end

data/app/default.rb

@@ -39,6 +39,7 @@ class Trepan
     :port     => DEFAULT_SETTINGS[:port],
     :host     => DEFAULT_SETTINGS[:host], 
     :server   => false, # Out-of-process debugging?
+    :readline => true,  # Try to use GNU Readline?
     # Note that at most one of :server or :client can be true.
   } unless defined?(DEFAULT_CMDLINE_SETTINGS)
 

data/app/eventbuffer.rb

@@ -0,0 +1,147 @@
+#   Copyright (C) 2011 Rocky Bernstein <rockyb@rubyforge.net>
+module Trace
+
+  class EventBuffer
+    EventStruct = Struct.new(:event, :arg, :frame) unless defined?(EventStruct)
+    attr_reader   :buf
+    attr_accessor :marks    # User position mark into buffer. If buffer is limited,
+    attr_reader   :maxsize  # Maximum size of buffer or nil if unlimited.
+    attr_reader   :size     # size of buffer 
+    # then marks will drop out as they disappear from the buffer
+    def initialize(maxsize=nil)
+      @maxsize = maxsize
+      reset
+    end
+    
+    def reset
+      @buf   = []
+      @marks = []
+      @pos   = -1
+      @size  = 0 
+    end
+    
+    # Add a new event dropping off old events if that was declared
+    # marks are also dropped if buffer has a limit.
+    def append(event, frame, arg)
+      item = EventStruct.new(event, arg, frame)
+      @pos = self.succ_pos
+      @marks.shift if @marks[0] == @pos
+      @buf[@pos] = item
+      @size     += 1 unless @maxsize && @size == @maxsize
+    end
+
+    # Add mark for the current event buffer position.
+    def add_mark
+      @marks << @pos
+    end
+
+    # Like add mark, but do only if the last marked position has
+    # changed
+    def add_mark_nodup
+      @marks << @pos unless @marks[-1] == @pos
+    end
+    
+    def each(from=nil, to=nil)
+      from = self.succ_pos unless from
+      to   = @pos unless to
+      if from <= to
+        from.upto(to).each do |pos|
+          yield @buf[pos]
+        end
+      else
+        from.upto(@size-1).each do |pos|
+          yield @buf[pos]
+        end
+        0.upto(@pos).each do |pos|
+          yield @buf[pos]
+        end
+      end
+    end
+    
+    def each_with_index(from=nil, to=nil)
+      from = succ_pos unless from
+      to   = @pos     unless to
+      if from <= to
+        from.upto(to).each do |pos|
+          yield [@buf[pos], pos]
+        end
+      else
+        from.upto(@size-1).each do |pos|
+          yield [@buf[pos], pos]
+        end
+        0.upto(@pos).each do |pos|
+          yield [@buf[pos], pos]
+        end
+      end
+    end
+    
+    def format_entry(item, long_format=true)
+      # require 'rbdbgr'; Debugger.debug
+      mess = "#{item.event} #{item.frame}"
+      # if long_format && item.iseq
+      #   mess += "\n\t" + "VM offset #{item.pc_offset} of #{item.iseq.name}"
+      # end
+      mess
+    end
+
+    # Return the next event buffer position taking into account
+    # that we may have a fixed-sized buffer ring.
+    def succ_pos(inc=1)
+      pos = @pos + inc 
+      @maxsize ? pos % @maxsize : pos 
+    end
+    
+    # Return the next event buffer position taking into account
+    # that we may have a fixed-sized buffer ring.
+    def pred_pos(dec=1)
+      pos = @pos - dec
+      @maxsize ? pos % @maxsize : pos 
+    end
+    
+    # Return the adjusted zeroth position in @buf.
+    def zero_pos
+      if !@maxsize || @buf.size < @maxsize
+        0
+      else 
+        self.succ_pos
+      end
+    end
+    
+  end # EventBuffer
+end # Trace 
+
+if __FILE__ == $0
+  def event_processor(event, frame, arg=nil)
+    begin 
+      @eventbuf.append(event, frame, arg)
+    rescue
+      p $!
+    end
+  end
+  def dump_all
+    puts '-' * 40
+    @eventbuf.each do |e| 
+      puts @eventbuf.format_entry(e) if e
+    end
+  end
+
+  require 'rubygems'; require 'set_trace'
+  @eventbuf = Trace::EventBuffer.new(5)
+  p @eventbuf.zero_pos
+  dump_all
+
+  # trace_filter = Trace::Filter.new
+  # trace_func   = method(:event_processor).to_proc
+  # trace_filter << trace_func
+  # trace_filter.set_trace_func(trace_func)
+  # z=5
+  # z.times do |i|
+  #   x = i
+  #   y = x+2
+  # end
+  # trace_filter.set_trace_func(nil)
+  # p @eventbuf.buf[@eventbuf.zero_pos]
+  # dump_all
+  @eventbuf.reset
+  dump_all
+end

data/app/frame.rb

@@ -1,5 +1,7 @@
-# Frame code from reference debugger.
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 class Trepan
+
+  # Call-Stack frame methods
   class Frame
     def initialize(debugger, number, vm_location)
       @debugger = debugger