rbx-trepanning 0.0.4-universal-rubinius-1.2 → 0.0.6-universal-rubinius-1.2

data/processor/load_cmds.rb

@@ -1,7 +1,11 @@
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net> Part of
-# Trepan::CmdProcess that loads up debugger commands from builtin and
-# user directories.
+# -*- coding: utf-8 -*-
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net> 
+
+# Part of Trepan::CmdProcess that loads up debugger commands from
+# builtin and user directories.  
 # Sets @commands, @aliases, @macros
+require 'rubygems'; require 'require_relative'
+require_relative '../app/complete'
 class Trepan
   class CmdProcessor
 
@@ -21,31 +25,37 @@ class Trepan
       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| 
-          load_debugger_commands(cmd_dir) if File.directory?(cmd_dir)
-        end
+        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 
     # form Trepan::xxCommand is added to @commands and that array
     # is returned.
-
-    def load_debugger_commands(cmd_dir)
-      Dir.glob(File.join(cmd_dir, '*.rb')).each do |rb| 
-        require rb
-      end if File.directory?(cmd_dir)
+    def load_debugger_commands(file_or_dir)
+      if File.directory?(file_or_dir)
+        dir = File.expand_path(file_or_dir)
+        Dir.glob(File.join(dir, '*.rb')).each do |rb| 
+          # We use require so that multiple calls have no effect.
+          require rb
+        end
+      elsif File.readable?(file_or_dir)
+        # We use load in case we are reloading. 
+        # 'require' would not be effective here
+        load file_or_dir
+      else
+        return false
+      end
       # Instantiate each Command class found by the above require(s).
-      Trepan::Command.constants.grep(/.Command$/).each do |command|
-        # Note: there is probably a non-eval way to instantiate the
-        # command, but I don't know it. And eval works.
-        new_cmd = "Trepan::Command::#{command}.new(self)"
-        cmd = self.instance_eval(new_cmd)
+      Trepan::Command.constants.grep(/.Command$/).each do |name|
+        klass = Trepan::Command.const_get(name)
+        cmd = klass.send(:new, self)
 
         # Add to list of commands and aliases.
-        cc = cmd.class
-        cmd_name = cc.const_get(:NAME)
-        if cc.constants.member?('ALIASES')
-          aliases= cc.const_get('ALIASES')
+        cmd_name = klass.const_get(:NAME)
+        if klass.constants.member?('ALIASES')
+          aliases= klass.const_get('ALIASES')
           aliases.each {|a| @aliases[a] = cmd_name}
         end
         @commands[cmd_name] = cmd
@@ -74,10 +84,81 @@ class Trepan
         @commands[cmd_name].run(cmd_array)
       end
     end
+
+    def complete_token_with_next(arg)
+    end
+
+    def complete(arg)
+      if arg.kind_of?(String)
+        args = arg.split
+      elsif arg.kind_of?(Array)
+        args = arg
+      else
+        return []
+      end
+      args = [''] if args.empty?
+      coms_macs = @commands.merge(@macros)
+      match_pairs = Trepan::Complete.complete_token_with_next(coms_macs,
+                                                               args[0])
+      return [] if match_pairs.empty?
+      match_hash = {}
+      match_pairs.each do |pair|
+        match_hash[pair[0]] = pair[1]
+      end
+      alias_pairs = Trepan::Complete.
+        complete_token_filtered_with_next(@aliases, args[0], match_hash,
+                                          @commands)
+      match_pairs += alias_pairs
+      if args.size == 1
+        return match_pairs.map{|pair| pair[0]}.sort
+      else 
+        alias_pairs.each do |pair|
+          match_hash[pair[0]] = pair[1]
+        end
+        if match_pairs.size > 1
+          # FIXME: figure out what to do here.
+          return match_pairs.map do |name, cmd|
+            ["#{name} #{args[1..-1].join(' ')}"]
+          end
+        end
+        # match_pairs.size == 1
+        # FIXME generalize more and turn into a routine.
+        first_arg, cmd = match_pairs[0]
+        if cmd.respond_to?(:complete_token_with_next)
+          match_pairs = cmd.complete_token_with_next(args[1])
+          if match_pairs.empty?
+            return [args.join(' ')] 
+          elsif args.size > 2 && match_pairs.size == 1
+            second_arg, cmd = match_pairs[0]
+            if cmd.respond_to?(:complete)
+              matches = cmd.complete(args[2])
+              return matches.map do |third_arg|
+                # FIXME: break out args[3..-1] if that exists to 
+                # handle more complex completions including subsubcmds.
+                "#{first_arg} #{second_arg.to_s} #{third_arg}" + 
+                  ((args.size > 3) ? "#{args[3..-1].join(' ')}" : '')
+              end
+            end
+          end
+          return match_pairs.map do |second_arg, junk|
+            # FIXME: break out args[2..-1] if that exists to 
+            # handle more complex completions including subsubcmds.
+            "#{first_arg} #{second_arg.to_s}" + 
+              ((args.size > 2) ? " #{args[2..-1].join(' ')}" : '')
+          end
+        end
+        return ["#{first_arg} #{args[1..-1].join(' ')}"]
+      end
+    end
   end
 end
 if __FILE__ == $0
