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

data/app/complete.rb

@@ -10,7 +10,7 @@ class Trepan
     # 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
+      complete_ary.select { |cmd| cmd.to_s.start_with?(prefix) }.map{|cmd| cmd.to_s}.sort
     end
     
     def complete_token_with_next(complete_hash, prefix, cmd_prefix='')

data/app/display.rb

@@ -19,6 +19,13 @@ class DisplayMgr
     @list = []
   end
   
+  def [](index)
+    raise TypeError, 
+    "index #{index} should be a Fixnum, is #{index.class}" unless
+      index.is_a?(Fixnum)
+    @list.detect {|disp| disp.number == index }
+  end
+
   def add(frame, arg, fmt=nil)
     return nil unless frame
     begin
@@ -83,6 +90,18 @@ Num Enb Expression"
     end
     false
   end
+
+  def max
+    @list.map{|disp| disp.number}.max
+  end
+
+  def nums
+    @list.map{|disp| disp.number}
+  end
+
+  def size
+    @list.size
+  end
 end
 
 class Display
@@ -98,6 +117,22 @@ class Display
     @number    = number
   end
 
+  def disable
+    @enabled = false
+  end
+
+  def disabled?
+    !@enabled
+  end
+
+  def enable
+    @enabled = true
+  end
+
+  def enabled?
+    @enabled
+  end
+
   def to_s(frame)
     return 'No symbol "' + @arg + '" in current context.' unless frame
     
@@ -119,6 +154,7 @@ class Display
     what += @arg if @arg
     '%3d: %s' % [@number, what]
   end
+
 end
 
 if __FILE__ == $0
@@ -134,6 +170,8 @@ if __FILE__ == $0
 
   x = 1
   mgr.add(frame, 'x > 1')
+  puts "Number of displays %s" % mgr.size
+  puts "Max Number  %d" % mgr.max
   print_display(mgr)
 
   mgr.enable_disable(1, false)

data/app/file.rb

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Things related to file/module status
+
+module Trepanning
+  module FileName
+    def find_load_path(filename)
+      cl = Rubinius::CodeLoader.new(filename)
+      if cl.verify_load_path(filename)
+        path = cl.instance_variable_get('@load_path')
+        path.end_with?(filename) ? filename : nil
+      else
+        nil
+      end
+    end
+  end
+end
+if __FILE__ == $0
+  include Trepanning::FileName
+  require 'tmpdir.rb'
+  [__FILE__, 'tmpdir.rb'].each do |name|
+    p find_load_path(name)
+  end
+end

data/app/frame.rb

@@ -3,8 +3,8 @@ class Trepan
 
   # Call-Stack frame methods
   class Frame
-    def initialize(debugger, number, vm_location)
-      @debugger = debugger
+    def initialize(dbgr, number, vm_location)
+      @debugger = dbgr
       @number = number
       @vm_location = vm_location
     end
@@ -49,7 +49,9 @@ class Trepan
         end
       end
 
-      str = "#{recv} at #{loc.method.active_path}:#{loc.line}"
+      filename = loc.method.active_path
+      filename = File.basename(filename) if opts[:basename]
+      str = "#{recv} at #{filename}:#{loc.line}"
       if opts[:show_ip]
         str << " (@#{loc.ip})"
       end
@@ -70,7 +72,8 @@ class Trepan
     end
 
     def line
-      @vm_location.line
+      line_no = @vm_location.line
+      line_no == 0 ? ISeq::tail_code_line(method, next_ip) : line_no
     end
 
     def local_variables
@@ -85,6 +88,10 @@ class Trepan
       @vm_location.variables
     end
 
+    def stack_size
+      @debugger.vm_locations.size
+    end
+
     def eval?
       static = @vm_location.static_scope
       static && static.script && static.script.eval_source

data/app/irb.rb

@@ -6,49 +6,51 @@ module IRB # :nodoc:
     # FIXME: should we read these out of a directory to 
     #        make this more user-customizable? 
 
-    # A base command class that resume execution
-    class DebuggerResumeCommand
-      def self.execute(conf, *opts)
-        name = 
-          if self.name =~ /IRB::ExtendCommand::(\S+)/
-            $1.downcase
-          else
-            'unknown'
-          end
-        $trepan_args = opts
-        $trepan_command = 
-          if $trepan_irb_statements 
-            $trepan_irb_statements
-          else
-            ([name] + opts).join(' ')
-          end
-
-        throw :IRB_EXIT, name.to_sym
+    unless defined? Continue
+      # A base command class that resume execution
+      class DebuggerResumeCommand
+        def self.execute(conf, *opts)
+          name = 
+            if self.name =~ /IRB::ExtendCommand::(\S+)/
+              $1.downcase
+            else
+              'unknown'
+            end
+          $trepan_args = opts
+          $trepan_command = 
+            if $trepan_irb_statements 
+              $trepan_irb_statements
+            else
+              ([name] + opts).join(' ')
+            end
+          
+          throw :IRB_EXIT, name.to_sym
+        end
       end
