trepanning 0.1.6 → 1.93.32

data/processor/mock.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010-2011, 2015 Rocky Bernstein <rockyb@rubyforge.net>
 # Mock setup for commands.
 require_relative '../processor'
 
@@ -7,9 +7,9 @@ require_relative '../app/default'
 require_relative '../app/frame'
 require_relative '../interface/user'  # user interface (includes I/O)
 
-SCRIPT_ISEQS__ = {} unless 
+SCRIPT_ISEQS__ = {} unless
   defined?(SCRIPT_ISEQS__) && SCRIPT_ISEQS__.is_a?(Hash)
-ISEQS__        = {} unless 
+ISEQS__        = {} unless
   defined?(ISEQS__) && ISEQS__.is_a?(Hash)
 
 module MockDebugger
@@ -21,14 +21,14 @@ module MockDebugger
     attr_accessor :intf         # The way the outside world interfaces with us.
     attr_reader   :initial_dir  # String. Current directory when program
                                 # started. Used in restart program.
-    attr_accessor :restart_argv # How to restart us, empty or nil. 
+    attr_accessor :restart_argv # How to restart us, empty or nil.
                                 # Note restart[0] is typically $0.
     attr_reader   :settings     # Hash[:symbol] of things you can configure
     attr_accessor :processor
 
     # FIXME: move more stuff of here and into Trepan::CmdProcessor
     # These below should go into Trepan::CmdProcessor.
-    attr_reader :cmd_argstr, :cmd_name, :vm_locations, :current_frame, 
+    attr_reader :cmd_argstr, :cmd_name, :vm_locations, :current_frame,
                 :debugee_thread
 
     def initialize(settings={})
@@ -39,7 +39,7 @@ module MockDebugger
       @trace_filter         = []
 
       # Don't allow user commands in mocks.
-      @core.processor.settings[:user_cmd_dir] = nil 
+      @core.processor.settings[:user_cmd_dir] = nil
 
     end
 
@@ -48,7 +48,7 @@ module MockDebugger
     end
   end
 
-  # Common Mock debugger setup 
+  # Common Mock debugger setup
   def setup(name=nil, show_constants=true)
     unless name
       tf = RubyVM::Frame.current.prev
@@ -114,7 +114,7 @@ module MockDebugger
   def show_special_class_constants(cmd)
     puts 'ALIASES: %s' % [cmd.class.const_get('ALIASES').inspect] if
       cmd.class.constants.member?(:ALIASES)
-    %w(CATEGORY MIN_ARGS MAX_ARGS 
+    %w(CATEGORY MIN_ARGS MAX_ARGS
        NAME NEED_STACK SHORT_HELP).each do |name|
       puts '%s: %s' % [name, cmd.class.const_get(name).inspect]
     end
@@ -127,8 +127,8 @@ module MockDebugger
 end
 
 if __FILE__ == $0
-  dbgr = MockDebugger::MockDebugger.new
-  p dbgr.settings
-  puts '=' * 10
-  p dbgr.core.processor.settings
+    dbgr = MockDebugger::MockDebugger.new
+    p dbgr.settings
+    puts '=' * 10
+    p dbgr.core.processor.settings
 end

data/processor/msg.rb

@@ -1,73 +1,82 @@
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010-2011, 2015 Rocky Bernstein <rockyb@rubyforge.net>
 # I/O related command processor methods
 require_relative '../app/util'
+require_relative '../app/markdown'
 require_relative 'virtual'
 
 begin require 'term/ansicolor'; rescue LoadError; end
 
 class Trepan::CmdProcessor < Trepan::VirtualCmdProcessor
-  attr_accessor :ruby_highlighter
+    include Trepan::Markdown
 
-  def confirm(msg, default)
-    @settings[:confirm] ? @dbgr.intf[-1].confirm(msg, default) : true
-  end
+    attr_accessor :ruby_highlighter
 
-  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]
+    def confirm(msg, default)
+        @settings[:confirm] ? @dbgr.intf[-1].confirm(msg, default) : true
     end
