trepanning 0.1.4 → 0.1.6

data/processor/command/condition.rb

@@ -53,7 +53,7 @@ if __FILE__ == $0
   require 'thread_frame'
   require_relative '../mock'
   dbgr, cmd = MockDebugger::setup
-  cmd.proc.frame_setup(RubyVM::ThreadFrame::current)
+  cmd.proc.frame_setup(RubyVM::Frame::current)
   
   cmd.run([cmd.name, '1'])
   cmdproc = dbgr.core.processor

data/processor/command/debug.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010, 2012 Rocky Bernstein <rockyb@rubyforge.net>
 require 'thread_frame'
 require_relative '../command'
 
@@ -27,38 +27,42 @@ Enter the debugger recursively on RUBY-CODE.
     arg_str    = args[1..-1].join(' ')
     hidelevels = @proc.hidelevels[th]
 
-    stack_diff = RubyVM::ThreadFrame.current.stack_size - frame.stack_size 
+    stack_diff = RubyVM::Frame.current.stack_size - frame.stack_size 
 
     # Ignore tracing in support routines:
-    tf = @proc.dbgr.trace_filter 
-    [self.method(:run), @proc.method(:debug_eval),
-     @proc.method(:debug_eval_with_exception),
-     @proc.method(:get_binding_and_filename),
-     @proc.method(:fake_eval_filename)].each do |m|
-      tf << m unless tf.member?(m)
+    # FIXME remvoe 1.9.3 hack
+    if '1.9.3' != RUBY_VERSION
+      tf = @proc.dbgr.trace_filter 
+      [self.method(:run), @proc.method(:debug_eval),
+       @proc.method(:debug_eval_with_exception),
+       @proc.method(:get_binding_and_filename),
+       @proc.method(:fake_eval_filename)].each do |m|
+        tf << m unless tf.member?(m)
+      end
     end
 
     @proc.hidelevels[th] += stack_diff + EXTRA_DEBUG_SETUP_CALLS
 
     # Values we need to save before munging them
     old_tracing            = th.tracing
-    old_exec_event_tracing = th.exec_event_tracing
+    old_exec_event_tracing = th.exec_event_tracing?
     old_mutex              = @proc.core.mutex 
     old_next_level         = @proc.next_level
     old_step_count         = @proc.core.step_count
 
-    msg 'ENTERING NESTED DEBUGGER'
+    section 'ENTERING NESTED DEBUGGER'
 
     # Things we need to do to allow entering the debugger again
     @proc.debug_nest      += 1
     @proc.core.mutex       = Mutex.new
     th.tracing             = false
     th.exec_event_tracing  = false
-    @proc.core.step_count  = 0
     @proc.next_level       = 32000
 
-    RubyVM::ThreadFrame.current.trace_off = false
-    retval = @proc.debug_eval(arg_str)
+    RubyVM::Frame.current.trace_off = false
+    @proc.core.step_count  = 0
+    retval = @proc.debug_eval(arg_str, 15, 
+                              RUBY_VERSION == '1.9.3') # FIXME
 
     # Restore munged values
     th.exec_event_tracing  = old_exec_event_tracing
@@ -70,7 +74,7 @@ Enter the debugger recursively on RUBY-CODE.
     @proc.next_level       = old_next_level
     @proc.print_location
     @proc.debug_nest      -= 1
-    msg 'LEAVING NESTED DEBUGGER'
+    section 'LEAVING NESTED DEBUGGER'
     msg "R=> #{retval.inspect}"
   end
 end
@@ -79,6 +83,6 @@ if __FILE__ == $0
   require_relative '../mock'
   dbgr, cmd = MockDebugger::setup
   cmd.proc.hidelevels[Thread.current] = 0
-  cmd.proc.frame_setup(RubyVM::ThreadFrame::current)
+  cmd.proc.frame_setup(RubyVM::Frame::current)
   cmd.run([cmd.name, 'x = 1; y = 2'])
 end

data/processor/command/delete.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010-2012 Rocky Bernstein <rockyb@rubyforge.net>
 require_relative '../command'
 require_relative '../breakpoint'
 require_relative '../../app/breakpoint'
