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

data/lib/{trepanning.rb.orig → trepanning2.rb}

@@ -48,10 +48,15 @@ class Trepan
     @input  = @settings[:input] || STDIN
     @output = @settings[:output] || STDOUT
 
-    cmdproc_settings = {:terminal => @settings[:terminal]}
+    cmdproc_settings = {:highlight => @settings[:highlight]}
 
     @processor = CmdProcessor.new(self, cmdproc_settings)
-
+    completion_proc = Proc.new do |str|
+      completed_ary = @processor.complete(Readline.line_buffer, true)
+      Readline.line_buffer = '' unless completed_ary.empty?
+      completed_ary
+    end
+        
     @intf = 
       if @settings[:server]
         opts = Trepan::ServerInterface::DEFAULT_INIT_CONNECTION_OPTS.dup
@@ -64,9 +69,11 @@ class Trepan
         opts = Trepan::ClientInterface::DEFAULT_INIT_CONNECTION_OPTS.dup
         opts[:port] = @settings[:port] if @settings[:port]
         opts[:host] = @settings[:host] if @settings[:host]
+        opts[:complete] = completion_proc
         [Trepan::ClientInterface.new(nil, nil, nil, nil, opts)]
       else
-        [Trepan::UserInterface.new(@input, @output)]
+        opts = {:complete => completion_proc}
+        [Trepan::UserInterface.new(@input, @output, opts)]
       end
 
     process_cmdfile_setting(@settings)
@@ -86,7 +93,8 @@ class Trepan
     @history_path = File.expand_path("~/.trepanx")
 
     if File.exists?(@history_path)
-      File.readlines(@history_path).each do |line|
+      File.readlines(@history_path).each_with_index do |line, i|
+        break if i > 50  # FIXME: remove constant 50
         Readline::HISTORY << line.strip
       end
       @history_io = File.new(@history_path, "a")

data/processor/breakpoint.rb

@@ -58,7 +58,7 @@ class Trepan
       if line
         ip = cm.first_ip_on_line(line)
         
-        if ip == -1
+        unless ip
           errmsg "Unknown line '#{line}' in method '#{cm.name}'"
           return nil
         end
@@ -67,6 +67,9 @@ class Trepan
         ip = 0
       end
 
