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

data/processor/mock.rb

@@ -2,7 +2,7 @@
 # Mock setup for commands.
 require 'rubygems'; require 'require_relative'
 
-require_relative 'main'
+require_relative '../processor'
 
 # require_relative '../app/core'
 require_relative '../app/default'
@@ -83,12 +83,6 @@ module MockDebugger
     def cmd.confirm(prompt, default)
       true
     end
-    def cmd.errmsg(message, opts={})
-      puts "Error: #{message}"
-    end
-    def cmd.msg(message, opts={})
-      puts message
-    end
     def cmd.msg_nocr(message, opts={})
       print message
     end

data/processor/msg.rb

@@ -2,59 +2,73 @@
 # I/O related command processor methods
 require 'rubygems'; require 'require_relative'
 require_relative '../app/util'
-class Trepan
-  class CmdProcessor
-    attr_accessor :ruby_highlighter
+require_relative 'virtual'
 
-    def errmsg(message, opts={})
-      message = safe_rep(message) unless opts[:unlimited]
-      if @settings[:highlight] && defined?(Term::ANSIColor)
-        message = 
-          Term::ANSIColor.italic + message + Term::ANSIColor.reset 
-      end
-      @dbgr.intf[-1].errmsg(message)
-    end
+begin require 'term/ansicolor'; rescue LoadError; end
 
-    def msg(message, opts={})
-      message = safe_rep(message) unless opts[:unlimited]
-      @dbgr.intf[-1].msg(message)
-    end
+class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
+  attr_accessor :ruby_highlighter
+
+  def confirm(msg, default)
+    @settings[:confirm] ? @dbgr.intf[-1].confirm(msg, default) : true
+  end
 
-    def msg_nocr(message, opts={})
+  def errmsg(message, opts={})
+    if message.kind_of?(Array)
+      message.each do |mess|
+        errmsg(mess, opts)
+      end
+      return
+    else
       message = safe_rep(message) unless opts[:unlimited]
-      @dbgr.intf[-1].msg_nocr(message)
     end
-
-    def read_command()
-      @dbgr.intf[-1].read_command(@prompt)
+    if @settings[:highlight] && defined?(Term::ANSIColor)
+      message = 
+        Term::ANSIColor.italic + message + Term::ANSIColor.reset 
     end
+    @dbgr.intf[-1].errmsg(message)
+  end
 
-    def ruby_format(text)
-      return text unless settings[:highlight]
-      unless @ruby_highlighter
-        begin
-          require 'coderay'
-          require 'term/ansicolor'
-          @ruby_highlighter = CodeRay::Duo[:ruby, :term]
-        rescue LoadError
-          return text
-        end
-      end
-      return @ruby_highlighter.encode(text)
-    end
+  def msg(message, opts={})
+    message = safe_rep(message) unless opts[:unlimited]
+    message = ruby_format(message) if opts[:code]
+    @dbgr.intf[-1].msg(message)
+  end
 
-    def safe_rep(str)
-      Util::safe_repr(str, @settings[:maxstring])
-    end
+  def msg_nocr(message, opts={})
+    message = safe_rep(message) unless opts[:unlimited]
+    @dbgr.intf[-1].msg_nocr(message)
+  end
 
-    def section(message, opts={})
-      message = safe_rep(message) unless opts[:unlimited]
-      if @settings[:highlight] && defined?(Term::ANSIColor)
-        message = 
-          Term::ANSIColor.bold + message + Term::ANSIColor.reset 
+  def read_command()
+    @dbgr.intf[-1].read_command(@prompt)
+  end
+
+  def ruby_format(text)
+    return text unless settings[:highlight]
+    unless @ruby_highlighter
+      begin
+        require 'coderay'
+        require 'term/ansicolor'
+        @ruby_highlighter = CodeRay::Duo[:ruby, :term]
+      rescue LoadError
+        return text
       end
-      @dbgr.intf[-1].msg(message)
     end
+    return @ruby_highlighter.encode(text)
+  end
 
+  def safe_rep(str)
+    Trepan::Util::safe_repr(str, @settings[:maxstring])
   end
+
+  def section(message, opts={})
+    message = safe_rep(message) unless opts[:unlimited]
+    if @settings[:highlight] && defined?(Term::ANSIColor)
+      message = 
+        Term::ANSIColor.bold + message + Term::ANSIColor.reset 
+    end
+    @dbgr.intf[-1].msg(message)
+  end
+
 end

