trepanning 0.0.4 → 0.0.6

data/processor/eval.rb

@@ -67,6 +67,9 @@ if __FILE__ == $0
   def cmdp.errmsg(msg)
     puts "** #{msg}"
   end
+  def cmdp.msg(msg)
+    puts "** #{msg}"
+  end
   begin 
     1/0
   rescue Exception => exc
@@ -74,12 +77,13 @@ if __FILE__ == $0
     puts '=' * 40
   end
 
-  x = 1
+  x = 10
   require 'thread_frame'
   cmdp.instance_variable_set('@frame', RubyVM::ThreadFrame.current)
   cmdp.instance_variable_set('@settings', {:stack_trace_on_error => true})
-  def cmdp.errmsg(mess) ; puts mess end
+  def cmdp.msg(mess) ; puts mess end
   puts cmdp.debug_eval('x = "#{x}"')
+  puts '=' * 40
   puts cmdp.debug_eval('x+')
   puts cmdp.debug_eval_no_errmsg('y+')
   puts '=' * 40

data/processor/frame.rb

@@ -6,31 +6,37 @@ class Trepan
   class CmdProcessor
 
     attr_reader   :current_thread
-    attr_accessor :frame           # ThreadFrame, current frame
-    attr_accessor :frame_index     # frame index in a "where" command
-    attr_accessor :hide_level      # 
-    attr_accessor :hidelevels      # Hash[thread_id] -> FixNum, the
-                                   # level of the last frame to
-                                   # show. If we called the debugger
-                                   # directly, then there is generally
-                                   # a portion of a backtrace we don't
-                                   # want to show. We don't need to
-                                   # store this for all threads, just
-                                   # those we want to hide frame on. A
-                                   # value of 1 means to hide just the
-                                   # oldest level. The default or
-                                   # showing all levels is 0.
-    attr_accessor :remap_container # Hash[container] -> file container
-                                   # Gives us a way to map non-file
-                                   # container objects to a file
-                                   # container for display.
-    attr_accessor :remap_iseq      # Hash[iseq] -> file container
-
-    attr_accessor :top_frame       # top frame of current thread. Since
-                                   # right now the ThreadFrame method has "prev" 
-                                   # but no way to move in the other direction.
-                                   # So we store the top frame. 
-    attr_reader   :threads2frames  # Hash[thread_id] -> top_frame
+
+    # ThreadFrame, current frame
+    attr_accessor :frame
+
+    # frame index in a "backtrace" command
+    attr_accessor :frame_index
+    attr_accessor :hide_level
+
+    # Hash[thread_id] -> FixNum, the level of the last frame to
+    # show. If we called the debugger directly, then there is
+    # generally a portion of a backtrace we don't want to show. We
+    # don't need to store this for all threads, just those we want to
+    # hide frame on. A value of 1 means to hide just the oldest
+    # level. The default or showing all levels is 0.
+    attr_accessor :hidelevels      
+
+    # Hash[container] -> file container. This gives us a way to map non-file
+    # container objects to a file container for display.
+    attr_accessor :remap_container
+
+    # Hash[iseq] -> file container. This gives as a way to map instruction
+    # sequences to a file container for display.
+    attr_accessor :remap_iseq      
+
+    # top frame of current thread. Since right now the ThreadFrame
+    # method has "prev" but no way to move in the other direction.  So
+    # we store the top frame.
+    attr_accessor :top_frame 
+
+    # Hash[thread_id] -> top_frame
+    attr_reader   :threads2frames
     
 
     def adjust_frame(frame_num, absolute_pos)
@@ -216,7 +222,7 @@ if __FILE__ == $0
 
   proc = Trepan::CmdProcessor.new(Trepan::MockCore.new())
   proc.frame_setup(RubyVM::ThreadFrame.current)
-  proc.hidelevels = {}
+  proc.frame_initialize
   puts "stack size: #{proc.top_frame.stack_size}"
   0.upto(proc.top_frame.stack_size) { |i| proc.adjust_frame(i, true) }
   puts '*' * 10