-  cmdproc = Trepan::CmdProcessor.new
+  class Trepan::CmdProcessor
+    def initialize(core, settings={})
+    end
+  end
+
+  cmdproc = Trepan::CmdProcessor.new(nil)
   cmddir = File.join(File.dirname(__FILE__), 'command')
   cmdproc.instance_variable_set('@settings', {})
   cmdproc.load_cmds_initialize
@@ -98,4 +179,7 @@ if __FILE__ == $0
   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")
+  p cmdproc.complete("sho d")
+  p cmdproc.complete('')
 end

data/processor/location.rb

@@ -1,6 +1,6 @@
 # Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
-require 'rubygems'
 require 'linecache'
+require 'rubygems'; require 'require_relative'
 require_relative 'disassemble'
 require_relative 'msg'
 require_relative 'frame'
@@ -31,13 +31,13 @@ class Trepan
 
     # Get line +line_number+ from file named +filename+. Return "\n"
     # there was a problem. Leading blanks are stripped off.
-    def line_at(filename, line_number)
+    def line_at(filename, line_number, 
+                opts = {
+                  :reload_on_change => @reload_on_change,
+                  :output => @settings[:highlight]
+                })
       # We use linecache first to give precidence to user-remapped
       # file names
-      opts = {
-        :reload_on_change => @reload_on_change,
-        :output => @settings[:highlight]
-      }
       line = LineCache::getline(filename, line_number, opts)
       unless line
         # Try using search directories (set with command "directory")
@@ -53,11 +53,10 @@ class Trepan
       return line.lstrip.chomp
     end
 
-    def loc_and_text(loc)
-      opts = {
-        :reload_on_change => @reload_on_change,
-        :output => @settings[:highlight]
-      }
+    def loc_and_text(loc, opts=
+                     {:reload_on_change => @reload_on_change,
+                       :output => @settings[:highlight]
+                     })
       vm_location = @frame.vm_location
       filename = vm_location.method.active_path
       line_no  = vm_location.line
@@ -68,7 +67,7 @@ class Trepan
         text = LineCache::getline(static.script, line_no, opts)
         loc += " remapped #{canonic_file(file)}:#{line_no}"
       else
-        text = line_at(filename, line_no)
+        text = line_at(filename, line_no, opts)
         map_file, map_line = LineCache::map_file_line(filename, line_no)
         if [filename, line_no] != [map_file, map_line]
           loc += " remapped #{canonic_file(map_file)}:#{map_line}"

data/processor/main.rb

@@ -37,6 +37,8 @@ class Trepan
                                    # next stop while settings is the default
                                    # value to use.
     attr_accessor :event           # Stop event
+    attr_reader   :intf            # Current interface
+                                   # Trepan::Core instance)
     attr_accessor :leave_cmd_loop  # Commands set this to signal to leave
                                    # the command loop (which often continues to 
                                    # run the debugged program). 
@@ -178,9 +180,9 @@ class Trepan
     # Run one debugger command. True is returned if we want to quit.
     def process_command_and_quit?()
       intf_size = @dbgr.intf.size