+      # def lines without code will have value -1.
+      ip = 0 if -1 == ip
+
       bp = @brkpts.add(descriptor, cm, ip, line, @brkpts.max+1, opts)
       bp.activate
       msg("Set %sbreakpoint #{bp.id}: #{meth.name}() at #{bp.location}" % 

data/processor/command/base/cmd.rb

@@ -3,8 +3,9 @@
 # Base class of all commands. Code common to all commands is here.
 # Note: don't end classname with Command (capital C) since main
 # will think this a command name like QuitCommand 
-require 'rubygems'
+require 'rubygems'; require 'require_relative'
 require 'columnize'
+require_relative '../../../app/complete'
 
 class Trepan
   class Command
@@ -60,8 +61,8 @@ class Trepan
     end
 
     # Convenience short-hand for @dbgr.intf[-1].msg_nocr
-    def msg_nocr(msg)
-      @proc.msg_nocr(msg, opts={})
+    def msg_nocr(msg, opts={})
+      @proc.msg_nocr(msg, opts)
     end
 
     def my_const(name)
@@ -103,6 +104,14 @@ class Trepan
       my_const(help_constant_sym)
     end
 
+    # Define a method called 'complete' on the singleton class.
+    def self.completion(ary) 
+      self.send(:define_method, 
+                :complete, 
+                Proc.new {|prefix| 
+                  Trepan::Complete.complete_token(ary, prefix) })
+    end
+
     # From reference debugger
     def run_code(str)
       @proc.dbgr.current_frame.run(str)
@@ -126,3 +135,39 @@ class Trepan
 
   end
 end
+if __FILE__ == $0
+  class Trepan
+    class CmdProcessor
+      def initialize(dbgr)
+      end
+      def confirm(message, default)
+        p ['confirm: ', message, default]
+      end
+      def errmsg(message, opts)
+        p ['err:', message, opts]
+      end
+      def msg(message, opts)
+        p [message, opts]
+      end
+      def msg_nocr(message, opts)
+        p ['nocr: ', message, opts]
+      end
+      def section(message, opts)
+        p ['section: ', message, opts]
+      end
+    end
+    class Command::Test < Trepan::Command
+      NAME = 'test'
+      CATEGORY = 'testcategory'
+      completion %w(a aa ab ba aac)
+    end
+  end
+  proc = Trepan::CmdProcessor.new(nil)
+  cmd = Trepan::Command::Test.new(proc)
+  %w(confirm errmsg msg msg_nocr section).each do |meth|
+    cmd.send(meth, 'test', nil)
+  end
+  p cmd.complete('aa')
+  cmd.instance_variable_set('@completions', %w(aardvark apple))
+  p cmd.complete('aa')
+end

data/processor/command/base/subcmd.rb

@@ -160,10 +160,11 @@ class Trepan
     def summary_help(subcmd_name)
       msg_nocr("%-12s: %s" % [subcmd_name, my_const(:SHORT_HELP)])
     end
-    
   end
 
   class SetBoolSubcommand < Subcommand
+    completion %w(on off)
+
     def run(args)
       run_set_bool(args)
     end

data/processor/command/base/submgr.rb

@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 require 'rubygems'; require 'require_relative'
 require_relative 'cmd'
 require_relative '../../subcmd'
 require_relative '../../help'
+require_relative '../../../app/complete'
 
 class Trepan::SubcommandMgr < Trepan::Command
 
@@ -18,7 +19,7 @@ class Trepan::SubcommandMgr < Trepan::Command
     NEED_STACK    = false
   end
 
-  attr_accessor :subcmds   # Array of instaniated Trepan::Subcommand objects
+  attr_accessor :subcmds   # Trepan::Subcmd
   attr_reader   :name      # Name of command
   attr_reader   :last_args # Last arguments seen
 
@@ -60,20 +61,18 @@ class Trepan::SubcommandMgr < Trepan::Command
     subcommands = {}
     cmd_names.each do |name|
       next unless Trepan::Subcommand.constants.member?(name)
-      subcmd_class = "Trepan::Subcommand::#{name}.new(self)"
-      cmd = self.instance_eval(subcmd_class)
-      cmd_name = cmd.name
+      klass = Trepan::Subcommand.const_get(name)
+      cmd = klass.send(:new, self)
       @subcmds.add(cmd)
     end
     subcmd_names.each do |name|
       next unless Trepan::SubSubcommand.constants.member?(name)
-      subcmd_class = "Trepan::SubSubcommand::#{name}.new(self, parent)"
+      subcmd_class = Trepan::SubSubcommand.const_get(name)
       begin
-        cmd = self.instance_eval(subcmd_class)
+        cmd = subcmd_class.send(:new, self, parent)
       rescue
         puts "Subcmd #{name} is bad"
       end
-      cmd_name = cmd.name
       @subcmds.add(cmd)
     end
   end
@@ -143,7 +142,18 @@ class Trepan::SubcommandMgr < Trepan::Command
     end
   end
 
-  def run(args)
+  # Return an Array of subcommands that can start with +arg+. If none
+  # found we just return +arg+.
+  # FIXME: Not used any more? 
+  def complete(prefix)
+    Trepan::Complete.complete_token(@subcmds.subcmds.keys, prefix)
+  end
+
+  def complete_token_with_next(prefix)
+    Trepan::Complete.complete_token_with_next(@subcmds.subcmds, prefix)
+  end
+
+  def run(args) # nodoc
     @last_args = args
     if args.size < 2 || args.size == 2 && args[-1] == '*'
       summary_list(obj_const(self, :NAME), @subcmds)
@@ -165,15 +175,8 @@ end
 if __FILE__ == $0
   # Demo it.
   require_relative '../../mock'
-  dbgr = MockDebugger::MockDebugger.new
-  # cmds = dbgr.core.processor.commands
-  # cmd  = cmds['set']
-  # Trepan::SubcommandMgr.new(dbgr.core.processor)
-  # puts cmd.help(%w(help set))
-  # puts '=' * 40
-  # # require_relative '../../../lib/trepanning)
-  # # Trepan.debug(:set_restart => true)
-  # puts cmd.help(%w(help set *))
-  # puts '=' * 40
-  # puts cmd.help(%w(help set d.*))
+  dbgr, cmd = MockDebugger::setup('show')
+  p cmd.complete('d')
+  p cmd.subcmds.lookup('ar').prefix
+  p cmd.subcmds.lookup('a')
 end

data/processor/command/base/subsubmgr.rb

@@ -5,7 +5,6 @@ require_relative 'subcmd'
 require_relative '../../subcmd'
 require_relative '../../help'
 
-require 'rubygems'; require 'require_relative'
 class Trepan::SubSubcommandMgr < Trepan::Subcommand
 
   include Trepan::Help
@@ -146,6 +145,18 @@ class Trepan::SubSubcommandMgr < Trepan::Subcommand
     end
   end
 
+  # Return an Array of subcommands that can start with +arg+. If none
+  # found we just return +arg+.
+  def complete(prefix)
+    prior = self.prefix.join('').size
+    last_args = @subcmds.list.map{|str| str[prior..-1]}
+    Trepan::Complete.complete_token(last_args, prefix)
+  end
+
+  def complete_token_with_next(prefix)
+    Trepan::Complete.complete_token_with_next(@subcmds.subcmds, prefix)
+  end
+
   def run(args)
     args = @parent.last_args if args.size == 0
     if args.size < 3 || args.size == 3 && args[-1] == '*'
@@ -179,6 +190,6 @@ if __FILE__ == $0
   # puts '=' * 40
   # FIXME
   # require_relative '../../lib/trepanning'
-  # Trepan.debug(:set_restart => true)
+  # Trepan.debugger
   # puts cmd.help(%w(help info registers p.*))
 end

data/processor/command/complete.rb

@@ -1,35 +1,25 @@
 # Copyright (C) 2011 Rocky Bernstein <rockyb@rubyforge.net>
 require 'rubygems'; require 'require_relative'
 require_relative 'base/cmd'
+require_relative '../load_cmds'
 class Trepan::Command::CompleteCommand < Trepan::Command
 
   unless defined?(HELP)
-    HELP = 
-"complete COMMAND-PREFIX
+    NAME          = File.basename(__FILE__, '.rb')
+    HELP = <<-HELP
+#{NAME} COMMAND-PREFIX
 
 List the completions for the rest of the line as a command.
-
-NOTE: For now we just handle completion of the first token.
-"
+    HELP
     CATEGORY      = 'support'
-    NAME          = File.basename(__FILE__, '.rb')
     NEED_STACK    = false
     SHORT_HELP    = 'List the completions for the rest of the line as a command'
   end
 
   # This method runs the command
   def run(args) # :nodoc
-    if args.size == 2
-      cmd_matches = @proc.commands.keys.select do |cmd|
-        cmd.start_with?(args[1])
-      end
-      alias_matches = @proc.aliases.keys.select do |cmd|
-        cmd.start_with?(args[1]) && !cmd_matches.member?(@proc.aliases[cmd])
-      end
-      (cmd_matches+alias_matches).sort.each do |match|
-        msg match
-      end
-    else # FIXME: handle more complex completions
+    @proc.complete(args[1..-1]).each do |match|
+      msg match
     end
   end
 end

data/processor/command/continue.rb

@@ -1,31 +1,38 @@
+# Copyright (C) 2011 Rocky Bernstein <rockyb@rubyforge.net>
 require 'rubygems'; require 'require_relative'
 require_relative 'base/cmd'
 require_relative '../stepping'
 
 class Trepan::Command::ContinueCommand < Trepan::Command
-  NAME         = File.basename(__FILE__, '.rb')
-  HELP         = <<-HELP
+  unless defined?(HELP)
+    NAME = File.basename(__FILE__, '.rb')
+    HELP = <<-HELP
 #{NAME} [breakpoint-position]
 
 Leave the debugger loop and continue execution. Subsequent entry to
 the debugger however may occur via breakpoints or explicit calls, or
 exceptions.
 
-If a parameter is given, a one-time breakpoint is set at that position
-before continuing. 
+If a parameter is given, a temporary breakpoint is set at that position
+before continuing. Offset are numbers prefixed with an "O" otherwise
+the parameter is taken as a line number.
 
 Examples:
    #{NAME}
    #{NAME} 10    # continue to line 10
-   #{NAME} Array#map # beginning of next Array#map call
+   #{NAME} o20   # continue to VM Instruction Sequence offset 20
+   #{NAME} gcd   # continue to first instruction of method gcd
+   #{NAME} IRB.start o7 # continue to IRB.start offset 7
 
 See also 'step', 'next', 'finish', and 'nexti' commands.
-      HELP
-  ALIASES      = %w(c cont)
-  CATEGORY     = 'running'
-  MAX_ARGS     = 1
-  NEED_RUNNING = true
-  SHORT_HELP   = 'Continue execution of the debugged program'
+    HELP
+
+    ALIASES      = %w(c cont)
+    CATEGORY     = 'running'
+    MAX_ARGS     = 2  # Need at most this many
+    NEED_RUNNING = true
+    SHORT_HELP   = 'Continue execution of the debugged program'
+  end
 
   # This is the method that runs the command
   def run(args)
@@ -80,4 +87,5 @@ end
 if __FILE__ == $0
   require_relative '../mock'
   dbgr, cmd = MockDebugger::setup
+  p cmd.run([cmd.name])
 end

data/processor/command/disassemble.rb

@@ -2,20 +2,31 @@
 # Copyright (C) 2011 Rocky Bernstein <rockyb@rubyforge.net>
 require 'rubygems'; require 'require_relative'
 require_relative './base/cmd'
+require_relative '../../app/method'
 require_relative '../../app/iseq'
 
 class Trepan::Command::DisassembleCommand < Trepan::Command
+
+  include Trepanning::Method
+
   NAME         = File.basename(__FILE__, '.rb')
-  ALIASES      = %w(dis)
+  ALIASES       = %w(disas disassem) # Note we (will) have disable
   CATEGORY     = 'data'
   HELP         = <<-HELP
-#{NAME} [all|method]
+#{NAME} [all]
+#{NAME} [method|LINE-NUM]...
 
 Disassembles Rubinius VM instructions. By default, the bytecode for the
 current line is disassembled only.
 
-If a method name is given, disassemble just that method. If the
-argument is 'all', the entire method is shown as bytecode.
+If a method name is given, disassemble just that method. 
+
+If a line number given, then disassemble just that line number if it
+has bytecode assocated with that line. Note that if a line has
+discontinuous regions we will show just the first region associated
+with that line.
+
+If the argument is 'all', the entire method is shown as bytecode.
 
 Examples:
    #{NAME}              # dissasemble VM for current line
@@ -23,7 +34,8 @@ Examples:
    #{NAME} [1,2].max    # disassemble max method of Array
    #{NAME} Object.is_a? # disassemble Object.is_a?
    #{NAME} is_a?        # same as above (probably)
-
+   #{NAME} 6            # Disassemble line 6 if there is bytecode for it
+   #{NAME} 6 is_a?      # The above two commands combined into one
     HELP
 
   NEED_STACK   = true
@@ -66,7 +78,7 @@ Examples:
     # FIXME DRY with ../disassemble.rb
     if settings[:highlight]
       require_relative '../../app/rbx-llvm'
-      @llvm_highlighter = CodeRay::Duo[:llvm, :term]
+      @llvm_highlighter ||= CodeRay::Duo[:llvm, :term]
       # llvm_scanner = CodeRay.scanner :llvm
       # p llvm_scanner.tokenize(disasm)
       disasm = @llvm_highlighter.encode(disasm)
@@ -85,12 +97,25 @@ Examples:
       section "Bytecode for #{@proc.frame.vm_location.describe}"
       disassemble_method(current_method)
     else
-      cm = @proc.parse_method(args[1])
-      if cm
-        section "Bytecode for method #{args[1]}"
-        disassemble_method(cm.executable)
-      else
-        errmsg "Method #{args[1]} not found"
+      args[1..-1].each do |arg|
+        cm = @proc.parse_method(arg)
+        if cm
+          section "Bytecode for method #{arg}"
+          disassemble_method(cm.executable)
+        else
+          opts = {:msg_on_error => false }
+          line_num = @proc.get_an_int(arg, opts) 
+          if line_num
+            cm = find_method_with_line(current_method, line_num)
+            if cm
+              @proc.show_bytecode(line_num)
+            else
+              errmsg "Can't find that bytecode for line #{line_num}"
+            end
+          else
+            errmsg "Method #{arg} not found"
+          end
+        end
       end
     end
   end
@@ -113,6 +138,8 @@ if __FILE__ == $0
     # require_relative '../../lib/trepanning'
     # debugger
     cmd.run([cmd.name, 'self.setup'])
+    puts '=' * 40
+    cmd.run([cmd.name, __LINE__.to_s])
   end
   foo(cmd)
 end

data/processor/command/eval.rb

@@ -5,20 +5,40 @@ require_relative './base/cmd'
 
 class Trepan::Command::EvalCommand < Trepan::Command
 
+  NAME          = File.basename(__FILE__, '.rb')
   CATEGORY      = 'data'
   HELP    = <<-HELP
+#{NAME} [STRING]
+
 Run code in the context of the current frame.
 
 The value of the expression is stored into a global variable so it
 may be used again easily. The name of the global variable is printed
 next to the inspect output of the value.
+
+If no string is given we run the string from the current source code
+about to be run
+
+#{NAME} 1+2  # 3
+#{NAME} @v
+#{NAME}      # Run current source-code line
+
+See also 'set autoeval'
       HELP
 
   NAME          = File.basename(__FILE__, '.rb')
   NEED_STACK    = true
   SHORT_HELP    = 'Run code in the current context'
   def run(args)
-    @proc.debug_eval(@proc.cmd_argstr, settings[:maxstring])
+    if args.size == 1
+      loc = @proc.source_location_info
+      opts = {:reload_on_change => @proc.reload_on_change}
+      loc, junk, text = @proc.loc_and_text(loc, opts)
+      msg "eval: #{text}"
+    else
+      text = @proc.cmd_argstr
+    end
+    @proc.eval_code(text, settings[:maxstring])
   end
 end
 
@@ -26,8 +46,6 @@ if __FILE__ == $0
   require_relative '../mock'
   dbgr, cmd = MockDebugger::setup
   arg_str = '1 + 2'
-  ## cmd.proc.instance_variable_set('@cmd_argstr', arg_str)
-  dbgr.instance_variable_set('@cmd_argstr', arg_str)
-
-  ## cmd.run([cmd.name, arg_str])
+  cmd.proc.instance_variable_set('@cmd_argstr', arg_str)
+  puts "eval #{arg_str} is: #{cmd.run([cmd.name, arg_str])}"
 end

data/processor/command/help.rb

@@ -1,6 +1,7 @@
 # Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 require 'rubygems'; require 'require_relative'
 require_relative 'base/cmd'
+require_relative '../../app/complete'
 class Trepan::Command::HelpCommand < Trepan::Command
 
   unless defined?(HELP)
@@ -40,6 +41,30 @@ See also 'examine' and 'whatis'.
     SHORT_HELP    = 'Print commands or give help for command(s)'
   end
 
+  def complete(prefix)
+    matches = Trepan::Complete.complete_token(CATEGORIES.keys + 
+                                              %w(* syntax all) + 
+                                          @proc.commands.keys, prefix)
+    aliases = Trepan::Complete.complete_token_filtered(@proc.aliases, prefix, 
+                                                       matches)
+    (matches + aliases).sort
+  end    
+
+  def complete(prefix)
+    matches = Trepan::Complete.complete_token(CATEGORIES.keys + 
+                                              %w(* syntax all) + 
+                                          @proc.commands.keys, prefix)
+    aliases = Trepan::Complete.complete_token_filtered(@proc.aliases, prefix, 
+                                                       matches)
+    (matches + aliases).sort
+  end    
+
+  def complete_token_with_next(prefix)
+    complete(prefix).map do |cmd| 
+      [cmd, @proc.commands.member?(cmd) ? @proc.commands[cmd] : nil]
+    end
+  end
+
   # List the command categories and a short description of each.
   def list_categories
     section 'Classes of commands:'
@@ -49,7 +74,9 @@ See also 'examine' and 'whatis'.
     final_msg = '
 Type "help" followed by a class name for a list of commands in that class.
 Type "help syntax" for information on debugger command syntax.
-Type "help *" for the list of all commands.
+Type "help aliases" for a list of current aliases
+Type "help macros" for a list of current macros
+Type "help *" for the list of all commands, macros and aliases.
 Type "help all" for the list of all commands.
 Type "help REGEXP" for the list of commands matching /^#{REGEXP}/
 Type "help CLASS *" for the list of all commands in class CLASS.
@@ -65,6 +92,12 @@ Type "help" followed by command name for full documentation.
       if cmd_name == '*'
         section 'All command names:'
         msg columnize_commands(@proc.commands.keys.sort)
+        show_aliases  unless @proc.aliases.empty?
+        show_macros unless @proc.macros.empty?
+      elsif cmd_name =~ /^aliases$/i
+        show_aliases
+      elsif cmd_name =~ /^macros$/i
+        show_macros
       elsif cmd_name =~ /^syntax$/i
         show_command_syntax
       elsif cmd_name =~ /^all$/i
@@ -91,6 +124,9 @@ Type "help" followed by command name for full documentation.
             msg "Aliases: #{cmd_obj.class.const_get(:ALIASES).join(', ')}"
           end
         end
+      elsif @proc.macros.member?(cmd_name)
+        msg "#{cmd_name} is a macro which expands to:"
+        msg "  #{@proc.macros[cmd_name]}", {:unlimited => true}
       else
         matches = @proc.commands.keys.grep(/^#{cmd_name}/).sort rescue []
         if matches.empty?
@@ -105,6 +141,11 @@ Type "help" followed by command name for full documentation.
     end
   end
 
+  def show_aliases
+    section 'All alias names:'
+    msg columnize_commands(@proc.aliases.keys.sort)
+  end
+
   # Show short help for all commands in `category'.
   def show_category(category, args)
       
@@ -130,7 +171,7 @@ Type "help" followed by command name for full documentation.
   def show_command_syntax
     section "Debugger command syntax"
     msg <<-EOS
-Command command syntax is very simple-minded. 
+Command tokenization syntax is very simple-minded. 
 
 If a line starts with #, the command is ignored. 
 If a line starts with !, the line is eval'd. 
@@ -144,11 +185,16 @@ after the leading command string are put back on a command queue.
 
 Within a single command, tokens are then white-space split. Again,
 this process disregards quotes or symbols that have meaning in Ruby.
+Some commands like 'eval' and 'macro' have access to the untokenized
+string entered and make use of that rather than the tokenized list.
 
-The first token is then looked up in the debugger command table and
-then the debugger alias table. If a match is found the command name
-and arguments are dispatched to the command object that process the
-command.
+The leading token is first looked up in the macro table. If it
+found there, the expansion is replaces the current command and possibly
+other commands pushed onto a command queue.  Next the leading token is
+looked up in the debugger alias table and the name may be substituted
+there. Finally, the leading token is looked up in the debugger alias
+table. If a match is found, the command name and arguments are
+dispatched to the command object that process the command.
 
 If the command is not found and "auto eval" is set on, then the
 command is eval'd in the context that the program is currently stopped
@@ -172,6 +218,12 @@ pr  "hi ;;-)"  # Syntax error since ;; splits the line and " is not closed.
 See also "alias", "irb", "set auto eval", and "set auto irb".
     EOS
   end
+
+  def show_macros
+    section 'All macro names:'
+    msg columnize_commands(@proc.macros.keys.sort)
+  end
+
 end
 
 if __FILE__ == $0
@@ -194,4 +246,6 @@ if __FILE__ == $0
   cmd.run %W(#{cmd.name} s.*)
   puts '=' * 40
   cmd.run %W(#{cmd.name} s<>)
+  puts '=' * 40
+  p cmd.complete('br')
 end