trepanning 0.1.6 → 1.93.32

data/processor/default.rb

@@ -1,50 +1,54 @@
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010-2011, 2013 Rocky Bernstein <rockyb@rubyforge.net>
 require_relative '../app/default'
 require_relative 'virtual'
 class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
 
-  DEFAULT_SETTINGS = {
-    :abbrev        => true,      # Allow abbreviations of debugger commands?
-    :autoeval      => true,      # Ruby eval non-debugger commands
-    :autoirb       => false,     # Go into IRB in debugger command loop
-    :autolist      => false,     # Run 'list' 
-    
-    :basename      => false,     # Show basename of filenames only
-    :confirm       => true,      # Confirm potentially dangerous operations?
-    :different     => 'nostack', # stop *only* when  different position? 
-    
-    :debugdbgr     => false,     # Debugging the debugger
-    :debugexcept   => true,      # Internal debugging of command exceptions
-    :debugmacro    => false,     # debugging macros
-    :debugskip     => false,     # Internal debugging of step/next skipping
-    :directory     =>            # last-resort path-search for files
-    '$cdir:$cwd',  # that are not fully qualified.
-    
-    :hidestack     => nil,       # Fixnum. How many hidden outer
-                                 # debugger stack frames to hide?
-                                 # nil or -1 means compute value. 0
-                                 # means hide none. Less than 0 means show
-                                 # all stack entries.
-    :hightlight    => false,     # Use terminal highlight? 
-      
-    :maxlist       => 10,        # Number of source lines to list 
-    :maxstack      => 10,        # backtrace limit
-    :maxstring     => 150,       # Strings which are larger than this
-                                 # will be truncated to this length when
-                                 # printed
-    :maxwidth       => (ENV['COLUMNS'] || '80').to_i,
-    :prompt         => 'trepan', # core part of prompt. Additional info like
-                                 # debug nesting and 
-    :reload         => false,    # Reread source file if we determine
-                                 # it has changed?
-    :save_cmdfile  => nil,       # If set, debugger command file to be
-                                 # used on restart
-    :timer         => false,     # show elapsed time between events
-    :traceprint    => false,     # event tracing printing
-    :tracebuffer   => false,     # save events to a trace buffer.
-    :user_cmd_dir  => File.join(%W(#{Trepan::HOME_DIR} trepan command)),
-                                 # User command directory
-  }
+    computed_displaywidth = (ENV['COLUMNS'] || `tput cols &2>/dev/null`).to_i rescue 80
+    computed_displaywidth = 80 unless computed_displaywidth >= 10
+
+
+    DEFAULT_SETTINGS = {
+        :abbrev        => true,      # Allow abbreviations of debugger commands?
+        :autoeval      => true,      # Ruby eval non-debugger commands
+        :autoirb       => false,     # Go into IRB in debugger command loop
+        :autolist      => false,     # Run 'list'
+
+        :basename      => false,     # Show basename of filenames only
+        :confirm       => true,      # Confirm potentially dangerous operations?
+        :different     => 'on',      # stop *only* when  different position?
+
+        :debugdbgr     => false,     # Debugging the debugger
+        :debugexcept   => true,      # Internal debugging of command exceptions
+        :debugmacro    => false,     # debugging macros
+        :debugskip     => false,     # Internal debugging of step/next skipping
+        :directory     =>            # last-resort path-search for files
+        '$cdir:$cwd',  # that are not fully qualified.
+
+        :hidestack     => nil,       # Fixnum. How many hidden outer
+                                     # debugger stack frames to hide?
+                                     # nil or -1 means compute value. 0
+                                     # means hide none. Less than 0 means show
+                                     # all stack entries.
+        :highlight     => true,     # Use terminal highlight?
+
+        :maxlist       => 10,        # Number of source lines to list
+        :maxstack      => 10,        # backtrace limit
+        :maxstring     => 150,       # Strings which are larger than this
+                                     # will be truncated to this length when
+                                     # printed
+        :maxwidth       => computed_displaywidth,
+        :prompt         => 'trepan', # core part of prompt. Additional info like
+                                     # debug nesting and
+        :reload         => false,    # Reread source file if we determine
+                                     # it has changed?
+        :save_cmdfile  => nil,       # If set, debugger command file to be
+                                     # used on restart
+        :timer         => false,     # show elapsed time between events
+        :traceprint    => false,     # event tracing printing
+        :tracebuffer   => false,     # save events to a trace buffer.
+        :user_cmd_dir  => File.join(%W(#{Trepan::HOME_DIR} trepan command)),
+                                     # User command directory
+    } unless defined?(DEFAULT_SETTINGS)
 end
 
 if __FILE__ == $0

data/processor/list.rb

@@ -1,10 +1,10 @@
-# Copyright (C) 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2011, 2013 Rocky Bernstein <rockyb@rubyforge.net>
 
 # Trepan command list validation routines.  A String type is
 # usually passed in as the argument to validation routines.
 
 require 'rubygems'
-
+require 'rbconfig'
 require_relative './validate'
 
 class Trepan
@@ -24,9 +24,14 @@ class Trepan
       # See also duplicate code in print_location
       if container[0] != 'file'
         try_container = container
-        while try_container[0] != 'file' && frame.prev do
-          frame            = frame.prev
-          try_container = frame_container(frame, false)
+        begin
+          while try_container[0] != 'file' && frame.prev do
+            frame            = frame.prev
+            last unless frame
+            try_container = frame_container(frame, false)
+          end
+        rescue
+          return nil
         end
         container = try_container if try_container[0] == 'file'
       end
@@ -44,6 +49,14 @@ class Trepan
         filename = frame_filename
         first = [1, frame_line - center_correction].max
       else
+        ## FIXME: push into parse
+        if RbConfig::CONFIG['target_os'].start_with?('mingw') and
+            position_str =~ /^[A-Za-z]:/
+          drive_letter = position_str[0..1]
+          position_str = position_str[2..-1]
+        else
+          drive_leter = nil
+        end
         list_cmd_parse = parse_list(position_str,
                                     :file_exists_proc => file_exists_proc)
         return [nil] * 4 unless list_cmd_parse
@@ -95,7 +108,11 @@ class Trepan
         first = [1, first - center_correction].max 
         last = first + listsize - 1 unless last
       end
-      LineCache::cache(filename) unless LineCache::cached?(filename)
+      if filename
+        LineCache::cache(filename) unless LineCache::cached?(filename)
+      else
+        errmsg("Don't have a filename here")
+      end
       return [iseq, filename, first, last]
     end
     

data/processor/load_cmds.rb

@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net> 
+# 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.  
+# builtin and user directories.
 # Sets @commands, @aliases, @macros
-require_relative '../app/complete'
 require_relative 'virtual'
 class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
 
@@ -13,11 +12,8 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
                                  # indexed by alias name
   attr_reader   :commands        # Hash[String] of command objects
                                  # indexed by name
-  attr_reader   :macros          # Hash[String] of Proc objects 
+  attr_reader   :macros          # Hash[String] of Proc objects
                                  # indexed by macro name.
-  attr_reader   :leading_str     # leading part of string. Used in 
-                                 # command completion
-
   # "initialize" for multi-file class. Called from main.rb's "initialize".
   def load_cmds_initialize
     @commands = {}
@@ -26,13 +22,13 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
 
     cmd_dirs = [ File.join(File.dirname(__FILE__), 'command') ]
     cmd_dirs <<  @settings[:user_cmd_dir] if @settings[:user_cmd_dir]
-    cmd_dirs.each do |cmd_dir| 
+    cmd_dirs.each do |cmd_dir|
       load_debugger_commands(cmd_dir) if File.directory?(cmd_dir)
     end
   end
 
   # Loads in debugger commands by require'ing each ruby file in the
-  # 'command' directory. Then a new instance of each class of the 
+  # 'command' directory. Then a new instance of each class of the
   # form Trepan::xxCommand is added to @commands and that array
   # is returned.
   def load_debugger_commands(file_or_dir)
@@ -41,13 +37,13 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
       # change $0 so it doesn't get in the way of __FILE__ = $0
       old_dollar0 = $0
       $0 = ''
-      Dir.glob(File.join(dir, '*.rb')).each do |rb| 
+      Dir.glob(File.join(dir, '*.rb')).each do |rb|
         # We use require so that multiple calls have no effect.
         require rb
       end
       $0 = old_dollar0
     elsif File.readable?(file_or_dir)
-      # We use load in case we are reloading. 
+      # We use load in case we are reloading.
       # 'require' would not be effective here
       load file_or_dir
     else
@@ -68,7 +64,7 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
     end
   end
 
-  # Looks up cmd_array[0] in @commands and runs that. We do lots of 
+  # Looks up cmd_array[0] in @commands and runs that. We do lots of
   # validity testing on cmd_array.
   def run_cmd(cmd_array)
     unless cmd_array.is_a?(Array)
@@ -76,12 +72,12 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
       return
     end
     if cmd_array.detect{|item| !item.is_a?(String)}
-      errmsg "run_cmd argument Array should only contain strings. " + 
+      errmsg "run_cmd argument Array should only contain strings. " +
         "Got #{cmd_array.inspect}"
       return
     end
     if cmd_array.empty?
-      errmsg "run_cmd Array should have at least one item. " + 
+      errmsg "run_cmd Array should have at least one item. " +
         "Got: #{cmd_array.inspect}"
       return
     end
@@ -92,7 +88,7 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
   end
 
   def save_commands(opts)
-    save_filename = opts[:filename] || 
+    save_filename = opts[:filename] ||
       File.join(Dir.tmpdir, Dir::Tmpname.make_tmpname(['trepanning-save', '.txt'], nil))
     begin
       save_file = File.open(save_filename, 'w')
@@ -106,16 +102,16 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
       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 
+        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 
+          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 
+    save_file.puts "!FileUtils.rm #{save_filename.inspect}" if
       opts[:erase]
     save_file.close
 
@@ -129,90 +125,16 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
     # 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= klass.const_get(:ALIASES)
       aliases.each {|a| @aliases[a] = cmd_name}
     end
     @commands[cmd_name] = cmd
   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.
-  def complete(str, last_token)
-    @leading_str = str
-    next_blank_pos, token = Trepan::Complete.next_token(str, 0)
-    return [''] if token.empty? && !last_token.empty?
-    match_pairs = Trepan::Complete.complete_token_with_next(@commands,
-                                                            token)
-    match_hash = {}
-    match_pairs.each do |pair|
-      match_hash[pair[0]] = pair[1]
-    end
-    alias_pairs = Trepan::Complete.
-      complete_token_filtered_with_next(@aliases, token, match_hash,
-                                        @commands)
-    match_pairs += alias_pairs
-    if str[next_blank_pos..-1].empty?
-      return match_pairs.map{|pair| pair[0]}.sort
-    else
-      alias_pairs.each do |pair|
-        match_hash[pair[0]] = pair[1]
-      end
-    end
-    if match_pairs.size > 1
-      # FIXME: figure out what to do here.
-      # Matched multiple items in the middle of the string
-      # We can't handle this so do nothing.
-      return []
-      # return match_pairs.map do |name, cmd|
-      #   ["#{name} #{args[1..-1].join(' ')}"]
-      # end
-    end
-    # match_pairs.size == 1
-    next_complete(str, next_blank_pos, match_pairs[0][1], last_token)
-  end
-
-  def next_complete(str, next_blank_pos, cmd, last_token)
-    next_blank_pos, token = Trepan::Complete.next_token(str, next_blank_pos)
-    return [] if token.empty? && !last_token.empty?
-    
-    if cmd.respond_to?(:complete_token_with_next) 
-      match_pairs = cmd.complete_token_with_next(token)
-      return [] if match_pairs.empty?
-      if str[next_blank_pos..-1].rstrip.empty? && 
-          (token.empty? || token == last_token)
-        return match_pairs.map { |completion, junk| completion }
-      else
-        if match_pairs.size == 1
-          return next_complete(str, next_blank_pos, match_pairs[0][1], 
-                               last_token)
-        else
-          # FIXME: figure out what to do here.
-          # Matched multiple items in the middle of the string
-          # We can't handle this so do nothing.
-          return []
-        end
-      end
-    elsif cmd.respond_to?(:complete)
-      matches = cmd.complete(token)
-      return [] if matches.empty?
-      if str[next_blank_pos..-1].rstrip.empty? && 
-          (token.empty? || token == last_token)
-        return matches
-      else
-        # FIXME: figure out what to do here.
-        # Matched multiple items in the middle of the string
-        # We can't handle this so do nothing.
-        return []
-      end
-    else
-      return []
-    end
-  end
 end
 
 if __FILE__ == $0
@@ -222,14 +144,6 @@ if __FILE__ == $0
   end
 
   cmdproc = Trepan::CmdProcessor.new(nil)
-  cmddir = File.join(File.dirname(__FILE__), 'command')
-  cmdproc.instance_variable_set('@settings', {})
-  cmdproc.load_cmds_initialize
-  require 'columnize'
-  puts Columnize.columnize(cmdproc.commands.keys.sort)
-  puts '=' * 20
-  puts Columnize.columnize(cmdproc.aliases.keys.sort)
-  puts '=' * 20
 
   def cmdproc.errmsg(mess)
     puts "** #{mess}"
@@ -239,10 +153,16 @@ if __FILE__ == $0
     puts mess
   end
 
+  cmddir = File.join(File.dirname(__FILE__), 'command')
+  cmdproc.instance_variable_set('@settings', {})
+  cmdproc.load_cmds_initialize
+  require 'columnize'
+  puts Columnize.columnize(cmdproc.commands.keys.sort)
+  puts '=' * 20
+  puts Columnize.columnize(cmdproc.aliases.keys.sort)
+  puts '=' * 20
+
   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", 'd')
-  p cmdproc.complete("sho d", 'd')
-  p cmdproc.complete('', '')
 end

data/processor/location.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010-2011, 2013, 2015 Rocky Bernstein <rockyb@rubyforge.net>
 require 'rubygems'
 require 'linecache'
 require 'pathname'  # For cleanpath
@@ -32,39 +32,39 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
       'vm'             => 'VM',
       'vm-insn'        => '..',
       'yield'          => '<>',
-    } 
+    }
   end
 
   def canonic_container(container)
     [container[0], canonic_file(container[1])]
   end
-  
-  def canonic_file(filename, resolve=true)
-    # For now we want resolved filenames 
-    if @settings[:basename]
-      File.basename(filename)
-    elsif resolve
-      filename = LineCache::map_file(filename)
-      File.expand_path(Pathname.new(filename).cleanpath.to_s)
-    else
-      filename
+
+    def canonic_file(filename, resolve=true)
+        # For now we want resolved filenames
+        if @settings[:basename]
+            File.basename(filename)
+        elsif resolve
+            filename = LineCache::map_file(filename)
+            File.expand_path(Pathname.new(filename).cleanpath.to_s)
+        else
+            filename
+        end
     end
-  end
 
   # Return the text to the current source line.
   # FIXME: loc_and_text should call this rather than the other
   # way around.
   def current_source_text
     opts = {:reload_on_change => @reload}
-    junk1, junk2, text, found_line = 
-      loc_and_text('', frame, frame.source_location[0], 
+    junk1, junk2, text, found_line =
+      loc_and_text('', frame, frame.source_location[0],
                    frame.source_container, opts)
     text
   end
-  
+
   def resolve_file_with_dir(path_suffix)
     @settings[:directory].split(/:/).each do |dir|
-      dir = 
+      dir =
         if '$cwd' == dir
           Dir.pwd
         elsif '$cdir' == dir
@@ -78,7 +78,7 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
     end
     nil
   end
-  
+
   # Get line +line_number+ from file named +filename+. Return ''
   # if there was a problem. Leading blanks are stripped off.
   def line_at(filename, line_number,
@@ -87,12 +87,12 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
                 :output => @settings[:highlight]
               })
     line = LineCache::getline(filename, line_number, opts)
-    
+
     unless line
       # Try using search directories (set with command "directory")
       if filename[0..0] != File::SEPARATOR
-        try_filename = resolve_file_with_dir(filename) 
-        if try_filename && 
+        try_filename = resolve_file_with_dir(filename)
+        if try_filename &&
             line = LineCache::getline(try_filename, line_number, opts)
           LineCache::remap_file(filename, try_filename)
         end
@@ -103,89 +103,97 @@ class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
 
   def loc_and_text(loc, frame, line_no, source_container,
                    opts = {
-                     :reload_on_change => @settings[:reload],
-                     :output => @settings[:highlight]
+                       :reload_on_change => @settings[:reload],
+                       :output => @settings[:highlight]
                    })
-    found_line = true
-    ## FIXME: condition is too long.
-    if source_container[0] == 'string' && frame.iseq && frame.iseq.eval_source
-      file = LineCache::map_iseq(frame.iseq)
-      text = LineCache::getline(frame.iseq, line_no, opts)
-      loc += " remapped #{canonic_file(file)}:#{line_no}"
-    elsif source_container[0] != 'file'
-      via = loc
-      while source_container[0] != 'file' && frame.prev do
-        frame            = frame.prev
-        source_container = frame_container(frame, false)
-      end
-      if source_container[0] == 'file'
-        line_no      = frame.source_location[0]
-        filename     = source_container[1]
-        loc         += " via #{canonic_file(filename)}:#{line_no}"
-        text         = line_at(filename, line_no, opts)
-        found_line   = false
-      end
-    else
-      container = source_container[1]
-      map_file, map_line = LineCache::map_file_line(container, line_no)
-      if [container, line_no] != [map_file, map_line]
-        loc += " remapped #{canonic_file(map_file)}:#{map_line}"
+      found_line = true
+      ## FIXME: condition is too long.
+      if source_container[0] == 'string' && frame.iseq && frame.iseq.eval_source
+          file = LineCache::map_iseq(frame.iseq)
+          text = LineCache::getline(frame.iseq, line_no, opts)
+          loc += " remapped #{canonic_file(file)}:#{line_no}"
+      elsif source_container[0] != 'file'
+          via = loc
+          # while not (source_container[0] == 'file' and text_file?(source_container[1])) and
+          while not (source_container[0] == 'file') and
+                  frame.prev do
+              frame            = frame.prev
+              source_container = frame_container(frame, false)
+          end
+          if source_container[0] == 'file'
+              sloc = frame.source_location
+              line_no = sloc && sloc.size > 0 ? sloc[0] : '?'
+              filename     = source_container[1]
+              loc         += " via #{canonic_file(filename)}:#{line_no}"
+              text         = line_at(filename, line_no, opts)
+              found_line   = false
+          end
+      else
+          container = source_container[1]
+          map_file, map_line = LineCache::map_file_line(container, line_no)
+          if [container, line_no] != [map_file, map_line]
+              loc += " remapped #{canonic_file(map_file)}:#{map_line}"
+          end
+
+          text  = line_at(container, line_no, opts)
       end
-      
-      text  = line_at(container, line_no, opts)
-    end
-    [loc, line_no, text, found_line]
+      [loc, line_no, text, found_line]
   end
-  
+
   def print_location
-    if %w(c-call call).member?(@event)
-      # FIXME: Fix Ruby so we don't need this workaround? 
-      # See also where.rb
-      opts = {}
-      opts[:class] = @core.hook_arg if 
-        'CFUNC' == @frame.type && @core.hook_arg && 0 == @frame_index 
-      msg format_stack_call(@frame, opts) 
-    elsif 'raise' == @event
-      msg @core.hook_arg.inspect if @core.hook_arg # Exception object
-    end
-    
-    text      = nil
-    source_container = frame_container(@frame, false)
-    ev        = if @event.nil? || 0 != @frame_index
-                  '  ' 
-                else
-                  (EVENT2ICON[@event] || @event)
-                end
-    @line_no  = frame_line
-    
-    loc = source_location_info(source_container, @line_no, @frame)
-    loc, @line_no, text, found_line = 
-      loc_and_text(loc, @frame, @line_no, source_container)
-    
-    ip_str = @frame.iseq ? " @#{frame.pc_offset}" : ''
-    msg "#{ev} (#{loc}#{ip_str})"
-    
-    if %w(return c-return).member?(@event)
-      retval = Trepan::Frame.value_returned(@frame, @event)
-      msg 'R=> %s' % retval.inspect 
-    end
-    
-    if text && !text.strip.empty?
-      msg text
-      @line_no -= 1
-    end
-    unless found_line
-      # Can't find source line, so give assembly as consolation.
-      # This great idea comes from the Rubinius reference debugger.
-      run_command('disassemble')
-    end
+      if %w(c-call call).member?(@event)
+          # FIXME: Fix Ruby so we don't need this workaround?
+          # See also where.rb
+          opts = {}
+          opts[:class] = @core.hook_arg if
+              'CFUNC' == @frame.type && @core.hook_arg && 0 == @frame_index
+          msg format_stack_call(@frame, opts)
+      elsif 'raise' == @event
+          msg @core.hook_arg.inspect if @core.hook_arg # Exception object
+      end
+
+      text      = nil
+      source_container = frame_container(@frame, false)
+      ev        = if @event.nil? || 0 != @frame_index
+                      '  '
+                  else
+                      (EVENT2ICON[@event] || @event)
+                  end
+      @line_no  = frame_line
+
+      loc = source_location_info(source_container, @line_no, @frame)
+      loc, @line_no, text, found_line =
+          loc_and_text(loc, @frame, @line_no, source_container)
+
+      ip_str = @frame.iseq ? " @#{frame.pc_offset}" : ''
+      msg "#{ev} (#{loc}#{ip_str})"
+
+      if %w(return c-return).member?(@event)
+          retval = Trepan::Frame.value_returned(@frame, @event)
+          msg 'R=> %s' % retval.inspect
+      elsif @event == 'raise'
+          # msg @proc.core.hook_arg.inspect if @proc.core.hook_arg
+          if @frame.iseq and @frame.iseq.catch_table_size == 0
+              msg "Warning: exception raised is non-local!"
+          end
+      end
+
+      if text && !text.strip.empty?
+          msg text
+          @line_no -= 1
+      end
+      unless found_line
+          # Can't find source line, so give assembly as consolation.
+          # This great idea comes from the Rubinius reference debugger.
+          run_command('disassemble')
+      end
   end
-  
+
   def source_location_info(source_container, line_no, frame)
     filename  = source_container[1]
     ## FIXME: condition is too long.
-    canonic_filename = 
-      if 'string' == source_container[0] && frame.iseq && 
+    canonic_filename =
+      if 'string' == source_container[0] && frame.iseq &&
           frame.iseq.eval_source
         eval_str = frame.iseq.eval_source
         'eval "' + safe_repr(eval_str.gsub(/\n/,';'), 15) + '"'