trepanning 0.1.0 → 0.1.1

data/app/complete.rb

@@ -0,0 +1,79 @@
+# Copyright (C) 2011 Rocky Bernstein <rockyb@rubyforge.net>
+
+class Trepan
+
+  # Command completion methods
+  module Complete
+
+    module_function
+
+    # Return an Array of String found from Array of String
+    # +complete_ary+ which start out with String +prefix+.
+    def complete_token(complete_ary, prefix)
+      complete_ary.select { |cmd| cmd.to_s.start_with?(prefix) }.sort
+    end
+    
+    def complete_token_with_next(complete_hash, prefix, cmd_prefix='')
+      result = []
+      complete_hash.each do |cmd_name, cmd_obj| 
+        result << [cmd_name.to_s[cmd_prefix.size..-1], cmd_obj] if 
+          cmd_name.to_s.start_with?(cmd_prefix + prefix)
+      end
+      result.sort{|a, b| a[0] <=> b[0]}
+    end
+    
+    # Find all starting matches in Hash +aliases+ that start with +prefix+,
+    # but filter out any matches already in +expanded+.
+    def complete_token_filtered(aliases, prefix, expanded)
+      complete_ary = aliases.keys
+      complete_ary.select { |cmd| 
+        cmd.to_s.start_with?(prefix) && ! expanded.member?(aliases[cmd])}.sort
+    end
+
+    # Find all starting matches in Hash +aliases+ that start with +prefix+,
+    # but filter out any matches already in +expanded+.
+    def complete_token_filtered_with_next(aliases, prefix, expanded,
+                                          commands)
+      complete_ary = aliases.keys
+      expanded_ary = expanded.keys
+      result = []
+      complete_ary.each do |cmd| 
+        if cmd.to_s.start_with?(prefix) && 
+            !expanded_ary.member?(aliases[cmd])
+          result << [cmd, commands[aliases[cmd]]] 
+        end
+      end
+      result
+    end
+
+    # Find the next token in str string from start_pos, we return
+    # the token and the next blank position after the token or 
+    # str.size if this is the last token. Tokens are delimited by
+    # white space.
+    def next_token(str, start_pos)
+      look_at = str[start_pos..-1]
+      next_nonblank_pos = start_pos + (look_at =~ /\S/ || 0)
+      next_blank_pos = 
+        if next_match = str[next_nonblank_pos..-1] =~ /\s/
+          next_nonblank_pos + next_match 
+        else
+          str.size
+        end
+      return [next_blank_pos, str[next_nonblank_pos...next_blank_pos]]
+    end
+    
+  end
+end
+
+if __FILE__ == $0
+  include Trepan::Complete
+  hash = {'ab' => 1, 'aac' => 2, 'aa' => 3, 'b' => 4}
+  p complete_token(hash.keys, 'a')
+  p complete_token_with_next(hash, 'a')
+  ##   0         1
+  ##   0123456789012345678
+  x = '  now is  the  time'
+  [0, 2, 5, 8, 9, 13, 19].each do |pos|
+    p next_token(x, pos)
+  end
+end

data/app/condition.rb

@@ -4,7 +4,7 @@ class Trepan
     def valid_condition?(str)
       begin
         RubyVM::InstructionSequence.compile(str)
-      rescue SyntaxError
+      rescue SyntaxError => e
         return nil
       rescue
         nil

data/app/core.rb

@@ -42,7 +42,8 @@ class Trepan
       STEPPING_EVENT_MASK = 
         LINE_EVENT_MASK     | CLASS_EVENT_MASK    | CALL_EVENT_MASK     |
         RETURN_EVENT_MASK   | C_CALL_EVENT_MASK   | C_RETURN_EVENT_MASK |
-        INSN_EVENT_MASK     | BRKPT_EVENT_MASK
+        INSN_EVENT_MASK     | BRKPT_EVENT_MASK    | YIELD_EVENT_MASK    |
+        LEAVE_EVENT_MASK    | SEND_EVENT_MASK
 
       ASYNC_EVENT_MASK = 
         RAISE_EVENT_MASK    | VM_EVENT_MASK       | SWITCH_EVENT_MASK
@@ -54,17 +55,12 @@ class Trepan
         :step_count        => 0,                # Stop at next event
         :async_events      => ASYNC_EVENT_MASK,
 