data/processor/main.rb

@@ -56,7 +56,7 @@ class Trepan
 
 
     unless defined?(EVENT2ICON)
-      # We use event icons in printing locations.
+      # Event icons used in printing locations.
       EVENT2ICON = {
         'brkpt'          => 'xx',
         'c-call'         => 'C>',

data/processor/mock.rb

@@ -37,7 +37,11 @@ module MockDebugger
   end
 
   # Common Mock debugger setup 
-  def setup(name, show_constants=true)
+  def setup(name=nil, show_constants=true)
+    unless name
+      tf = RubyVM::ThreadFrame.current.prev
+      name = File.basename(tf.source_container[1], '.rb')
+    end
     if ARGV.size > 0 && ARGV[0] == 'debug'
       require_relative '../lib/trepanning'
       dbgr = Trepan.new
@@ -71,11 +75,13 @@ module MockDebugger
   def show_special_class_constants(cmd)
     puts 'ALIASES: %s' % [cmd.class.const_get('ALIASES').inspect] if
       cmd.class.constants.member?(:ALIASES)
-    %w(CATEGORY HELP MIN_ARGS MAX_ARGS 
+    %w(CATEGORY MIN_ARGS MAX_ARGS 
        NAME NEED_STACK SHORT_HELP).each do |name|
       puts '%s: %s' % [name, cmd.class.const_get(name).inspect]
     end
-    puts '- - -'
+    puts '-' * 30
+    puts cmd.class.const_get('HELP')
+    puts '=' * 30
   end
   module_function :show_special_class_constants
 

data/processor/running.rb

@@ -28,8 +28,8 @@ class Trepan
       @leave_cmd_loop  = true  # Break out of the processor command loop.
     end
 
-    # Does whatever needs to be done to set to "next" program
-    # execution.
+    # Does whatever setup needs to be done to set to ignore stepping
+    # to the finish of the current method.
     def finish(level_count=0, opts={})
       step(0, opts)
       @next_level        = @frame.stack_size - level_count
@@ -40,8 +40,12 @@ class Trepan
       @frame.trace_off   = true  # No more tracing in this frame
       @frame.return_stop = true  # don't need to 
     end
-    # Does whatever needs to be done to set to "next" program
-    # execution.
+
+    # Does whatever needs to be done to set to do "step over" or ignore
+    # stepping into methods called from this stack but step into any in 
+    # the same level. We do this by keeping track of the number of
+    # stack frames and the current thread. Elsewhere in "skipping_step?"
+    # we do the checking.
     def next(step_count=1, opts={})
       step(step_count, opts)
       @next_level      = @top_frame.stack_size
@@ -124,9 +128,9 @@ class Trepan
 
       # If the last stop was a breakpoint, don't stop again if we are at
       # the same location with a line event.
-      skip_val |= (@last_pos[4] == 'brkpt' && 
-                   @event == 'line' &&
-                   @frame.pc_offset == @last_pos[5])
+      skip_val ||= (@last_pos[4] == 'brkpt' && 
+                    @event == 'line' &&
+                    @frame.pc_offset == @last_pos[5])
 
       if @settings[:'debugskip']
         puts "skip: #{skip_val.inspect}, last: #{@last_pos}, new: #{new_pos}" 

data/processor/validate.rb

@@ -154,8 +154,7 @@ class Trepan
     # Parse a breakpoint position. Return
     # - the position - a Fixnum
     # - the instruction sequence to use
-    # - whether the postion is an offset or a line number
-    # - the condition (by default 'true') to use for this breakpoint
+    # - whether the position is an offset or a line number
     # - the condition (by default 'true') to use for this breakpoint
     def breakpoint_position(args)
       first = args.shift

data/test/functional/test-fn_helper.rb

@@ -0,0 +1,42 @@
+#!/usr/bin/env ruby
+require 'test/unit'
+require_relative 'fn_helper'
+
+class TestFnTestHelper < Test::Unit::TestCase
+
+  include FnTestHelper
+
+  def test_basic
+    assert_equal(__LINE__, get_lineno, 'get_lineno()')
+    assert_equal(0,
+                 '-- (/tmp/trepan/tmp/gcd.rb:4)' =~ TREPAN_LOC)
+    assert_equal(0, '(trepan): exit' =~ TREPAN_PROMPT)
+
+    output='
+-- (/tmp/trepan/tmp/gcd.rb:4)
+(trepan): s
+-- (/tmp/trepan/tmp/gcd.rb:18)
+(trepan): s
+-- (/tmp/trepan/tmp/gcd.rb:19)
+(trepan): s
+.. (/tmp/trepan/tmp/gcd.rb:0)
+(trepan): s
+-> (/tmp/trepan/tmp/gcd.rb:4)
+'.split(/\n/)
+   expect='
+-- (/tmp/trepan/tmp/gcd.rb:4)
+-- (/tmp/trepan/tmp/gcd.rb:18)
+-- (/tmp/trepan/tmp/gcd.rb:19)
+.. (/tmp/trepan/tmp/gcd.rb:0)
+-> (/tmp/trepan/tmp/gcd.rb:4)
+'.split(/\n/)
+  assert_equal(expect, filter_line_cmd(output))
+  end
+  
+end
+
+
+
+
+
+

data/test/functional/test-raise.rb

@@ -13,7 +13,7 @@ class TestRaise < Test::Unit::TestCase
             'step',
             'step',
             'raise',
-            'print "hi"',
+            'pr "hi"',
             ]
     d = strarray_setup(cmds)
     d.start

data/test/functional/test-return.rb

@@ -18,7 +18,7 @@ class TestRaise < Test::Unit::TestCase
             'set return 10',
             'set events line',
             'step',
-            'print foo_retval',
+            'pr foo_retval',
             ]
     d = strarray_setup(cmds)
     d.start