-    end
-
-    class Continue < DebuggerResumeCommand ; end
-    class Finish   < DebuggerResumeCommand ; end
-    class Next     < DebuggerResumeCommand ; end
-    class Quit     < DebuggerResumeCommand ; end
-    class Step     < DebuggerResumeCommand ; end
-
-    # Issues a comamnd to the debugger without continuing
-    # execution. 
-    class Dbgr
-      def self.execute(conf, *opts)
-        $trepan_command = 
-          if opts.size == 1 && opts[0].is_a?(String)
-            $trepan_args = opts[0]
-          else
-            opts.join(' ')
-          end
-        dbg_cmdproc = conf.workspace.instance_variable_get('@dbg_cmdproc')
-        dbg_cmdproc.run_command($trepan_command)
+      
+      class Continue < DebuggerResumeCommand ; end
+      class Finish   < DebuggerResumeCommand ; end
+      class Next     < DebuggerResumeCommand ; end
+      class Quit     < DebuggerResumeCommand ; end
+      class Step     < DebuggerResumeCommand ; end
+      
+      # Issues a comamnd to the debugger without continuing
+      # execution. 
+      class Dbgr
+        def self.execute(conf, *opts)
+          $trepan_command = 
+            if opts.size == 1 && opts[0].is_a?(String)
+              $trepan_args = opts[0]
+            else
+              opts.join(' ')
+            end
+          dbg_cmdproc = conf.workspace.instance_variable_get('@dbg_cmdproc')
+          dbg_cmdproc.run_command($trepan_command)
+        end
       end
     end
-
   end
+
   if defined?(ExtendCommandBundle)
     # New irb Commands which are the same name as their debugger
     # counterpart

data/app/iseq.rb

@@ -61,6 +61,42 @@ class Trepan
       end
     end
 
+    def ip_ranges_for_line(lines, line)
+      result = []
+      in_range = false
+      start_ip = nil
+      total = lines.size
+      i = 1
+      while i < total
+        cur_line = lines.at(i)
+        if cur_line == line
+          start_ip = lines.at(i-1)
+          in_range = true
+        elsif cur_line > line && in_range
+          result << [start_ip, lines.at(i-1)]
+          start_ip = nil
+          in_range = false
+        end
+        i += 2
+      end
+      if in_range && start_ip
+        result << [start_ip, lines.at(total-1)]
+      end
+      result
+    end
+    
+    # Return range of ips covering ip. There will be only one of these.
+    # We surround this in another list to match the format of 
+    # ip_ranges_for_line.
+    def ip_ranges_for_ip(lines, ip)
+      total = lines.size
+      i = 0
+      while i < total and lines.at(i) <= ip
+        i += 2
+      end
+      [[lines.at(i-2), lines.at(i)]]
+    end
+  
     def next_interesting(cm, ip)
       pop = Rubinius::InstructionSet.opcodes_map[:pop]
       
@@ -70,6 +106,41 @@ class Trepan
       
       return ip
     end
+
+    # start is assumed to be on a tail code "synthesized" line, which
+    # has line number 0. Follow opcodes until we get to a line that is
+    # not 0. 
+    def tail_code_line(cm, start)
+      
+      iseq = cm.iseq
+      
+      i = start
+      fin = cm.lines.last
+      while i < fin
+        line_no = cm.line_from_ip(i)
+        return line_no if line_no > 0
+        op = iseq[i]
+        case op
+        when OP_GOTO_IF_TRUE, OP_GOTO_IF_FALSE, OP_GOTO
+        when OP_GOTO
+          i = iseq[i+1]
+        when OP_RET
+          return -2
+        when nil
+          return -1
+        else
+          # Rubinius is getting an error here sometimes. Need to figure
+          # out what's wrong.
+          begin
+            op = Rubinius::InstructionSet[op]
+          rescue TypeError
+            return -1
+          end
+          i += (op.arg_count + 1)
+        end
+      end
+      return 0
+    end
     
     def yield_or_return_between(cm, start, fin)
       iseq = cm.iseq

data/app/options.rb

@@ -1,3 +1,4 @@
+
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
 # Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
@@ -9,8 +10,8 @@ class Trepan
   require 'rubygems'; require 'require_relative'
   require_relative 'default'
 
