rb8-trepanning 0.1.5 → 0.1.6

data/lib/debugger.rb

@@ -1,4 +1,6 @@
-# Module/Package to do the most-common thing: get into the debugger with 
+# -*- coding: utf-8 -*-
+# Copyright (C) 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Module/Package to do the most-common thing: get into the debugger with
 # minimal fuss. Compare with: require "debug"
 require 'rubygems'
 require 'require_relative'

data/lib/trepanning.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2013 Rocky Bernstein <rockyb@rubyforge.net>
 require 'rubygems'
 require 'pp'
 require 'stringio'
@@ -18,10 +20,10 @@ module Trepan
     # The method is called when we want to do debugger command completion
     # such as called from GNU Readline with <TAB>.
     def self.completion_method(last_token, leading=nil)
-      if leading.nil? 
+      if leading.nil?
           if Readline.respond_to?(:line_buffer)
-            completion = 
-              Trepan.handler.cmdproc.complete(Readline.line_buffer, 
+            completion =
+              Trepan.handler.cmdproc.complete(Readline.line_buffer,
                                                 last_token)
           else
             completion = Trepan.handler.cmdproc.complete(last_token, '')
@@ -29,10 +31,10 @@ module Trepan
       else
         completion = Trepan.handler.cmdproc.complete(leading, last_token)
       end
-      if 1 == completion.size 
+      if 1 == completion.size
         completion_token = completion[0]
         if last_token.end_with?(' ')
-          if last_token.rstrip == completion_token 
+          if last_token.rstrip == completion_token
             # There is nothing more to complete
             []
           else
@@ -65,14 +67,14 @@ module Trepan
     # gdb-style annotation mode. Used in GNU Emacs interface
     attr_accessor :annotate
 
-    # in remote mode, wait for the remote connection 
+    # in remote mode, wait for the remote connection
     attr_accessor :wait_connection
 
     # If start_sentinal is set, it is a string to look for in caller()
     # and is used to see if the call stack is truncated. Is also
     # defined in app/default.rb
-    attr_accessor :start_sentinal 
-    
+    attr_accessor :start_sentinal
+
     attr_reader :thread, :control_thread, :cmd_port, :ctrl_port
 
     def interface=(value) # :nodoc:
@@ -101,37 +103,37 @@ module Trepan
     # <i>Note that if you want to stop debugger, you must call
     # Trepan.stop as many time as you called Trepan.start
     # method.</i>
-    # 
+    #
     # +options+ is a hash used to set various debugging options.
     # Set :init true if you want to save ARGV and some variables which
     # make a debugger restart possible. Only the first time :init is set true
-    # will values get set. Since ARGV is saved, you should make sure 
-    # it hasn't been changed before the (first) call. 
+    # will values get set. Since ARGV is saved, you should make sure
+    # it hasn't been changed before the (first) call.
     # Set :post_mortem true if you want to enter post-mortem debugging
     # on an uncaught exception. Once post-mortem debugging is set, it can't
     # be unset.
     def start(options={}, &block)
       options = Trepan::DEFAULT_START_SETTINGS.merge(options)
       if options[:init]
-        Trepan.const_set('ARGV', ARGV.clone) unless 
+        Trepan.const_set('ARGV', ARGV.clone) unless
           defined? Trepan::ARGV
-        Trepan.const_set('PROG_SCRIPT', $0) unless 
+        Trepan.const_set('PROG_SCRIPT', $0) unless
           defined? Trepan::PROG_SCRIPT
-        Trepan.const_set('INITIAL_DIR', Dir.pwd) unless 
+        Trepan.const_set('INITIAL_DIR', Dir.pwd) unless
           defined? Trepan::INITIAL_DIR
       end
       Trepan.tracing = options[:tracing] unless options[:tracing].nil?
-      retval = Debugger.started? ? block && block.call(self) : Debugger.start_(&block) 
+      retval = Debugger.started? ? block && block.call(self) : Debugger.start_(&block)
       if options[:post_mortem]
         post_mortem
       end
       return retval
     end
-    
+
     def started?
       Debugger.started?
     end
-    
+
     #
     # Starts a remote debugger.
     #
@@ -150,12 +152,12 @@ module Trepan
       end
 
       ctrl_port = start_control(host, ctrl_port)
-      
+
       yield if block_given?
-      
+
       mutex = Mutex.new
       proceed = ConditionVariable.new
-      
+
       server = TCPServer.new(host, cmd_port)
       @cmd_port = cmd_port = server.addr[1]
       @thread = Debugger::DebugThread.new do
@@ -171,11 +173,11 @@ module Trepan
       if wait_connection
         mutex.synchronize do
           proceed.wait(mutex)
-        end 
+        end
       end
     end
     alias start_server start_remote
-    
+
     def start_control(host = nil, ctrl_port = PORT + 1) # :nodoc:
       raise "Debugger is not started" unless started?
       return @ctrl_port if defined?(@control_thread) && @control_thread
@@ -190,7 +192,7 @@ module Trepan
       end
       @ctrl_port
     end
-    
+
     #
     # Connects to the remote debugger
     #
@@ -199,10 +201,10 @@ module Trepan
       interface = Trepan::LocalInterface.new
       socket = TCPSocket.new(host, port)
       puts "Connected."
-      
+
       catch(:exit) do
         while (line = socket.gets)
-          case line 
+          case line
           when /^PROMPT (.*)$/
             input = interface.read_command($1)
             throw :exit unless input
@@ -231,14 +233,14 @@ module Trepan
       end
       @@intf << Trepan::ScriptInterface.new(cmdfile, @output, opts)
     end
-    
+
     def add_startup_files()
       seen = {}
       cwd_initfile = File.join('.', Trepan::CMD_INITFILE_BASE)
       [cwd_initfile, Trepan::CMD_INITFILE].each do |initfile|
         full_initfile_path = File.expand_path(initfile)
         next if seen[full_initfile_path]
-        add_command_file(full_initfile_path) if 
+        add_command_file(full_initfile_path) if
           File.readable?(full_initfile_path)
         seen[full_initfile_path] = true
       end
@@ -249,7 +251,7 @@ module Trepan
       puts caller
       exit
       settings[:cmdfiles].each do |item|
-        cmdfile, opts = 
+        cmdfile, opts =
           if item.kind_of?(Array)
             item
           else

data/processor.rb

@@ -1,13 +1,13 @@
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
-# The main "driver" class for a command processor. Other parts of the 
+# Copyright (C) 2010-2012 Rocky Bernstein <rockyb@rubyforge.net>
+# The main "driver" class for a command processor. Other parts of the
 # command class and debugger command objects are pulled in from here.
 
 require 'set'
 
 require 'rubygems'; require 'require_relative'
 # Other debuggers have in addition: breakpoint disassemble stepping
-%w(default display eval eventbuf frame hook load_cmds location msg running 
-   validate).each do
+%w(complete default display eval eventbuf frame hook load_cmds
+   location msg running validate).each do
   |mod_str|
   require_relative File.join('processor', mod_str);
 end
@@ -26,7 +26,7 @@ module Trepan
     ## attr_reader   :core            # Trepan core object
     attr_reader   :current_command # Current command getting run, a String.
 
-    attr_accessor :dbgr          # Trepan instance (via
+    attr_accessor :dbgr            # Trepan instance (via
                                    # Trepan::Core instance)
                                    ## FIXME 1.9.2 has attr_reader !
     attr_accessor :interfaces
@@ -34,7 +34,7 @@ module Trepan
 
     attr_accessor :debug_nest      # Number of nested debugs. Used in showing
                                    # prompt.
-    attr_accessor :different_pos   # Same type as settings[:different] 
+    attr_accessor :different_pos   # Same type as settings[:different]
                                    # this is the temporary value for the
                                    # next stop while settings is the default
                                    # value to use.
@@ -43,8 +43,8 @@ module Trepan
                                    # Trepan::Core instance)
     attr_reader   :interfaces      # Array of all interfaces
     attr_accessor :leave_cmd_loop  # Commands set this to signal to leave
-                                   # the command loop (which often continues to 
-                                   # run the debugged program). 
+                                   # the command loop (which often continues to
+                                   # run the debugged program).
     attr_accessor :line_no         # Last line shown in "list" command
     attr_accessor :next_level      # Fixnum. frame.stack_size has to
                                    # be <= than this.  If next'ing,
@@ -52,7 +52,7 @@ module Trepan
     attr_accessor :next_thread     # Thread. If non-nil then in
                                    # stepping the thread has to be
                                    # this thread.
-    attr_accessor :pass_exception  # Pass an exception back 
+    attr_accessor :pass_exception  # Pass an exception back
     attr_accessor :prompt          # String print before requesting input
     attr_reader   :settings        # Hash[:symbol] of command
                                    # processor settings
@@ -61,7 +61,7 @@ module Trepan
     # The following are used in to force stopping at a different line
     # number. FIXME: could generalize to a position object.
     attr_accessor :last_pos       # Last position. 6-Tuple: of
-                                  # [location, container, stack_size, 
+                                  # [location, container, stack_size,
                                   #  current_thread, pc_offset]
 
     ## def initialize(dbgr, settings={})
@@ -78,7 +78,7 @@ module Trepan
       @next_thread     = nil
       @user_variables = 0
       @state           = nil
-      
+
 
       start_cmds       = settings.delete(:start_cmds)
       start_file       = settings.delete(:start_file)
@@ -88,24 +88,24 @@ module Trepan
 
       # FIXME: Rework using a general "set substitute file" command and
       # a global default profile which gets read.
-      prelude_file = File.expand_path(File.join(File.dirname(__FILE__), 
+      prelude_file = File.expand_path(File.join(File.dirname(__FILE__),
                                                 %w(.. data prelude.rb)))
 
       # Start with empty thread and frame info.
-      frame_teardown 
+      frame_teardown
 
       # Run initialization routines for each of the "submodule"s.
       # load_cmds has to come first.
       ## %w(load_cmds breakpoint display eventbuf frame running validate
       ##   ).each do |submod|
-      ## %w(load_cmds breakpoint display eventbuf frame running 
-      ##    stepping validate).each do 
-      %w(load_cmds display eventbuf frame running validate).each do 
+      ## %w(load_cmds breakpoint display eventbuf frame running
+      ##    stepping validate).each do
+      %w(load_cmds display eventbuf frame running validate).each do
         |submod|
         self.send("#{submod}_initialize")
       end
       hook_initialize(commands)
-      unconditional_prehooks.insert_if_new(-1, *@trace_hook) if 
+      unconditional_prehooks.insert_if_new(-1, *@trace_hook) if
         @settings[:traceprint]
     end
 
@@ -124,7 +124,7 @@ module Trepan
     end
 
     def compute_prompt
-      "(#{@settings[:prompt]}): " 
+      "(#{@settings[:prompt]}): "
     end
 
     # Check that we meed the criteria that cmd specifies it needs
@@ -133,13 +133,13 @@ module Trepan
       # Check we have frame is not null
       min_args = cmd.class.const_get(:MIN_ARGS)
       if nargs < min_args
-        errmsg(("Command '%s' needs at least %d argument(s); " + 
+        errmsg(("Command '%s' needs at least %d argument(s); " +
                 "got %d.") % [name, min_args, nargs])
         return false
       end
       max_args = cmd.class.const_get(:MAX_ARGS)
       if max_args and nargs > max_args
-        errmsg(("Command '%s' needs at most %d argument(s); " + 
+        errmsg(("Command '%s' needs at most %d argument(s); " +
                 "got %d.") % [name, max_args, nargs])
         return false
       end
@@ -167,14 +167,14 @@ module Trepan
       return true if @intf.input_eof? && intf_size == 1
       while intf_size > 1 || !@intf.input_eof?
         begin
-          @current_command = 
+          @current_command =
             if @cmd_queue.empty?
               # Leave trailing blanks on for the "complete" command
-              read_command.chomp 
+              read_command.chomp
             else
               @cmd_queue.shift
             end
-          if @current_command.empty? 
+          if @current_command.empty?
             next unless @last_command && intf.interactive?;
           end
           next if @current_command[0..0] == '#' # Skip comment lines
@@ -218,7 +218,7 @@ module Trepan
 
       if breakpoint?
         delete_breakpoint(@brkpt) if @brkpt.temp?
-        @last_pos = [@frame.vm_location, @stack_size, @current_thread, @event] 
+        @last_pos = [@frame.vm_location, @stack_size, @current_thread, @event]
       end
 
       if stepping_skip? # || @stack_size <= @hide_level
@@ -237,12 +237,12 @@ module Trepan
 
       @leave_cmd_loop = false
       print_location
-      # if 'trace-var' == @event 
+      # if 'trace-var' == @event
       #   msg "Note: we are stopped *after* the above location."
       # end
 
       @eventbuf.add_mark if @settings[:tracebuffer]
-      
+
       @return_to_program = false
       @cmdloop_prehooks.run
       return false
@@ -254,7 +254,10 @@ module Trepan
       @context = context
       @state   = state
       frame_setup(@context, @state)
-      # @event = @core.event
+
+      # FIXME: put in a method 'compute_event'
+      @event  = @context.stop_reason.to_s
+      @event  = 'line' if @event == 'step'
 
       @unconditional_prehooks.run
       if @settings[:traceprint]
@@ -263,7 +266,7 @@ module Trepan
       end
       # if breakpoint?
       #   @last_pos = [@frame.source_container, frame_line,
-      #                @stack_size, @current_thread, @event, 
+      #                @stack_size, @current_thread, @event,
       #                @frame.pc_offset]
       # else
       #   return if stepping_skip? || @stack_size <= @hide_level
@@ -273,7 +276,7 @@ module Trepan
 
       @leave_cmd_loop = false
       print_location
-      # if 'trace-var' == @event 
+      # if 'trace-var' == @event
       #   msg "Note: we are stopped *after* the above location."
       # end
 
@@ -302,7 +305,7 @@ module Trepan
     # Run current_command, a String. @last_command is set after the
     # command is run if it is a command.
     def run_command(current_command)
-      eval_command = 
+      eval_command =
         if current_command[0..0] == '!'
           current_command[0] = ''
         else
@@ -323,7 +326,7 @@ module Trepan
           break unless @macros.member?(macro_cmd_name)
           current_command = @macros[macro_cmd_name][0].call(*args[1..-1])
           msg current_command.inspect if settings[:debugmacro]
-          if current_command.is_a?(Array) && 
+          if current_command.is_a?(Array) &&
               current_command.all? {|val| val.is_a?(String)}
             args = (first=current_command.shift).split
             @cmd_queue += current_command
@@ -338,21 +341,21 @@ module Trepan
         end
 
         @cmd_name = args[0]
-        run_cmd_name = 
+        run_cmd_name =
           if @aliases.member?(@cmd_name)
-            @aliases[@cmd_name] 
+            @aliases[@cmd_name]
           else
             @cmd_name
           end
-        
+
         run_cmd_name = uniq_abbrev(@commands.keys, run_cmd_name) if
           !@commands.member?(run_cmd_name) && @settings[:abbrev]
-          
+
         if @commands.member?(run_cmd_name)
           cmd = @commands[run_cmd_name]
           if ok_for_running(cmd, run_cmd_name, args.size-1)
             @cmd_argstr = current_command[@cmd_name.size..-1].lstrip
-            cmd.run(args) 
+            cmd.run(args)
             @last_command = current_command
           end
           return false
@@ -373,7 +376,7 @@ module Trepan
 
     # Error message when a command doesn't exist
     def undefined_command(cmd_name)
-      begin 
+      begin
         errmsg('Undefined command: "%s". Try "help".' % cmd_name)
       rescue
         $stderr.puts 'Undefined command: "%s". Try "help".' % cmd_name
@@ -427,7 +430,7 @@ if __FILE__ == $0
   #   end
   #   $input = ['1+2']
   #   cmdproc.process_command_and_quit?
-  #   $input = ['!s = 5']  # ! means eval line 
+  #   $input = ['!s = 5']  # ! means eval line
   #   cmdproc.process_command_and_quit?
   # end
 end

data/processor/command.rb

@@ -2,7 +2,7 @@
 # Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 # Base class of all commands. Code common to all commands is here.
 # Note: don't end classname with Command (capital C) since main
-# will think this a command name like QuitCommand 
+# will think this a command name like QuitCommand
 require 'rubygems'; require 'require_relative'
 require 'columnize'
 require_relative '../app/complete'
@@ -33,7 +33,7 @@ module Trepan
     # List commands arranged in an aligned columns
     def columnize_commands(commands)
       width = settings[:maxwidth]
-      Columnize::columnize(commands, width, ' ' * 4, 
+      Columnize::columnize(commands, width, ' ' * 4,
                            true, true, ' ' * 2).chomp
     end
 
@@ -55,7 +55,7 @@ module Trepan
     end
 
     def obj_const(obj, name)
-      obj.class.const_get(name) 
+      obj.class.const_get(name)
     end
 
     def msg(message, opts={})
@@ -102,18 +102,18 @@ module Trepan
     end
 
     def short_help
-      help_constant_sym = if self.class.constants.member?('SHORT_HELP') 
-                            :SHORT_HELP 
+      help_constant_sym = if self.class.constants.member?('SHORT_HELP')
+                            :SHORT_HELP
                           else :HELP
                           end
       my_const(help_constant_sym)
     end
 
     # Define a method called 'complete' on the singleton class.
-    def self.completion(ary) 
-      self.send(:define_method, 
-                :complete, 
-                Proc.new {|prefix| 
+    def self.completion(ary)
+      self.send(:define_method,
+                :complete,
+                Proc.new {|prefix|
                   Trepan::Complete.complete_token(ary, prefix) })
     end