@@ -65,7 +65,7 @@ class TestRaise < Test::Unit::TestCase
             'set return "abc"',
             'set events line',
             'step',
-            'print result',
+            'pr result',
             ]
     d = strarray_setup(cmds)
     d.start

data/test/unit/test-app-util.rb

@@ -7,11 +7,10 @@ class TestAppUtil < Test::Unit::TestCase
   def test_safe_repr
     string = 'The time has come to talk of many things.'
     assert_equal(string, safe_repr(string, 50))
-    assert_equal('The time has come...', safe_repr(string, 17))
-    assert_equal('The time has come', safe_repr(string, 17, ''))
-    assert_equal('"The time has co"...', safe_repr(string.inspect, 17))
+    assert_equal('The time...  things.', safe_repr(string, 17))
+    assert_equal('"The tim... things."', safe_repr(string.inspect, 17))
     string = "'The time has come to talk of many things.'"
-    assert_equal("'The time has co'...", safe_repr(string, 17))
+    assert_equal("'The tim... things.'", safe_repr(string, 17))
   end
 
 end

data/test/unit/test-base-subcmd.rb

@@ -12,6 +12,7 @@ end
 $errors = []
 class TestBaseCommandHelp < Test::Unit::TestCase
 
+  Trepan::Subcommand.const_set(:NAME, 'bogus')
   def setup
     $errors   = []
     $msgs     = []
@@ -43,7 +44,7 @@ class TestBaseCommandHelp < Test::Unit::TestCase
       cmd_obj.subcmds.subcmds.each do |subcmd_name, subcmd_obj|
         %w(HELP NAME PREFIX).each do |attr|
           assert_equal(true, subcmd_obj.class.constants.member?(attr.to_sym),
-                       "Constant #{attr} should be defined in \"#{cmd_obj.name} #{subcmd_obj.name}\"")
+                       "Constant #{attr} should be defined in \"#{cmd_obj.name} #{subcmd_obj.class::NAME}\"")
         end
       end
         

data/test/unit/test-cmd-help.rb