@@ -22,6 +22,7 @@ number.
 
     CATEGORY      = 'breakpoints'
     SHORT_HELP    = 'Delete some breakpoints'
+    ALIASES       = %w(d)
   end
   
   def run(args)

data/processor/command/disassemble.rb

@@ -92,14 +92,14 @@ if __FILE__ == $0
   require_relative '../mock'
   dbgr, cmd = MockDebugger::setup
   def small_fn(cmd, name)
-    cmd.proc.frame_setup(RubyVM::ThreadFrame::current)
+    cmd.proc.frame_setup(RubyVM::Frame::current)
     cmd.run [name]
   end
   small_fn(cmd, cmd.name)
   p = Proc.new do 
     |x,y| x + y
   end
-  cmd.proc.frame_setup(RubyVM::ThreadFrame::current)
+  cmd.proc.frame_setup(RubyVM::Frame::current)
   cmd.run([cmd.name, 'p'])
   puts cmd.complete('f')
   require 'irb'

data/processor/command/display.rb

@@ -76,7 +76,7 @@ if __FILE__ == $0
     puts '==' * 10
   end
 
-  cmd.proc.frame_setup(RubyVM::ThreadFrame::current)
+  cmd.proc.frame_setup(RubyVM::Frame::current)
 
   run_cmd(cmd, [cmd.name])
   run_cmd(cmd, [cmd.name, '/x', '10'])

data/processor/command/down.rb

@@ -18,7 +18,6 @@ is the most recent frame. If no count is given, move down 1.
 See also 'up' and 'frame'.
   HELP
 
-    ALIASES       = %w(d)
     NAME          = File.basename(__FILE__, '.rb')
     SHORT_HELP    = 'Move frame in the direction of the caller of the last-selected frame'
   }
@@ -44,7 +43,7 @@ if __FILE__ == $0
     sep 
   end
   def foo(cmd, name)
-    cmd.proc.frame_setup(RubyVM::ThreadFrame::current)
+    cmd.proc.frame_setup(RubyVM::Frame::current)
     puts "#{name}"
     cmd.run([name])
     sep

data/processor/command/finish.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010-2012 Rocky Bernstein <rockyb@rubyforge.net>
 require_relative '../command'
 
 class Trepan::Command::FinishCommand < Trepan::Command
@@ -9,9 +9,13 @@ class Trepan::Command::FinishCommand < Trepan::Command
     HELP = <<-HELP
 #{NAME} [levels]
 