-    if @settings[:highlight] && defined?(Term::ANSIColor)
-      message = 
-        Term::ANSIColor.italic + message + Term::ANSIColor.reset 
+
+    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]
+        end
+        if @settings[:highlight] && defined?(Term::ANSIColor)
+            message =
+                Term::ANSIColor.italic + message + Term::ANSIColor.reset
+        end
+        @dbgr.intf[-1].errmsg(message)
     end
-    @dbgr.intf[-1].errmsg(message)
-  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 markdown(message, opts={})
+        message = render(message, @settings[:maxwidth], @settings[:highlight])
+        @dbgr.intf[-1].msg(message)
+    end
 
-  def msg_nocr(message, opts={})
-    message = safe_rep(message) unless opts[:unlimited]
-    @dbgr.intf[-1].msg_nocr(message)
-  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 read_command()
-    @dbgr.intf[-1].read_command(@prompt)
-  end
+    def msg_nocr(message, opts={})
+        message = safe_rep(message) unless opts[:unlimited]
+        @dbgr.intf[-1].msg_nocr(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
+    def read_command()
+        @dbgr.intf[-1].read_command(@prompt)
     end
-    return @ruby_highlighter.encode(text)
-  end
 
-  def safe_rep(str)
-    Trepan::Util::safe_repr(str, @settings[:maxstring])
-  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 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 safe_rep(str)
+        Trepan::Util::safe_repr(str, @settings[:maxstring])
     end
-    @dbgr.intf[-1].msg(message)
-  end
 
+    def section(message, opts={})
+        message = safe_rep(message) unless opts[:unlimited]
+        message =
+            if @settings[:highlight] && defined?(Term::ANSIColor)
+                Term::ANSIColor.bold + message + Term::ANSIColor.reset
+            else
+                message += "\n" + ('-' * message.size)
+            end
+        @dbgr.intf[-1].msg(message)
+    end
 end

data/processor/validate.rb

@@ -1,8 +1,9 @@
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010-2011, 2013 Rocky Bernstein <rockyb@rubyforge.net>
 
 # Trepan command input validation routines.  A String type is
 # usually passed in as the argument to validation routines.
 
+require 'rbconfig'
 require 'rubygems'
 require 'linecache'
 
@@ -62,7 +63,7 @@ class Trepan
     # error.  If there's a stack frame use that for bindings in
     # evaluation.
     def get_int(arg, opts={})
-      
+
       return default unless arg
       opts = DEFAULT_GET_INT_OPTS.merge(opts)
       val = arg ? get_int_noerr(arg) : opts[:default]
@@ -75,7 +76,7 @@ class Trepan
         end
         return nil
       end
-      
+
       if val < opts[:min_value]
         if opts[:cmdname]
           errmsg(("Command '%s' expects an integer at least" +
@@ -104,7 +105,7 @@ class Trepan
     def get_int_list(args, opts={})
       args.map{|arg| get_an_int(arg, opts)}.compact
     end
-    
+
     # Eval arg and it is an integer return the value. Otherwise
     # return nil
     def get_int_noerr(arg)
@@ -112,7 +113,7 @@ class Trepan
       val = Integer(eval(arg, b))
     rescue SyntaxError
       nil
-    rescue 
+    rescue
       nil
     end
 
@@ -157,13 +158,13 @@ class Trepan
           vm_offset = ary.size > 1 ? ary[1] : ary[0]
           line_no   = position
         elsif found_iseq = find_iseqs_with_lineno(filename, position)
-          return position_to_line_and_offset(found_iseq, filename, position, 
+          return position_to_line_and_offset(found_iseq, filename, position,
                                              offset_type)
         elsif found_iseq = find_iseq_with_line_from_iseq(iseq, position)
-          return position_to_line_and_offset(found_iseq, filename, position, 
+          return position_to_line_and_offset(found_iseq, filename, position,
                                              offset_type)
         else
-          errmsg("Unable to find offset for line #{position}\n\t" + 
+          errmsg("Unable to find offset for line #{position}\n\t" +
                  "in #{iseq.name} of file #{filename}")
           return [nil, nil]
         end
@@ -200,11 +201,11 @@ class Trepan
                         end
       return [nil] * 5 unless break_cmd_parse
       tail = [break_cmd_parse.condition, break_cmd_parse.negate]
-      meth_or_frame, file, position, offset_type = 
+      meth_or_frame, file, position, offset_type =
         parse_position(break_cmd_parse.position)
       if meth_or_frame
         if iseq = meth_or_frame.iseq
-          iseq, line_no, vm_offset = 
+          iseq, line_no, vm_offset =
             position_to_line_and_offset(iseq, file, position, offset_type)
           if vm_offset && line_no
             return [iseq, line_no, vm_offset] + tail
@@ -216,18 +217,18 @@ class Trepan
         if :line == offset_type
           iseq = find_iseqs_with_lineno(file, position)
           if iseq
-            junk, line_no, vm_offset = 
+            junk, line_no, vm_offset =
               position_to_line_and_offset(iseq, file, position, offset_type)
             return [@frame.iseq, line_no, vm_offset] + tail
           else
-            errmsg("Unable to find instruction sequence for" + 
+            errmsg("Unable to find instruction sequence for" +
                    " position #{position} in #{file}")
           end
         else
           errmsg "Come back later..."
         end
-      elsif @frame.file == file 
-        line_no, vm_offset = position_to_line_and_offset(@frame.iseq, position, 
+      elsif @frame.respond_to?(:file) and @frame.file == file
+        line_no, vm_offset = position_to_line_and_offset(@frame.iseq, position,
                                                          offset_type)
         return [@frame.iseq, line_no, vm_offset] + tail
       else
@@ -260,7 +261,7 @@ class Trepan
     include CmdParser
 
     def get_method(meth)
-      start_binding = 
+      start_binding =
         begin
           @frame.binding
         rescue
@@ -278,8 +279,8 @@ class Trepan
       end
     end
 
-    # FIXME: this is a ? method but we return 
-    # the method value. 
+    # FIXME: this is a ? method but we return
+    # the method value.
     def method?(meth)
       get_method(meth)
     end
@@ -290,22 +291,30 @@ class Trepan
     # Parse arg as [filename:]lineno | function | module
     # Make sure it works for C:\foo\bar.py:12
     def parse_position(info)
+      ## FIXME: push into parse
+      if RbConfig::CONFIG['target_os'].start_with?('mingw') and
+          info =~ /^[A-Za-z]:/
+        drive_letter = info[0..1]
+        info = info[2..-1]
+      else
+        drive_leter = nil
+      end
       info = parse_location(info) if info.kind_of?(String)
       case info.container_type
       when :fn
         if (meth = method?(info.container)) && meth.iseq
-          return [meth, meth.iseq.source_container[1], info.position, 
+          return [meth, meth.iseq.source_container[1], info.position,
                   info.position_type]
         else
           return [nil] * 4
         end
       when :file
         filename = canonic_file(info.container)
-        # ?? Try to look up method here? 
+        # ?? Try to look up method here?
         container = frame_container(@frame, false)
         try_filename  = container[1]
         frame = (canonic_file(try_filename) == filename) ? @frame : nil
-        # else 
+        # else
         #   LineCache.compiled_method(filename)
         # end
         return frame, filename,  info.position, info.position_type
@@ -336,7 +345,7 @@ class Trepan
           true
         else
           matches = find_scripts(filename)
-          if matches.size == 1 
+          if matches.size == 1
             LineCache.remap_file(filename, matches[0])
             true
           else
@@ -353,24 +362,24 @@ if __FILE__ == $0
   if !(ARGV.size == 1 && ARGV[0] == 'noload')
     ARGV[0..-1]    = ['noload']
     load(__FILE__)
-  else    
+  else
     require 'thread_frame'
     require_relative '../app/mock'
     require_relative './default'
     require_relative 'frame'
 
     # FIXME: Have to include before defining CmdProcessor!
-    require_relative '../processor'  
+    require_relative '../processor'
 
     cmdproc = Trepan::CmdProcessor.new(Trepan::MockCore.new())
     cmdproc.frame_initialize
-    cmdproc.instance_variable_set('@settings', 
+    cmdproc.instance_variable_set('@settings',
                                Trepan::CmdProcessor::DEFAULT_SETTINGS)
     cmdproc.frame_setup(RubyVM::Frame.current)
     onoff = %w(1 0 on off)
     onoff.each { |val| puts "onoff(#{val}) = #{cmdproc.get_onoff(val)}" }
-    %w(1 1E bad 1+1 -5).each do |val| 
-      puts "get_int_noerr(#{val}) = #{cmdproc.get_int_noerr(val).inspect}" 
+    %w(1 1E bad 1+1 -5).each do |val|
+      puts "get_int_noerr(#{val}) = #{cmdproc.get_int_noerr(val).inspect}"
     end
     def foo; 5 end
     def cmdproc.errmsg(msg)
@@ -381,7 +390,7 @@ if __FILE__ == $0
 
     # puts cmdproc.object_iseq('foo@validate.rb').inspect
     # puts cmdproc.object_iseq('cmdproc.object_iseq').inspect
-    
+
     puts cmdproc.parse_position(__FILE__).inspect
     puts cmdproc.parse_position('@8').inspect
     puts cmdproc.parse_position('8').inspect

data/test/data/fname-with-blank.right

@@ -1,2 +1 @@
 -> (fname with blank.rb:1 @0)
-trepan: That's all, folks...

data/test/data/trace-mingw.right

@@ -0,0 +1,28 @@
+-- (gcd.rb:4 @2)
+def gcd(a, b)
+-- (gcd.rb:18 @2)
+a, b = ARGV[0..1].map {|arg| arg.to_i}
+-- (gcd.rb:19 @45)
+puts "The GCD of %d and %d is %d" % [a, b, gcd(a, b)]
+-- (gcd.rb:6 @4)
+if a > b
+-- (gcd.rb:12 @40)
+if a == 1 or b-a == 0
+METHOD Object#gcd(a, b)
+-> (gcd.rb:4 @2)
+def gcd(a, b)
+-- (gcd.rb:10 @24)
+return nil if a <= 0
+-- (gcd.rb:15 @71)
+return gcd(b-a, a)
+-- (gcd.rb:6 @4)
+if a > b
+-- (gcd.rb:12 @40)
+if a == 1 or b-a == 0
+<- (gcd.rb:13 @68)
+R=> 1
+return a
+<- (gcd.rb:16 @88)
+R=> 1
+end
+The GCD of 3 and 5 is 1

data/test/data/trace.right

@@ -32,8 +32,6 @@ end
 <- (gcd.rb:16 @88)
 R=> 1
 end
-<= (gcd.rb:16 @88)
-end
 The GCD of 3 and 5 is 1
 <= (gcd.rb:19 @73)
 puts "The GCD of %d and %d is %d" % [a, b, gcd(a, b)]

data/test/functional/test-raise.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 require 'test/unit'
+require 'rbconfig'
 require 'trace'
 require_relative 'fn_helper'
 
@@ -9,6 +10,8 @@ class TestRaise < Test::Unit::TestCase
 
   def test_raise
 
+    skip "FIXME on mingw" if 
+      RbConfig::CONFIG['target_os'].start_with?('mingw') 
     cmds = [
             'step',
             'step',