data/processor/running.rb

@@ -1,10 +1,9 @@
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
-require 'rubygems'; require 'require_relative'
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 require 'set'
-## require_relative '../app/core'
+require 'rubygems'; require 'require_relative'
+require_relative 'virtual'
 class Trepan
-  class CmdProcessor
-
+  class CmdProcessor < VirtualCmdProcessor
 
     attr_accessor :ignore_file_re  # Hash[file_re] -> String
                                    # action. File re's we don't want
@@ -35,6 +34,8 @@ class Trepan
     # # FIXME: turn line_number into a condition.
 
     def continue(return_to_program)
+      @next_level      = 32000 # I'm guessing the stack size can't
+                               # ever reach this
       @next_thread     = nil
       @step_count      = -1    # No more event stepping
       if 'step-finish' == return_to_program
@@ -46,10 +47,11 @@ class Trepan
 
     # Does whatever setup needs to be done to set to ignore stepping
     # to the finish of the current method. Elsewhere in
-    # "skipping_step?" we do the checking.
+    # "stepping_skip?" we do the checking.
     def finish(level_count=0, opts={})
       step_to_return_or_yield
       continue('finish')
+      @next_level        = @stack_size - level_count
       @next_thread       = @current_thread
 
       @step_count = 2 if 'nostack' == opts[:different_pos]
@@ -62,15 +64,16 @@ class Trepan
     def step_finish
       step_to_return_or_yield
       continue('step')
-      @next_thread       = @current_thread
+      @next_thread     = @current_thread
     end
 
-    # # Does whatever needs to be done to set to "next" program
-    # # execution.
-    # def next(step_count=1, opts={})
-    #   step(step_count, opts)
-    #   @next_thread     = Thread.current
-    # end
+    # Does whatever needs to be done to set to "next" program
+    # execution.
+    def next(step_count=1, opts={})
+      step('step', step_count, opts)
+      @next_level      = opts[:next_level] || @stack_size
+      @next_thread     = Thread.current
+    end
 
     # Does whatever needs to be done to set to step program
     # execution.
@@ -136,8 +139,16 @@ class Trepan
     # like the @settings[:different] are met.
     def stepping_skip?
 
-      debug_loc = "#{frame.vm_location.describe} #{frame.line}" if  
-        @settings[:debugskip]
+      if @settings[:'debugskip']
+        puts "diff: #{@different_pos}, event : #{@event}, #{@stop_events.inspect}" 
+        puts "step_count  : #{@step_count}" 
+        puts "next_level  : #{@next_level},    ssize : #{@stack_size}" 
+        puts "next_thread : #{@next_thread},   thread: #{Thread.current}" 
+      end
+
+      return true if 
+        !frame || (@next_level < @stack_size &&
+                   Thread.current == @next_thread && @event != 'raise')
 
       if @step_count < 0  
         # We may eventually stop for some other reason, but it's not

data/processor/stepping.rb

@@ -1,7 +1,8 @@
 require 'rubygems'; require 'require_relative'
 require_relative '../app/iseq'
+require_relative 'virtual'
 class Trepan
-  class CmdProcessor
+  class CmdProcessor < VirtualCmdProcessor
 
     def stepping_initialize
       @step_brkpts  = []

data/processor/subcmd.rb

@@ -1,6 +1,7 @@
 # Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 # gdb-like subcommand processing.
 
+### FIXME: move into command/base/submgr.rb
 class Trepan
   class Subcmd
 
@@ -14,17 +15,24 @@ class Trepan
     
     # Find subcmd in self.subcmds
     def lookup(subcmd_prefix, use_regexp=true)