@@ -21,11 +21,11 @@ class TestCommandHelp < Test::Unit::TestCase
     msgs = @cmdproc.instance_variable_get('@msgs')
     errmsgs = @cmdproc.instance_variable_get('@errmsgs')
     assert_equal(should_not_have, msgs.empty?,
-                 "Expecting %shelp for #{arg_str}.\n Got #{msgs}" %
-                 shoulda[0])
+                 "Expecting %shelp for %s.\n Got %s" %
+                 [shoulda[0], arg_str, msgs])
     assert_equal(!should_not_have, errmsgs.empty?,
-                 "Expecting %serror for #{arg_str}.\n Got #{errmsgs}" %
-                 shoulda[1])
+                 "Expecting %serror for %s.\n Got %s" %
+                 [shoulda[1], arg_str, msgs])
   end
   
   def test_help_command

data/test/unit/test-proc-frame.rb

@@ -17,6 +17,7 @@ class TestCmdProcessorFrame < Test::Unit::TestCase
     $msgs   = []
     @proc    = Trepan::CmdProcessor.new(Trepan::MockCore.new())
     @proc.frame_index = 0
+    @proc.frame_initialize
     class << @proc
       def errmsg(msg)
         $errors << msg
@@ -32,7 +33,6 @@ class TestCmdProcessorFrame < Test::Unit::TestCase
   # See that we have can load up commands
   def test_basic
     @proc.frame_setup(RubyVM::ThreadFrame.current)
-    @proc.hidelevels = {}
 
     # Test absolute positioning. Should all be okay
     0.upto(@proc.top_frame.stack_size-1) do |i| 
@@ -52,7 +52,6 @@ class TestCmdProcessorFrame < Test::Unit::TestCase
 
     setup
     @proc.top_frame  = @proc.frame = RubyVM::ThreadFrame.current
-    @proc.hidelevels = {}
     @proc.adjust_frame(0, true)
 
     @proc.top_frame.stack_size-1.times do 

data/test/unit/test-proc-main.rb

@@ -86,7 +86,7 @@ class TestCmdProcessor < Test::Unit::TestCase
       $errs << "#{mess}"
     end
     run_and_check('!s=1', ['D=> 1'], [], "! evaluation")
-    run_and_check('print "foo"', ['foo'], [], "print command")
+    run_and_check('pr "foo"', ['foo'], [], "print command")
     run_and_check('set autoeval off', 
                   ['Evaluation of unrecognized debugger commands is off.'], [], 
                   "autoeval set")

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - R. Bernstein
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-08 00:00:00 -04:00
+date: 2010-10-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,8 +27,8 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 32
-        version: "0.32"
+        - 33
+        version: "0.33"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -90,6 +90,8 @@ description: |
   Some of the core debugger concepts have been rethought. As a result, some of this may be experimental.
   
   This version works only with a patched version of Ruby 1.9.2 and rb-threadframe.
+  
+  See also rbx-trepanning for a version that works with Rubinius.
 
 email: rockyb@rubyforge.net
 executables: 
@@ -148,6 +150,7 @@ files:
 - processor/location.rb
 - processor/load_cmds.rb
 - processor/hook.rb
+- processor/command/pr.rb
 - processor/command/set_subcmd/debug_subcmd/dbgr.rb
 - processor/command/set_subcmd/debug_subcmd/except.rb
 - processor/command/set_subcmd/debug_subcmd/skip.rb
@@ -259,7 +262,6 @@ files:
 - processor/command/continue.rb
 - processor/command/backtrace.rb
 - processor/command/condition.rb
-- processor/command/print.rb
 - processor/command/reload_subcmd/command.rb
 - test/example/fname with blank.rb
 - test/example/null.rb
@@ -311,6 +313,7 @@ files:
 - test/functional/tmp/b1.rb
 - test/functional/test-trace-var.rb
 - test/functional/fn_helper.rb
+- test/functional/test-fn_helper.rb
 - test/functional/test-immediate-step-bug.rb
 - test/functional/test-step.rb
 - test/functional/test-finish.rb
@@ -326,7 +329,7 @@ rdoc_options:
 - --main
 - README
 - --title
-- Trepan 0.0.4 Documentation
+- Trepan 0.0.6 Documentation
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement