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

data/processor/command/show.rb

@@ -1,20 +1,21 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 require 'rubygems'; require 'require_relative'
 require_relative 'base/submgr'
 
 class Trepan::Command::ShowCommand < Trepan::SubcommandMgr
   unless defined?(HELP)
-    HELP =
-'Generic command for showing things about the debugger.  You can
+    NAME = File.basename(__FILE__, '.rb')
+    HELP = <<-HELP
+Generic command for showing things about the debugger.  You can
 give unique prefix of the name of a subcommand to get information
 about just that subcommand.
 
-Type "show" for a list of "show" subcommands and what they do.
-Type "help show *" for just a list of "show" subcommands.'
+Type "#{NAME}" for a list of "show" subcommands and what they do.
+Type "help #{NAME} *" for just a list of "show" subcommands.
+    HELP
 
     CATEGORY      = 'status'
-    NAME          = File.basename(__FILE__, '.rb')
     NEED_STACK    = false
     SHORT_HELP    = 'Show parts of the debugger environment'
   end

data/processor/command/step.rb

@@ -1,5 +1,6 @@
 require 'rubygems'; require 'require_relative'
 require_relative 'base/cmd'
+require_relative '../../app/condition'
 require_relative '../stepping'
 
 class Trepan::Command::StepCommand < Trepan::Command
@@ -9,6 +10,7 @@ class Trepan::Command::StepCommand < Trepan::Command
   NAME         = File.basename(__FILE__, '.rb')
   HELP         = <<-HELP
 #{NAME}[+|-] [into]  [count]
+#{NAME} until EXPRESSION
 #{NAME} over [args..]
 #{NAME} out  [args..]
 
@@ -26,6 +28,7 @@ Examples:
   #{NAME} 5/5+0  # same as above
   #{NAME}+       # same but force stopping on a new line
   #{NAME}-       # same but force stopping on a new line a new frame added
+  #{NAME} until a > b
   #{NAME} over   # same as 'next'
   #{NAME} out    # same as 'finish'
 
@@ -44,15 +47,25 @@ See also the commands:
     'into' => 'step',
   }
   
-  def run(args)
+  include Trepan::Condition
+  # This method runs the command
+  def run(args) # :nodoc
+    condition = nil
+    opts = {}
     if args.size == 1
       step_count = 1
-      opts = {}
     else
       replace_cmd = Keyword_to_related_cmd[args[1]]
       if replace_cmd
         cmd = @proc.commands[replace_cmd]
         return cmd.run([replace_cmd] + args[2..-1])
+      elsif 'until' == args[1]
+        try_condition = args[2..-1].join(' ')
+        if valid_condition?(try_condition)
+          condition = try_condition
+          opts[:different_pos] = false
+          step_count = 0
+        end
       else
         step_str = args[1]
         opts = @proc.parse_next_step_suffix(args[0])
@@ -67,7 +80,7 @@ See also the commands:
       end
     end
     
-    @proc.step('step', step_count, opts)
+    @proc.step('step', step_count, opts, condition)
   end
 end
 

data/processor/command/tbreak.rb

@@ -3,7 +3,7 @@ require_relative './base/cmd'
 require_relative 'break'
 
 class Trepan::Command::SetTempBreakpointCommand < 
-    Trepan::Command::SetBreakpointCommand
+    Trepan::Command::BreakCommand
   ALIASES      = %w(tb tbrk)
   CATEGORY     = 'breakpoints'
   NAME         = File.basename(__FILE__, '.rb')

data/processor/disassemble.rb

@@ -10,7 +10,7 @@ class Trepan
       start = meth.first_ip_on_line(line)
       fin = meth.first_ip_on_line(line+1)
 
-      if fin == -1
+      if !fin || fin == -1
         fin = meth.iseq.size
       end
 

data/processor/help.rb

@@ -1,5 +1,25 @@
 # Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
 class Trepan
+  # class SubHelp
+  #   def initialize(name, dir)
+  #     @name = name
+  #     @dir  = dir
+  #     load_sub_help_files(dir)
+  #   end
+
+  #   def load_sub_help_files(dir)
+  #     Dir.glob(dir, '*.txt').each do |txt| 
+  #       basename = File.basename(txt, '.txt')
+  #       @list << basename
+  #     end
+  #   end if File.directory?(dir)
+
+  #   def summary_help
+  #     section "List of #{@name} help"
+  #     msg @list
+  #   end
+  # end
+
   module Help
 
     def abbrev_stringify(name, min_abbrev)

data/processor/load_cmds.rb

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net> 
+require 'tmpdir'
 
 # Part of Trepan::CmdProcess that loads up debugger commands from
 # builtin and user directories.  
@@ -62,6 +63,23 @@ class Trepan
       end
     end
 
+    # Instantiate a Trepan::Command and extract info: the NAME, ALIASES
+    # and store the command in @commands.
+    def setup_command(command)
+      # Note: there is probably a non-eval way to instantiate the
+      # command, but I don't know it. And eval works.
+      klass = self.instance_eval("Trepan::Command::#{command}")
+      cmd = klass.send(:new, self)
+      
+      # Add to list of commands and aliases.
+      cmd_name = klass.const_get(:NAME)
+      if klass.constants.member?(:ALIASES)
+        aliases= klass.const_get(:ALIASES)  
+        aliases.each {|a| @aliases[a] = cmd_name}
+      end
+      @commands[cmd_name] = cmd
+    end
+
     # Looks up cmd_array[0] in @commands and runs that. We do lots of 
     # validity testing on cmd_array.
     def run_cmd(cmd_array)
@@ -85,6 +103,37 @@ class Trepan
       end
     end
 
+    def save_commands(opts)
+      save_filename = opts[:filename] || 
+        File.join(Dir.tmpdir, "trepanning-save-#{$$}.txt")
+      begin
+        save_file = File.open(save_filename, 'w')
+      rescue => exc
+        errmsg("Can't open #{save_filename} for writing.")
+        errmsg("System reports: #{exc.inspect}")
+        return nil
+      end
+      save_file.puts "#\n# Commands to restore trepanning environment\n#\n"
+      @commands.each do |cmd_name, cmd_obj|
+        cmd_obj.save_command if cmd_obj.respond_to?(:save_command)
+        next unless cmd_obj.is_a?(Trepan::SubcommandMgr)
+        cmd_obj.subcmds.subcmds.each do |subcmd_name, subcmd_obj|
+          save_file.puts subcmd_obj.save_command if 
+            subcmd_obj.respond_to?(:save_command)
+          next unless subcmd_obj.is_a?(Trepan::SubSubcommandMgr)
+          subcmd_obj.subcmds.subcmds.each do |subsubcmd_name, subsubcmd_obj|
+            save_file.puts subsubcmd_obj.save_command if 
+              subsubcmd_obj.respond_to?(:save_command)
+          end
+        end
+      end
+      save_file.puts "!FileUtils.rm #{save_filename.inspect}" if 
+        opts[:erase]
+      save_file.close
+
+      return save_filename
+    end
+
     # Handle initial completion. We draw from the commands, aliases,
     # and macros for completion. However we won't include aliases which
     # are prefixes of other commands.
@@ -117,7 +166,7 @@ class Trepan
         #   ["#{name} #{args[1..-1].join(' ')}"]
         # end
       end
-      # match_pairs.size == 1
+      # match_pairs.size <= 1
       next_complete(str, next_blank_pos, match_pairs[0][1], last_token)
     end
 
@@ -187,7 +236,7 @@ if __FILE__ == $0
   cmdproc.run_cmd('foo')  # Invalid - not an Array
   cmdproc.run_cmd([])     # Invalid - empty Array
   cmdproc.run_cmd(['list', 5])  # Invalid - nonstring arg
-  p cmdproc.complete("d")
-  p cmdproc.complete("sho d")
-  p cmdproc.complete('')
+  p cmdproc.complete("d", 'd')
+  p cmdproc.complete("sho d", 'd')
+  p cmdproc.complete('', '')
 end

data/processor/location.rb

@@ -1,6 +1,8 @@
 # Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+require 'pathname'  # For cleanpath
+require 'rubygems'; 
 require 'linecache'
-require 'rubygems'; require 'require_relative'
+require 'require_relative'
 require_relative 'disassemble'
 require_relative 'msg'
 require_relative 'frame'
@@ -12,6 +14,13 @@ class Trepan
       @reload_on_change = nil
     end
 
+    def canonic_file(filename)
+      # For now we want resolved filenames 
+      @settings[:basename] ? File.basename(filename) : 
+        # Cache this?
+        File.expand_path(Pathname.new(filename).cleanpath.to_s)
+    end
+
     # Return the text to the current source line.
     # FIXME: loc_and_text should call this rather than the other
     # way around.
@@ -66,10 +75,12 @@ class Trepan
                      {:reload_on_change => @reload_on_change,
                        :output => @settings[:highlight]
                      })
+
       vm_location = @frame.vm_location
       filename = vm_location.method.active_path
       line_no  = vm_location.line
       static   = vm_location.static_scope
+      opts[:compiled_method] = top_scope(@frame.method)
 
       if @frame.eval?
         file = LineCache::map_script(static.script)
@@ -175,3 +186,38 @@ class Trepan
 
   end
 end