-Continue execution until the program is about to leaving the current
-function or switch context via yielding or ending a block which was
-yield to. Sometimes this is called 'step out'.
+Continue execution until the program is about to:
+
+* leave the current function, or 
+* switch context via yielding back or finishing a block which was
+  yielded to. 
+
+Sometimes this is called 'step out'.
 
 When `levels' is specified, that many frame levels need to be
 popped. The default is 1.  Note that 'yield' and exceptions raised my

data/processor/command/frame.rb

@@ -112,7 +112,7 @@ if __FILE__ == $0
   def sep ; puts '=' * 40 end
   %w(0 1 -2).each {|count| cmd.run([cmd.name, count]); sep }
   def foo(cmd, name)
-    cmd.proc.frame_setup(RubyVM::ThreadFrame::current)
+    cmd.proc.frame_setup(RubyVM::Frame::current)
     %w(0 -1).each {|count| cmd.run([name, count]); sep }
   end
   foo(cmd, cmd.name)

data/processor/command/help.rb

@@ -38,7 +38,7 @@ info line command.
     SHORT_HELP    = 'Print commands or give help for command(s)'
 
     require 'thread_frame'
-    ROOT_DIR = File.dirname(RubyVM::ThreadFrame.current.source_container[1])
+    ROOT_DIR = File.dirname(RubyVM::Frame.current.source_container[1])
     HELP_DIR      = File.join(ROOT_DIR, 'help')
   end
 

data/processor/command/info_subcmd/breakpoints.rb

@@ -149,7 +149,7 @@ if __FILE__ == $0
   puts '-' * 20
 
   require 'thread_frame'
-  tf = RubyVM::ThreadFrame.current
+  tf = RubyVM::Frame.current
   pc_offset = tf.pc_offset
   def foo
     5 

data/processor/command/info_subcmd/registers.rb

@@ -72,6 +72,6 @@ if __FILE__ == $0
   name = File.basename(__FILE__, '.rb')
   cmd_args = ['info', name]
   info_cmd.instance_variable_set('@last_args', cmd_args)
-  command.proc.frame_setup(RubyVM::ThreadFrame::current)
+  command.proc.frame_setup(RubyVM::Frame::current)
   command.run(cmd_args)
 end

data/processor/command/info_subcmd/source.rb

@@ -49,7 +49,7 @@ EOH
     max_line = LineCache::size(canonic_name)
     msg 'File has %d lines.' % max_line if max_line
     msg('SHA1 is %s.' % LineCache::sha1(canonic_name))
-    syntax_errors = Trepan::ruby_syntax_errors(canonic_name)
+    syntax_errors = Trepanning::ruby_syntax_errors(canonic_name)
     if syntax_errors
       msg('Not a syntactically-correct Ruby program.')
     else

data/processor/command/info_subcmd/thread.rb

@@ -91,11 +91,11 @@ if __FILE__ == $0
 
   cmd.proc.instance_variable_set('@last_args', cmd_args)
   cmd_args = ['info', name]
-  cmd.proc.frame_setup(RubyVM::ThreadFrame::current)
+  cmd.proc.frame_setup(RubyVM::Frame::current)
   cmd.run(cmd_args)
   puts '-' * 20
   Thread.new do 
-    cmd.proc.frame_setup(RubyVM::ThreadFrame::current)
+    cmd.proc.frame_setup(RubyVM::Frame::current)
     cmd.run(cmd_args)
     puts '-' * 10
     cmd.run(cmd_args + [0])

data/processor/command/list.rb

@@ -208,7 +208,7 @@ if __FILE__ == $0
       |x,y| x + y
     end
     require 'thread_frame'
-    tf = RubyVM::ThreadFrame.current
+    tf = RubyVM::Frame.current
     cmd.proc.frame_setup(tf)
     run_cmd2(cmd, %w(list p))
 

data/processor/command/set_subcmd/auto_subcmd/eval.rb

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010-2012 Rocky Bernstein <rockyb@rubyforge.net>
 require_relative '../../base/subsubcmd'
 
 class Trepan::SubSubcommand::SetAutoEval < Trepan::SetBoolSubSubcommand
   unless defined?(HELP)
-    Trepanning::Subcommand.set_name_prefix(__FILE__, self)
+    Trepanning::SubSubcommand.set_name_prefix(__FILE__, self)
     HELP = "Evaluate unrecognized debugger commands.
 
 Often inside the debugger, one would like to be able to run arbitrary
@@ -45,9 +45,13 @@ if __FILE__ == $0
   # Demo it.
   require_relative '../../../mock'
   require_relative '../auto'
-  cmd = MockDebugger::subsub_setup(Trepan::SubSubcommand::SetAuto,
-                                   Trepan::SubSubcommand::SetAutoEval)
-  %w(off on 0 1).each { |arg| cmd.run([cmd.name, arg]) }
+  dbgr, cmd = MockDebugger::setup('set')
+  cmds = dbgr.core.processor.commands
+  set_cmd = cmds['set']
+  auto_cmd = Trepan::SubSubcommand::SetAuto.new(dbgr.core.processor, 
+                                               set_cmd)
+  eval_cmd = Trepan::SubSubcommand::SetAutoEval.new(cmd, auto_cmd, 'eval');
+  %w(off on 0 1).each { |arg| eval_cmd.run([eval_cmd.name, arg]) }
   puts '-' * 10
-  puts cmd.save_command.join("\n")
+  puts eval_cmd.save_command
 end

data/processor/command/set_subcmd/auto_subcmd/irb.rb

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010-2012 Rocky Bernstein <rockyb@rubyforge.net>
 require_relative '../../base/subsubcmd'
 
 class Trepan::Subcommand::SetAutoIrb < Trepan::SetBoolSubSubcommand
   unless defined?(HELP)
-    Trepanning::Subcommand.set_name_prefix(__FILE__, self)
+    Trepanning::SubSubcommand.set_name_prefix(__FILE__, self)
     HELP = "Set to automatically go into irb each time we enter the debugger"
     MIN_ABBREV = 'ir'.size
   end

data/processor/command/set_subcmd/auto_subcmd/list.rb

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010-2012 Rocky Bernstein <rockyb@rubyforge.net>
 require_relative '../../base/subsubcmd'
 
 class Trepan::Subcommand::SetAutoList < Trepan::SetBoolSubSubcommand
   unless defined?(HELP)
-    Trepanning::Subcommand.set_name_prefix(__FILE__, self)
+    Trepanning::SubSubcommand.set_name_prefix(__FILE__, self)
     HELP = "Set to run a 'list' command each time we enter the debugger"
     MIN_ABBREV = 'l'.size
     SHORT_HELP = "Set running a 'list' command each time we enter the debugger"

data/processor/command/set_subcmd/substitute_subcmd/eval.rb

@@ -91,7 +91,7 @@ if __FILE__ == $0
   # require_relative '../../../../lib/trepanning'
   # dbgr = Trepan.new
   # dbgr.debugger
-  eval('set_cmd.proc.frame_setup(RubyVM::ThreadFrame::current); setx_cmd.run([])')
+  eval('set_cmd.proc.frame_setup(RubyVM::Frame::current); setx_cmd.run([])')
 
   # name = File.basename(__FILE__, '.rb')
   # subcommand.summary_help(name)

data/processor/command/show_subcmd/abbrev.rb

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010, 2011, 2012 Rocky Bernstein <rockyb@rubyforge.net>
 require_relative '../base/subcmd'
 
 class Trepan::Subcommand::ShowAbbrev < Trepan::ShowBoolSubcommand
   unless defined?(HELP)
     Trepanning::Subcommand.set_name_prefix(__FILE__, self)
-    HELP       = "Show whether we allow abbreviate debugger command names"
+    HELP       = "Show whether we allow abbreviated debugger command names"
     MIN_ABBREV = 'ab'.size
   end
 

data/processor/command/undisplay.rb

@@ -58,7 +58,7 @@ if __FILE__ == $0
     puts '==' * 10
   end
 
-  cmd.proc.frame_setup(RubyVM::ThreadFrame::current)
+  cmd.proc.frame_setup(RubyVM::Frame::current)
 
   run_cmd(cmd, %W(#{cmd.name} z))
   run_cmd(cmd, %W(#{cmd.name} 1 10))

data/processor/command/up.rb

@@ -18,7 +18,6 @@ the most recent frame. If no count is given, move up 1.
 See also 'down' and 'frame'.
   HELP
 
-    ALIASES       = %w(u)
     CATEGORY      = 'stack'
     MAX_ARGS      = 1  # Need at most this many
     NEED_STACK    = true
@@ -79,7 +78,7 @@ if __FILE__ == $0
     sep 
   end
   def foo(cmd, name)
-    cmd.proc.frame_setup(RubyVM::ThreadFrame::current)
+    cmd.proc.frame_setup(RubyVM::Frame::current)
     puts "#{name}"
     cmd.run([name])
     sep

data/processor/eval.rb

@@ -1,20 +1,24 @@
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010-2012 Rocky Bernstein <rockyb@rubyforge.net>
 require 'rubygems'
 require_relative 'virtual'
 class Trepan
   class CmdProcessor < VirtualCmdProcessor
 
-    def debug_eval(str, max_fake_filename=15)
+    def debug_eval(str, max_fake_filename=15, 
+                   ruby_193_hack=false) #FIXME: remove ruby_193_hack
       begin
-        debug_eval_with_exception(str, max_fake_filename)
+        debug_eval_with_exception(str, max_fake_filename, ruby_193_hack)
       rescue SyntaxError, StandardError, ScriptError => e
         exception_dump(e, @settings[:stack_trace_on_error], $!.backtrace)
         nil
       end
     end
 
-    def debug_eval_with_exception(str, max_fake_filename=15)
+    def debug_eval_with_exception(str, max_fake_filename=15, 
+                                  ruby_193_hack=false) # FIXME: remove ruby_193_hack
+      RubyVM::Frame.current.trace_off = true if ruby_193_hack
       filename, b = get_binding_and_filename(str, max_fake_filename)
+      RubyVM::Frame.current.trace_off = false if ruby_193_hack
       eval(str, b, filename)
     end
 
@@ -94,7 +98,7 @@ if __FILE__ == $0
 
   x = 10
   require 'thread_frame'
-  cmdp.instance_variable_set('@frame', RubyVM::ThreadFrame.current)
+  cmdp.instance_variable_set('@frame', RubyVM::Frame.current)
   cmdp.instance_variable_set('@settings', {:stack_trace_on_error => true})
   def cmdp.msg(mess) ; puts mess end
   puts cmdp.debug_eval('x = "#{x}"')

data/processor/frame.rb

@@ -229,7 +229,7 @@ if __FILE__ == $0
   end
 
   proc = Trepan::CmdProcessor.new(Trepan::MockCore.new())
-  proc.frame_setup(RubyVM::ThreadFrame.current)
+  proc.frame_setup(RubyVM::Frame.current)
   proc.frame_initialize
   puts "stack size: #{proc.top_frame.stack_size}"
   0.upto(proc.top_frame.stack_size) { |i| proc.adjust_frame(i, true) }

data/processor/list.rb

@@ -125,7 +125,7 @@ if __FILE__ == $0
     cmdproc.frame_initialize
     cmdproc.instance_variable_set('@settings', 
                                Trepan::CmdProcessor::DEFAULT_SETTINGS)
-    cmdproc.frame_setup(RubyVM::ThreadFrame.current)
+    cmdproc.frame_setup(RubyVM::Frame.current)
     def foo; 5 end
     def cmdproc.errmsg(msg)
       puts msg

data/processor/location.rb

@@ -23,6 +23,7 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
       'debugger-call'  => ':o',
       'end'            => '-|',
       'line'           => '--',
+      'post-mortem'    => ':/',
       'raise'          => '!!',
       'return'         => '<-',
       'switch'         => 'sw',
@@ -213,7 +214,7 @@ if __FILE__ == $0 && caller.size == 0
   proc = Trepan::CmdProcessor.new(Trepan::MockCore.new())
   proc.instance_variable_set('@settings', {})
   proc.frame_initialize
-  proc.frame_setup(RubyVM::ThreadFrame.current)
+  proc.frame_setup(RubyVM::Frame.current)
   proc.frame_initialize
 
   puts proc.canonic_file(__FILE__)
@@ -222,7 +223,7 @@ if __FILE__ == $0 && caller.size == 0
   puts proc.current_source_text
   xx = eval <<-END
      proc.frame_initialize
-     proc.frame_setup(RubyVM::ThreadFrame.current)
+     proc.frame_setup(RubyVM::Frame.current)
      puts proc.current_source_text
   END
 end

data/processor/mock.rb

@@ -51,7 +51,7 @@ module MockDebugger
   # Common Mock debugger setup 
   def setup(name=nil, show_constants=true)
     unless name
-      tf = RubyVM::ThreadFrame.current.prev
+      tf = RubyVM::Frame.current.prev
       name = File.basename(tf.source_container[1], '.rb')
     end
     if ARGV.size > 0 && ARGV[0] == 'debug'
@@ -64,7 +64,7 @@ module MockDebugger
 
     cmds = dbgr.core.processor.commands
     cmd  = cmds[name]
-    cmd.proc.frame_setup(RubyVM::ThreadFrame::current.prev)
+    cmd.proc.frame_setup(RubyVM::Frame::current.prev)
     show_special_class_constants(cmd) if show_constants
 
     def cmd.confirm(prompt, default)
@@ -90,7 +90,7 @@ module MockDebugger
   def sub_setup(sub_class, run=true)
     sub_name = sub_class.const_get('PREFIX')
     dbgr, cmd = setup(sub_name[0], false)
-    cmd.proc.frame_setup(RubyVM::ThreadFrame::current.prev)
+    cmd.proc.frame_setup(RubyVM::Frame::current.prev)
     cmd.proc.event = 'debugger-call'
     sub_cmd = sub_class.new(cmd)
     sub_cmd.summary_help(sub_cmd)