-  Trepan::VERSION = '0.0.8'
-  Trepan::PROGRAM = 'trepanx'
+  VERSION = '0.1.0'
+  PROGRAM = 'trepanx' unless defined? Trepan::PROGRAM
 
   def self.show_version
     "#{PROGRAM}, version #{VERSION}"
@@ -34,16 +35,18 @@ class Trepan
 #{show_version}
 Usage: #{PROGRAM} [options] [[--] <script.rb> <script.rb parameters>]
 EOB
+      opts.separator ''
+      opts.separator 'Options:'
       opts.on('--client',
-              "Connect to out-of-process program") do
+              'Connect to out-of-process program') do
         if options[:server]
-          stderr.puts "--server option previously given. --client option ignored."
+          stderr.puts '--server option previously given. --client option ignored.'
         else
           options[:client] = true
         end
       end
       opts.on('-c', '--command FILE', String, 
-              "Execute debugger commands from FILE") do |cmdfile| 
+              'Execute debugger commands from FILE') do |cmdfile| 
         if File.readable?(cmdfile)
           options[:cmdfiles] << cmdfile
         elsif File.exists?(cmdfile)
@@ -52,14 +55,7 @@ EOB
           stderr.puts "Command file '#{cmdfile}' does not exist."
         end
       end
-      opts.on('--nx',
-              "Do not run debugger initialization file #{CMD_INITFILE}") do
-        options[:nx] = true
-      end
-      # opts.on('--output FILE', String, "Name of file to record output") do |outfile| 
-      #   options[:outfile] = outfile
-      # end
-      opts.on("--cd DIR", String, "Change current directory to DIR") do |dir| 
+      opts.on('--cd DIR', String, 'Change current directory to DIR') do |dir| 
         if File.directory?(dir)
           if File.executable?(dir)
             options[:chdir] = dir
@@ -70,40 +66,69 @@ EOB
           stderr.puts "\"#{dir}\" is not a directory. Option --cd ignored."
         end
       end
-      opts.on("-h", "--host NAME", String, 
-              "Host or IP used in TCP connections for --server or --client. " + 
+      opts.on('--basename', 
+              'Show only file basename in file locations') do 
+        options[:basename] = true
+      end
+      opts.on('-d', '--debug', 'Set $DEBUG=true') do 
+        $DEBUG = true
+      end
+     opts.on('--[no-]highlight',
+              'Use [no] syntax highlight output') do |v|
+        options[:highlight] = ((v) ? :term : nil)
+      end
+      opts.on('-h', '--host NAME', String, 
+              'Host or IP used in TCP connections for --server or --client. ' + 
               "Default is #{DEFAULT_SETTINGS[:host].inspect}.") do 
         |name_or_ip| 
         options[:host] = name_or_ip
       end
-      opts.on("-p", "--port NUMBER", Integer, 
-              "Port number used in TCP connections for --server or --client. " + 
+      opts.on('-I', '--include PATH', String, 'Add PATH to $LOAD_PATH') do 
+        |path|
+        $LOAD_PATH.unshift(path)
+      end
+      opts.on('--nx',
+              "Do not run debugger initialization file #{CMD_INITFILE}") do
+        options[:nx] = true
+      end
+      opts.on('-p', '--port NUMBER', Integer, 
+              'Port number used in TCP connections for --server or --client. ' + 
               "Default is #{DEFAULT_SETTINGS[:port]}.") do 
         |num| 
         options[:port] = num
       end
-      opts.on('--server',
-              "Set up for out-of-process debugging") do
+      opts.on('--[no-]readline',
+              'Try [not] GNU Readline') do |v|
+        options[:readline] = v
+      end
+      opts.on('-r', '--require SCRIPT', String,
+              'Require the library, before executing your script') do |name|
+        if name == 'debug'
+          stderr.puts "ruby-debug is not compatible with Ruby's 'debug' library. This option is ignored."
+        else
+          require name
+        end
+      end
+      opts.on('-s', '--server',
+              'Set up for out-of-process debugging') do
         if options[:client]
-          stderr.puts "--client option previously given. --server option ignored."
+          stderr.puts '--client option previously given. --server option ignored.'
         else
           options[:server] = true
         end
       end
-      opts.on('--[no-]highlight',
-              "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
+      opts.on('-x', '--trace', 'Turn on line tracing') do
+        options[:traceprint] = true
+        options[:nx] = true
       end
-      opts.on_tail("-?", "--help", "Show this message") do
+      opts.separator ''
+      opts.on_tail('-?', '--help', 'Show this message') do
         options[:help] = true
         stdout.puts opts
+        exit 
       end
-      opts.on_tail("-v", "--version", 
-                   "print the version") do
+      opts.on_tail('-v', '--version', 
+                   'print the version') do
         options[:version] = true
         stdout.puts show_version
       end