+
+if __FILE__ == $0 && caller.size == 0 && ARGV.size > 0
+  # Demo it.
+  require 'thread_frame'
+  require_relative 'frame'
+  require_relative '../app/mock'
+  require_relative 'main'   # Have to include before defining CmdProcessor!
+                            # FIXME
+  class Trepan::CmdProcessor
+    def errmsg(msg)
+      puts msg
+    end
+    def print_location
+      puts "#{@frame.source_container} #{frame.source_location[0]}"
+    end
+  end
+
+  proc = Trepan::CmdProcessor.new(Trepan::MockCore.new())
+  proc.instance_variable_set('@settings', {})
+  proc.frame_initialize
+  #proc.frame_setup(RubyVM::ThreadFrame.current)
+  proc.frame_initialize
+
+  proc.location_initialize
+  puts proc.canonic_file(__FILE__)
+  proc.instance_variable_set('@settings', {:basename => true})
+  puts proc.canonic_file(__FILE__)
+  puts proc.current_source_text
+  xx = eval <<-END
+     proc.frame_initialize
+     ##proc.frame_setup(RubyVM::ThreadFrame.current)
+     proc.location_initialize
+     proc.current_source_text
+  END
+end

data/processor/main.rb

@@ -3,7 +3,6 @@
 # command class and debugger command objects are pulled in from here.
 
 require 'set'
-require 'pathname'  # For cleanpath
 
 require 'rubygems'; require 'require_relative'
 ## %w(default display eventbuf eval load_cmds location frame hook msg 
@@ -137,13 +136,6 @@ class Trepan
       [container[0], canonic_file(container[1])]
     end
 
-    def canonic_file(filename)
-      # For now we want resolved filenames 
-      @settings[:basename] ? File.basename(filename) : 
-        # Cache this?
-        Pathname.new(filename).cleanpath.to_s
-    end
-
     def compute_prompt
       "(#{@settings[:prompt]}): " 
     end
@@ -213,6 +205,9 @@ class Trepan
             quit('exit!')
             return true
           end
+        rescue Exception => exc
+          errmsg("Internal debugger error in read: #{exc.inspect}")
+          exception_dump(exc, @settings[:debugexcept], $!.backtrace)
         end
       end
       run_command(@current_command)
@@ -235,7 +230,7 @@ class Trepan
         @last_pos = [@frame.vm_location, @stack_size, @current_thread, @event] 
       else
         if stepping_skip? # || @stack_size <= @hide_level
-          step(@return_to_program, @step_count)
+          step(@return_to_program, @step_count, {}, @stop_condition)
           return true
         elsif @event == 'start'
           step('step', 0)

data/processor/mock.rb

@@ -28,12 +28,12 @@ module MockDebugger
     attr_reader :cmd_argstr, :cmd_name, :vm_locations, :current_frame, 
                 :debugee_thread, :completion_proc
 
-    def initialize(settings={})
+    def initialize(settings={:start_frame=>1})
       @before_cmdloop_hooks = []
       @settings             = Trepan::DEFAULT_SETTINGS.merge(settings)
       @intf                 = [Trepan::UserInterface.new(nil, nil,
                                                          :history_save=>false)]
-      @vm_locations         = Rubinius::VM.backtrace(1, true)
+      @vm_locations         = Rubinius::VM.backtrace(settings[:start_frame], true)
       @current_frame        = Trepan::Frame.new(self, 0, @vm_locations[0])
       @debugee_thread       = Thread.current
       @frames               = []
@@ -66,7 +66,7 @@ module MockDebugger
       dbgr = Trepan.new
       dbgr.debugger
     else
-      dbgr = MockDebugger.new
+      dbgr = MockDebugger.new(:start_frame=>2)
     end
 
     cmdproc = Trepan::CmdProcessor.new(dbgr)

data/processor/running.rb

@@ -193,24 +193,23 @@ class Trepan
       end
 
       @last_pos[2] = new_pos[2] if 'nostack' == @different_pos
-      condition_met = @step_count == 0
-
-      #     if @stop_condition
-      #       puts 'stop_cond' if @settings[:'debugskip']
-      #       debug_eval_no_errmsg(@stop_condition)
-      #     elsif @to_method
-      #       puts "method #{@frame.method} #{@to_method}" if 
-      #         @settings[:'debugskip']
-      #       @frame.method == @to_method
-      #     else
-      #       puts 'uncond' if @settings[:'debugskip']
-      #       true
-      #     end
+      condition_met = 
+          if @stop_condition
+            puts "stop_cond #{@stop_condition}" if @settings[:'debugskip']
+            debug_eval_no_errmsg(@stop_condition)
+          elsif @to_method
+            puts "method #{@frame.method} #{@to_method}" if 
+              @settings[:'debugskip']
+            @frame.method == @to_method
+          else
+            puts 'uncond' if @settings[:'debugskip']
+            @step_count == 0
+          end
           
-      #   msg("condition_met: #{condition_met}, last: #{@last_pos}, " +
-      #        "new: #{new_pos}, different #{@different_pos.inspect}") if 
-      #     @settings[:'debugskip']
-
+      msg("condition_met: #{condition_met}, last: #{@last_pos}, " +
+          "new: #{new_pos}, different #{@different_pos.inspect}") if 
+        @settings[:'debugskip']
+      
       should_skip = ((@last_pos[0..3] == new_pos[0..3] && @different_pos) ||
                   !condition_met)