-        # FIXME:
-        # Somewhere inside the VM we allow I guess nested tracing which is messing
-        # up ThreadFrame pointers and information. When this is fixed we can do the below.
-        # Until then we need to at least remove C calls and returns and possibly other
-        # events as well.
-        # :step_events       =>  
-	# (DEFAULT_EVENT_MASK | INSN_EVENT_MASK)
-
+        # Not sure what the "right" set really is. The below is just
+        # a guess. Use "set events" or customize in ~/.trepanrc
         :step_events       =>  
-	(DEFAULT_EVENT_MASK | INSN_EVENT_MASK) &
-	~(C_CALL_EVENT_MASK | C_RETURN_EVENT_MASK)
+#	(DEFAULT_EVENT_MASK | INSN_EVENT_MASK) &
+	(DEFAULT_EVENT_MASK ) &
+	~(C_CALL_EVENT_MASK | C_RETURN_EVENT_MASK | SEND_EVENT_MASK)
       } 
 
     end

data/app/default.rb

@@ -20,7 +20,6 @@ class Trepan
 
     :restart_argv    => RubyVM::OS_ARGV,
                                # Command run when "restart" is given.
-    :restore_profile => nil,   # Profile used to set/restore debugger state
     :server          => false, # Out-of-process debugging?
   } unless defined?(DEFAULT_SETTINGS)
 
@@ -33,6 +32,7 @@ class Trepan
     :port     => DEFAULT_SETTINGS[:port],
     :host     => DEFAULT_SETTINGS[:host], 
     :server   => false, # Out-of-process debugging?
+    :readline => true,  # Try to use GNU Readline?
     # Note that at most one of :server or :client can be true.
   } unless defined?(DEFAULT_CMDLINE_SETTINGS)
 

data/app/disassemble.rb

@@ -6,12 +6,13 @@
 
 class Trepan
   module Disassemble
+    # FIXME: turn final optional params into a hash.
     def mark_disassembly(disassembly_str, iseq_equal, pc_offset,
                          brkpt_offsets=[], max_width=80, highlight=nil)
 
       if highlight
         require_relative '../app/yarv'
-        highlighter = CodeRay::Duo[:yarv, :term]
+        @highlighter ||= CodeRay::Duo[:yarv, :term]
       end
 
       dis_array = disassembly_str.split(/\n/)
@@ -44,7 +45,7 @@ class Trepan
           line_padding = ' ' * (line_padding.size - shrink_amount)
         end
         if highlight && prefix != ''
-          prefix + highlighter.encode(line_begin + line_padding + line_end)
+          prefix + @highlighter.encode(line_begin + line_padding + line_end)
         else
           prefix + line_begin + line_padding + line_end
         end

data/app/file.rb

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 # Things related to file/module status
 require 'thread_frame'
+require_relative 'iseq'
 
 SCRIPT_ISEQS__ = {} unless 
   defined?(SCRIPT_ISEQS__) && SCRIPT_ISEQS__.is_a?(Hash)
@@ -45,11 +46,6 @@ module Trepanning
     return [scripts, rejected]
   end
 