-      compare = if use_regexp 
-                  lambda{|name| name.to_s =~ /^#{subcmd_prefix}/}
-                else
-                  lambda{|name| 0 == name.to_s.index(subcmd_prefix)}
-                end
+      compare = 
+        if !@cmd.settings[:abbrev]
+          lambda{|name| name.to_s == subcmd_prefix}
+        elsif use_regexp 
+          lambda{|name| name.to_s =~ /^#{subcmd_prefix}/}
+        else
+          lambda{|name| 0 == name.to_s.index(subcmd_prefix)}
+        end
+      candidates = []
       @subcmds.each do |subcmd_name, subcmd|
         if compare.call(subcmd_name) &&
             subcmd_prefix.size >= subcmd.class.const_get(:MIN_ABBREV)
-          return subcmd
+          candidates << subcmd
         end
       end
+      if candidates.size == 1
+        return candidates.first
+      end
       return nil
     end
 
@@ -55,53 +63,20 @@ class Trepan
     # so we might not want to show that.
     def add(subcmd_cb, subcmd_name=nil)
       subcmd_name ||= subcmd_cb.name
-      @subcmds[subcmd_name.to_s] = subcmd_cb
+      @subcmds[subcmd_name] = subcmd_cb
 
       # We keep a list of subcommands to assist command completion
       @cmdlist << subcmd_name
     end
 
-    # Run subcmd_name with args using obj for the environent
-    def run( subcmd_name, arg)
-      entry=lookup(subcmd_name)
-      if entry
-        entry['callback'].send(arg)
-      else
-        @proc.undefined_cmd(entry.__class__.name, subcmd_name)
-      end
-    end
-
     # help for subcommands
     # Note: format of help is compatible with ddd.
     def help(*args)
-
-      msg args
-      subcmd_prefix = args[0]
-      if not subcmd_prefix or subcmd_prefix.size == 0
-        @proc.msg(self.doc)
-        @proc.msg("\nList of %s subcommands:\n" % [@name])
-        @list.each do |subcmd_name|
-          subcmd_helper(subcmd_name, obj, true, true)
-        end
-
-        entry = lookup(subcmd_prefix)
-        if entry and entry.respond_to? :help
-          entry.help(args)
-        else
-          @proc.errmsg("Unknown 'help %s' subcommand %s" %
-                       [@name, subcmd_prefix])
-        end
-      end
+      # Not used but tested for.
     end
 
     def list
-      @subcmds.keys.sort
-    end
-    
-    # Error message when a subcommand doesn't exist.
-    def undefined_subcmd(cmd, subcmd)
-      @proc.errmsg('Undefined "%s" command: "%s". Try "help".' % 
-                   [cmd, subcmd])
+      @subcmds.keys.map{|k| k.to_s}.sort
     end
   end
 end
@@ -111,7 +86,7 @@ if __FILE__ == $0
 
   require 'rubygems'; require 'require_relative'
   require_relative 'mock'
-  require_relative 'command/base/cmd'
+  require_relative 'command'
 
   class Trepan::TestCommand < Trepan::Command
     

data/processor/validate.rb

@@ -9,29 +9,34 @@ require 'linecache'
 
 require_relative '../app/cmd_parse'
 require_relative '../app/condition'
+require_relative '../app/file'
 require_relative '../app/method'
 require_relative '../app/validate'
 
 require_relative 'location' # for resolve_file_with_dir
 require_relative 'msg'      # for errmsg, msg
+require_relative 'virtual'
 
 class Trepan
-  class CmdProcessor
+  class CmdProcessor < Trepan::VirtualCmdProcessor
 
     attr_reader :dbgr_script_iseqs
     attr_reader :dbgr_iseqs
-
+    attr_reader :file_exists_proc  # Like File.exists? but checks using
+    # cached files
+    
     include Trepanning::Method
+    include Trepanning::FileName
     include Trepan::Validate
     ## include Trepan::ThreadHelper
     include Trepan::Condition
-
+    
     def confirm(msg, default)
       @settings[:confirm] ? @dbgr.intf[-1].confirm(msg, default) : true
     end
-
-    # Like cmdfns.get_an_int(), but if there's a stack frame use that
-    # in evaluation.
+    
+    # Check that arg is an Integer between opts[:min_value] and
+    # opts[:max_value]
     def get_an_int(arg, opts={})
       ret_value = get_int_noerr(arg)
       if !ret_value
@@ -53,12 +58,12 @@ class Trepan
       end
       return ret_value
     end
-
+    
     unless defined?(DEFAULT_GET_INT_OPTS)
       DEFAULT_GET_INT_OPTS = {
         :min_value => 0, :default => 1, :cmdname => nil, :max_value => nil}
     end
-
+    
     # If argument parameter 'arg' is not given, then use what is in
     # opts[:default]. If String 'arg' evaluates to an integer between
     # least min_value and at_most, use that. Otherwise report an
@@ -103,7 +108,7 @@ class Trepan
       end
       return val
     end
-
+    
     def get_int_list(args, opts={})
       args.map{|arg| get_an_int(arg, opts)}.compact
     end
@@ -118,7 +123,7 @@ class Trepan
     rescue 
       nil
     end
-
+    
     def get_thread_from_string(id_or_num_str)
       if id_or_num_str == '.'
         Thread.current
@@ -133,20 +138,21 @@ class Trepan
         end
       end
     end
-
+    
     def position_to_line_and_offset(cm, filename, position, offset_type)
       case offset_type
       when :line
         vm_offset = cm.first_ip_on_line(position, -2)
         line_no   =  position
       when :offset
+        position = position.position unless position.kind_of?(Fixnum)
         line_no   = cm.line_from_ip(position)
         vm_offset = position
       when nil
         vm_offset, line_no = 
           if cm.lines[0] == -1
-            [cm.lines[2], cm.lines.size > 3 ? cm.lines[3] : cm.lines[1]]
-           else
+            [cm.lines[0], cm.lines.size > 3 ? cm.lines[3] : cm.lines[1]]
+          else
             [cm.lines[0], cm.lines[1]]
           end
       else
@@ -155,7 +161,7 @@ class Trepan
       end
       return [line_no, vm_offset]
     end
-
+    
     # Parse a breakpoint position. On success return:
     #   - the CompileMethod the position is in
     #   - the line number - a Fixnum
@@ -185,7 +191,7 @@ class Trepan
       errmsg("Unable to get breakpoint position for #{position_str}")
       return [nil] * 5
     end
-
+    
     # Return true if arg is 'on' or 1 and false arg is 'off' or 0.
     # Any other value is raises TypeError.
     def get_onoff(arg, default=nil, print_error=true)
@@ -201,14 +207,14 @@ class Trepan
       darg = arg.downcase
       return true  if arg == '1' || darg == 'on'
       return false if arg == '0' || darg =='off'
-
+      
       errmsg("Expecting 'on', 1, 'off', or 0. Got: %s." % arg.to_s) if
         print_error
       raise TypeError
     end
-
-    include CmdParser
-
+    
+    include Trepan::CmdParser
+    
     def get_method(meth)
       start_binding = 
         begin
@@ -227,14 +233,14 @@ class Trepan
         end
       end
     end
-
+    
     # FIXME: this is a ? method but we return 
     # the method value. 
     def method?(meth)
       get_method(meth)
     end
-
-    # parse_position(self, arg)->(meth, filename, offset, offset_type)
+    
+    # parse_position(self)->(meth, filename, offset, offset_type)
     # See app/cmd_parser.kpeg for the syntax of a position which
     # should include things like:
     # Parse arg as [filename:]lineno | function | module
@@ -258,9 +264,10 @@ class Trepan
         filename = canonic_file(info.container)
         cm = 
           if canonic_file(@frame.file) == filename 
-            cm = @frame.method
             if :line == info.position_type
-              find_method_with_line(cm, info.position)
+              find_method_with_line(@frame.method, info.position)
+            else
+              @frame.method
             end
           else 
             LineCache.compiled_method(filename)
@@ -286,7 +293,7 @@ class Trepan
         return [nil] * 4
       end
     end
-
+    
     def parse_method(meth_str)
       begin 
         meth_for_string(meth_str, @frame.binding)
@@ -296,17 +303,24 @@ class Trepan
         nil
       end
     end
-
+    
     def validate_initialize
       ## top_srcdir = File.expand_path(File.join(File.dirname(__FILE__), '..'))
       ## @dbgr_script_iseqs, @dbgr_iseqs = filter_scripts(top_srcdir)
+      @file_exists_proc = Proc.new {|filename|
+        if LineCache.cached?(filename) || LineCache.cached_script?(filename) ||
+            (File.readable?(filename) && !File.directory?(filename))
+          true
+        else
+          find_load_path(filename)
+        end
+      }
     end
   end
 end
 
 if __FILE__ == $0
   # Demo it.
-  # FIXME have to pull in main for its initalize routine
   DIRNAME = File.dirname(__FILE__)
   load File.join(DIRNAME, 'main.rb')
 
@@ -319,9 +333,6 @@ if __FILE__ == $0
     puts "get_int_noerr(#{val}) = #{cmdproc.get_int_noerr(val).inspect}" 
   end
   def foo; 5 end
-  def cmdproc.errmsg(msg)
-    puts msg
-  end
 
   pos = cmdproc.parse_position('../../rubies/rbx-head/bin/irb')
   puts pos.inspect