-      intf  = @dbgr.intf[-1]
-      return true if intf.input_eof? && intf_size == 1
-      while intf_size > 1 || !intf.input_eof?
+      @intf  = @dbgr.intf[-1]
+      return true if @intf.input_eof? && intf_size == 1
+      while intf_size > 1 || !@intf.input_eof?
         begin
           @current_command = 
             if @cmd_queue.empty?
@@ -201,7 +203,7 @@ class Trepan
           if intf_size > 1
             @dbgr.intf.pop
             intf_size = @dbgr.intf.size
-            intf = @dbgr.intf[-1]
+            @intf = @dbgr.intf[-1]
             @last_command = nil
             print_location
           else
@@ -215,7 +217,7 @@ class Trepan
       leave_cmdloop = run_command(@current_command)
 
       # Save it to the history.
-      @dbgr.history_io.puts @last_command
+      @intf.history_io.puts @last_command if @last_command && @intf.history_io
     end
 
     def after_cmdloop
@@ -313,7 +315,9 @@ class Trepan
           msg current_command if settings[:debugmacro]
           if current_command.is_a?(Array) && 
               current_command.any {|val| !val.is_a?(String)}
-            args = current_command
+            args = (first=current_command.shift).split
+            @cmd_queue += current_command
+            current_command = first
           elsif current_command.is_a?(String)
             args = current_command.split
           else

data/processor/mock.rb

@@ -26,12 +26,13 @@ module MockDebugger
     # 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, 
-                :debugee_thread
+                :debugee_thread, :completion_proc
 
     def initialize(settings={})
       @before_cmdloop_hooks = []
       @settings             = Trepan::DEFAULT_SETTINGS.merge(settings)
-      @intf                 = [Trepan::UserInterface.new]
+      @intf                 = [Trepan::UserInterface.new(nil, nil,
+                                                         :history_save=>false)]
       @vm_locations         = Rubinius::VM.backtrace(1, true)
       @current_frame        = Trepan::Frame.new(self, 0, @vm_locations[0])
       @debugee_thread       = Thread.current
@@ -41,6 +42,8 @@ module MockDebugger
       ## @core                 = Trepan::Core.new(self)
       @trace_filter         = []
 
+      @completion_proc = Proc.new{|str| str}
+
       # Don't allow user commands in mocks.
       ## @core.processor.settings[:user_cmd_dir] = nil 
 
@@ -74,6 +77,7 @@ module MockDebugger
     cmds = cmdproc.commands
     cmd  = cmds[name]
     cmd.proc.frame_setup
+    cmd.proc.event = 'debugger-call'
     show_special_class_constants(cmd) if show_constants
 
     def cmd.confirm(prompt, default)

data/processor/stepping.rb

@@ -8,8 +8,6 @@ class Trepan
       
       f = frame
       
-      ip = -1
-      
       meth = f.method
       possible_line = f.line + step
       next_ip = f.next_ip == f.ip ? f.next_ip + 1 : f.next_ip
@@ -18,7 +16,7 @@ class Trepan
       fin_ip = meth.first_ip_on_line_after(possible_line, f.next_ip)
       # fin_ip = meth.first_ip_on_line_after(possible_line, next_ip)
       
-      if fin_ip <= -1
+      unless fin_ip
         return step_to_parent('line')
       end
 
@@ -33,7 +31,6 @@ class Trepan
       end
       
       meth = f.method
-      ip = -1
       fin_ip = meth.lines.last
       
       set_breakpoints_on_return_between(meth, f.next_ip, fin_ip)

data/processor/subcmd.rb

@@ -1,10 +1,11 @@
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 # gdb-like subcommand processing.
 
 class Trepan
   class Subcmd
 
-    attr_reader :subcmds
+    attr_reader :subcmds  # Hash of subcommands. Key is the subcommand name.
+                          # the value is the subcommand object to run.
     def initialize(cmd)
       @cmd     = cmd
       @subcmds = {}

data/processor/validate.rb