-  def find_scripts(filename)
-    filename_pat = file_match_pat(filename)
-    return SCRIPT_ISEQS__.keys.grep(/#{filename_pat}/)
-  end
-
   def find_iseqs(iseqs_hash, name)
     iseq_name, filename = name.split(/@/)
     return [] unless iseqs_hash.member?(iseq_name)
@@ -66,42 +62,19 @@ module Trepanning
   def find_iseqs_with_lineno(filename, lineno)
     files = find_scripts(filename)
     files.each do |file|
-      found = 
-        SCRIPT_ISEQS__[file].detect do |iseq|
-        iseq.offsetlines.values.flatten.uniq.member?(lineno)
+      SCRIPT_ISEQS__[file].each do |iseq|
+        found_iseq = find_iseq_with_line_from_iseq(iseq, lineno, true)
+        return found_iseq if found_iseq
       end
-      return found if found
     end
     return nil
   end
 
-  # parse_position(errmsg, arg)->(fn, name, lineno)
-  #    
-  #  Parse arg as [filename|module:]lineno
-  #  Make sure it works for C:\foo\bar.rb:12
-  def parse_position(errmsg, arg)
-    colon = arg.rindex(':') 
-    if colon
-      # FIXME: Handle double colons, e.g. File::open
-      filename = arg[0..colon-1].rstrip
-      m, f = lookupmodule(filename)
-      if not f
-        errmsg.call("'%s' not found using sys.path" % filename)
-        return nil, nil, nil
-      else
-        filename = f
-        arg = arg[colon+1..-1].lstrip
-      end
-      begin
-        lineno = Integer(arg)
-      rescue 
-        errmsg.call("Bad line number: %s", arg)
-        return nil, filename, nil
-      end
-      return nil, filename, lineno
-    end
-    return nil, nil, nil
+  def find_scripts(filename)
+    filename_pat = file_match_pat(filename)
+    return SCRIPT_ISEQS__.keys.grep(/#{filename_pat}/)
   end
+
 end
 # Demo it
 if __FILE__ == $0
@@ -131,5 +104,8 @@ if __FILE__ == $0
     p rejected.keys
     puts '-' * 20
     p SCRIPT_ISEQS__.keys
+    # require_relative '../lib/trepanning'; debugger
+    p find_iseqs_with_lineno(__FILE__, __LINE__)
+    p find_iseqs(ISEQS__, 'find_scripts')
   end
 end

data/app/frame.rb

@@ -1,8 +1,9 @@
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 require_relative 'util'
 
 class Trepan
-
+  
+  # Call-Stack frame methods
   module Frame
 
     DEFAULT_STACK_TRACE_SETTINGS = {

data/app/irb.rb

@@ -44,7 +44,11 @@ module IRB # :nodoc:
             opts.join(' ')
           end
         dbg_cmdproc = conf.workspace.instance_variable_get('@dbg_cmdproc')
-        dbg_cmdproc.run_command($trepan_command)
+        if dbg_cmdproc
+          dbg_cmdproc.run_command($trepan_command) 
+        else
+          puts "Something's wrong with debugger setup of irb"
+        end
       end
     end
 
@@ -69,7 +73,7 @@ module IRB # :nodoc:
   def self.start_session(binding, dbg_cmdproc, conf={})
     unless @__initialized
 
-      # Set to run the standard rbdbgr IRB profile
+      # Set to run the standard trepan IRB profile
       irbrc = File.expand_path(File.join(File.dirname(__FILE__), 
                                          %w(.. data irbrc)))
       ENV['IRBRC'] = irbrc
@@ -80,8 +84,8 @@ module IRB # :nodoc:
       ARGV.replace(args)
       
       # If the user has a IRB profile, run that now.
-      if ENV['RBDBGR_IRB']
-        ENV['IRBRC'] = ENV['RBDBGR_IRB']
+      if ENV['TREPAN_IRB']
+        ENV['IRBRC'] = ENV['TREPAN_IRB']
         @CONF[:RC_NAME_GENERATOR]=nil
         IRB.run_config
       end
@@ -90,7 +94,7 @@ module IRB # :nodoc:
     end
     
     workspace = WorkSpace.new(binding)
-    workspace.instance_variable_set('@dbg_cmdproc', dbg_cmdproc)
+    # workspace.instance_variable_set('@dbg_cmdproc', dbg_cmdproc)
 
     irb = Irb.new(workspace)
 

data/app/iseq.rb

@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Things related to RubyVM::InstructionSequence's
+
+module Trepanning
+  # Returns a RubyVM::Instruction for the specified line. We search the
+  # current instruction sequence +iseq+ and then up the parent scope.  If we hit
+  # the top and we can't find +line+ that way, then we
+  # reverse the search from the top and search down. This will add
+  # all siblings of ancestors of +meth+.
+  # Similar to rbx-trepanning method "find_method_with_line".
+  def find_iseq_with_line_from_iseq(iseq, lineno, go_up=true)
+    find_iseq_with_line_from_iseq2(iseq, lineno, go_up, {})
+  end
+
+  def find_iseq_with_line_from_iseq2(iseq, lineno, go_up, seen)
+    return iseq if iseq.offsetlines.values.flatten.uniq.member?(lineno)
+    seen[iseq] = true
+    prev_iseq = iseq
+    while prev_iseq = prev_iseq.parent
+      iseq = prev_iseq
+      return iseq if iseq.offsetlines.values.flatten.uniq.member?(lineno)
+    end if go_up
+    # At top and not found so now go down..
+    iseq.child_iseqs.each do |child_iseq|
+      next if seen[child_iseq] # we tried before
+      # puts "#{child_iseq.name}, #{child_iseq}"
+      result = find_iseq_with_line_from_iseq2(child_iseq, lineno, false, seen)
+      return result if result
+    end
+    return nil
+  end
+
+end
+# Demo it
+# if __FILE__ == $0
+#   require 'thread_frame'
+#   include Trepanning
+#   if !(ARGV.size == 1 && ARGV[0] == 'noload')
+#     ISEQS__        = {}
+#     SCRIPT_ISEQS__ = {}
+#     ARGV[0..-1]    = ['noload']
+#     load(__FILE__)
+#   else    
+#   end
+# end

data/app/options.rb

@@ -3,33 +3,12 @@
 # Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 #=== Summary
 # Parses command-line options. 
-#=== Options
-#
-#<tt>--cd=DIR</tt>
-#      Change current directory to DIR.
-#
-#<tt>--command</tt> <i>file</i>::
-#      Run debugger command file <i>file</i>
-#
-#<tt>--nx</tt>::
-#      Don’t execute commands  found in any initialization
-#      files, e.g. <tt>.rdebugrc</tt>.
-#
-#<tt>--restore=PROFILE</tt>::
-#      Debugger command file which restores debugger settings,
-#      resumably saved before a 'restart' debugger command.
-#
-#<tt>--version</tt>::
-#      Show the version number.
-#
-#<tt>--help</tt>::
-#      Show invocation help and exit.
 
 require 'optparse'
 class Trepan
   require_relative 'default'
 
-  Trepan::VERSION = '0.1.0'
+  Trepan::VERSION = '0.1.1'
   Trepan::PROGRAM = 'trepan'
 
   def self.show_version
@@ -102,13 +81,6 @@ EOB
         |num| 
         options[:port] = num
       end
-      opts.on("--restore PROFILE", String, 
-              "Restore debugger state using PROFILE") do |profile|
-        if File.readable?(profile)
-          options[:restore_profile] = profile
-          stderr.puts "Debugger command file #{profile} is not readable. --restore option ignored."
-        end
-      end
       opts.on('--server',
               "Set up for out-of-process debugging") do
         if options[:client]
@@ -118,9 +90,13 @@ EOB
         end
       end
       opts.on('--[no-]highlight',
-              "Set output for terminal highlighting") do |v|
+              "Use [no] syntax highlight output") do |v|
         options[:highlight] = ((v) ? :term : nil)
       end
+      opts.on('--[no-]readline',
+              "Try [not] GNU Readline") do |v|
+        options[:readline] = v
+      end
       opts.on_tail("-?", "--help", "Show this message") do
         options[:help] = true
         stdout.puts opts

data/app/run.rb

@@ -9,7 +9,7 @@ module Trepanning
   # The caller must ensure that ARGV is set up to remove any debugger
   # arguments or things that the debugged program isn't supposed to
   # see.  FIXME: Should we make ARGV an explicit parameter?
-  def debug_program(dbgr, ruby_path, program_to_debug)
+  def debug_program(dbgr, ruby_path, program_to_debug, start_opts={})
 
     # Make sure Ruby script syntax checks okay.
     # Otherwise we get a load message that looks like trepanning has 
@@ -37,7 +37,10 @@ module Trepanning
     dbgr.debugger(:hide_stack=>true) do
       dbgr.core.processor.hidelevels[Thread.current] = 
         RubyVM::ThreadFrame.current.stack_size + 1
-      Kernel::load program_to_debug
+      begin
+        Kernel::load program_to_debug
+      rescue Interrupt
+      end
     end
 
     # The dance we have to undo to restore $0 and undo the mess created

data/app/util.rb

@@ -3,6 +3,7 @@
 class Trepan
   module Util
 
+    module_function 
     def safe_repr(str, max, elipsis='... ')
       if str.is_a?(String) && str.size > max && !str.index("\n")
         "%s%s%s" % [ str[0...max/2], elipsis,  str[str.size-max/2..str.size]]
@@ -10,8 +11,6 @@ class Trepan
         str
       end
     end
-    module_function :safe_repr
-    
   end
 end