@@ -22,7 +22,7 @@ class Trepan
     ## include Trepan::Condition
 
     def confirm(msg, default)
-      @dbgr.intf[-1].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
@@ -75,10 +75,10 @@ class Trepan
       end
       
       if val < opts[:min_value]
-        if cmdname
+        if opts[:cmdname]
           errmsg(("Command '%s' expects an integer at least" +
                   ' %d; got: %d.') %
-                 [cmdname, opts[:min_value], opts[:default]])
+                 [opts[:cmdname], opts[:min_value], opts[:default]])
         else
           errmsg(("Expecting a positive integer at least" +
                   ' %d; got: %d') %

data/sample/list-terminal-colors.rbc

@@ -9,7 +9,7 @@ x
 10
 __script__
 i
-1042
+1059
 5
 7
 0
@@ -1050,6 +1050,23 @@ i
 157
 0
 15
+7
+158
+64
+7
+159
+64
+7
+160
+64
+35
+3
+56
+161
+50
+157
+0
+15
 2
 11
 I
@@ -1062,7 +1079,7 @@ I
 0
 n
 p
-158
+162
 s
 8
 rubygems
@@ -1649,8 +1666,141 @@ name
 x
 4
 each
+s
+4
+bold
+s
+6
+italic
+s
+9
+underline
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+9
+__block__
+i
+47
+57
+19
+0
+15
+45
+0
+1
+43
+2
+20
+0
+49
+3
+1
+19
+1
+15
+5
+20
+1
+47
+101
+4
+20
+0
+47
+101
+4
+7
+5
+20
+1
+49
+6
+0
+47
+101
+4
+7
+7
+63
+5
+47
+49
+8
+1
+11
+I
+9
+I
+2
+I
+1
+I
+1
+n
+p
+9
+x
+4
+Term
+n
+x
+9
+ANSIColor
+x
+4
+send
+x
+4
+to_s
+s
+3
+ - 
+x
+7
+inspect
+s
+4
+
+x
+4
+puts
+p
+7
+I
+0
+I
+88
+I
+4
+I
+89
+I
+11
+I
+8a
+I
+2f
+x
+70
+/home/rocky-rvm/.rvm/src/rbx-trepanning/sample/list-terminal-colors.rb
+p
+2
+x
+4
+name
+x
+6
+attrib
 p
-253
+255
 I
 0
 I
@@ -2156,7 +2306,11 @@ I
 I
 57
 I
-412
+410
+I
+88
+I
+423
 x
 70
 /home/rocky-rvm/.rvm/src/rbx-trepanning/sample/list-terminal-colors.rb

data/sample/rocky-trepanx-colors.rb

@@ -16,19 +16,27 @@ require 'rubygems'
 require 'coderay'
 require 'coderay/encoders/term'
 TERM_TOKEN_COLORS = {
-  :comment => '3;36',        # italic yellow brownish
-  :constant => '1;34',       # bold blue
+  :comment => '3;37',        # sienna #8b4726
+  :constant => '1;34',       # Bold Midnight Blue #191970
+  :class => '1;2',           # 
+  :doctype => '1;2',         # 
   :global_variable => '36',  # yellow brownish 
-  :integer => '34',          # blue
+  :integer => '29',          # black #00000
   :label => '4',             # black underline
+  :method => '34',           # blue #0000FF 
+  :pre_constant => '3;33',   # goldenrod4 #8b6914
   :regexp => {
-    :content => '33',        # light turquoise (from red)
-    :delimiter => '1;29',
+    :content => '36',        # dark cyan #008b8b
+    :delimiter => '1;29',    # bold black
     :modifier => '35',
     :function => '1;29'
   },
-  :reserved => '1;32',       # bold green (from red)
-  :symbol   => '35',         # purple
+  :string => {
+    :content => '1;37',      # ivory4 (grey) #8b8b83
+    :delimiter => '1;29',    # bold black
+  },
+  :reserved => '1;32',       # bold dark olive green #556b2f RGB: 85, 107, 47
+  :symbol   => '35',         # purple4 #551A8B RGB: 85, 26, 139
 }
 module CodeRay::Encoders
   class Term < Encoder