trepanning 0.1.0 → 0.1.1

data/processor/.gitignore

@@ -0,0 +1 @@
+/*~

data/processor/Makefile

@@ -0,0 +1,7 @@
+# Whatever it is you want to do, it should be forwarded to the 
+# to top-level irectories
+PHONY=check
+check:
+
+%: 
+	$(MAKE) -C .. $@

data/processor/breakpoint.rb

@@ -17,6 +17,10 @@ class Trepan
       @brkpt  = nil
     end
 
+    def breakpoint_finalize
+      @brkpts.finalize
+    end
+
     def breakpoint?
       @brkpt = @brkpts.find(@frame.iseq, @frame.pc_offset, @frame.binding)
       @brkpts.delete_by_brkpt(@brkpt) if @brkpt && @brkpt.temp?
@@ -71,13 +75,14 @@ class Trepan
       @brkpts.add(found_iseq, offset, :temp => temp)
     end
 
-    def breakpoint_offset(offset, iseq, temp=false)
+    def breakpoint_offset(offset, iseq, condition, negate, temp=false)
       # FIXME: handle breakpoint conditions.
       unless iseq.offsetlines.keys.member?(offset)
         errmsg("Offset #{offset} not found in #{iseq.name} for breakpoint.")
         return nil
       end
-      @brkpts.add(iseq, offset, :temp => temp, :type => 'offset')
+      @brkpts.add(iseq, offset, :temp => temp, :condition => condition,
+                  :negate => negate, :type => 'offset')
     end
 
     # Delete a breakpoint given its breakpoint number.

data/processor/command/.gitignore

@@ -0,0 +1 @@
+/*~

data/processor/command/Makefile

@@ -0,0 +1,7 @@
+# Whatever it is you want to do, it should be forwarded to the 
+# to top-level irectories
+PHONY=check all
+all: check
+
+%: 
+	$(MAKE) -C ../.. $@

data/processor/command/alias.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 require_relative 'base/cmd'
 
 class Trepan::Command::AliasCommand < Trepan::Command
@@ -10,7 +10,7 @@ class Trepan::Command::AliasCommand < Trepan::Command
 
 Add an alias for a COMMAND
 
-See also 'unalias'.
+See also 'unalias' and 'show #{NAME}'.
     HELP
 
     CATEGORY      = 'support'

data/processor/command/backtrace.rb

@@ -32,6 +32,10 @@ Examples:
   require_relative '../../app/frame'
   include Trepan::Frame
 
+  def complete(prefix)
+    @proc.frame_complete(prefix, nil)
+  end
+  
   # This method runs the command
   def run(args)
     unless @proc.frame

data/processor/command/base/cmd.rb

@@ -4,6 +4,7 @@
 # Note: don't end classname with Command (capital C) since main
 # will think this a command name like QuitCommand 
 require 'columnize'
+require_relative '../../../app/complete'
 
 class Trepan
   class Command
@@ -59,8 +60,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)
@@ -101,5 +102,47 @@ class Trepan
                           end
       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
+  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')
 end

data/processor/command/base/subcmd.rb

@@ -159,10 +159,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
@@ -200,7 +201,8 @@ module Trepanning
       dirname    = File.basename(File.dirname(File.expand_path(__file__)))
       name = File.basename(__file__, '.rb')
       klass.const_set('NAME', name)
-      klass.const_set('PREFIX', %W(#{dirname[0...-'_subcmd'.size]} #{name}))
+      prefix = klass.const_set('PREFIX', %W(#{dirname[0...-'_subcmd'.size]} #{name}))
+      klass.const_set('CMD', prefix.join(' '))
     end
   end
 end

data/processor/command/base/submgr.rb

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 require_relative 'cmd'
 require_relative '../../subcmd'
 require_relative '../../help'
+require_relative '../../../app/complete'
 
 class Trepan::SubcommandMgr < Trepan::Command
 
@@ -17,7 +18,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
 
@@ -75,13 +76,12 @@ class Trepan::SubcommandMgr < Trepan::Command
     end
     subcmd_names.each do |name|
       next unless Trepan::SubSubcommand.constants.member?(name.to_sym)
-      subcmd_class = "Trepan::SubSubcommand::#{name}.new(self, parent)"
+      subcmd_class = Trepan::SubSubcommand.const_get(name)
       begin
-        cmd = self.instance_eval(subcmd_class)
-      rescue
-        puts "Subcmd #{name} is bad"
+        cmd = subcmd_class.send(:new, self, parent)
+      rescue Exception => exc
+        puts "Subcmd #{name} in #{parent.name.inspect} is bad: #{exc}"
       end
-      cmd_name = cmd.name
       @subcmds.add(cmd)
     end
   end
@@ -151,7 +151,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)
@@ -173,15 +184,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
-  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/subsubcmd.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 # A base class for debugger subcommands of subcommands.
 #
 # Note: don't end classname with Command (capital C as in SubCommand),
@@ -62,6 +62,7 @@ class Trepan
   end
 
   class SetBoolSubSubcommand < SubSubcommand
+    completion %w(on off)
     def run(args)
       run_set_bool(args)
     end
@@ -85,6 +86,27 @@ class Trepan
   end
 end
 
+module Trepanning
+  module SubSubcommand
+    module_function
+    def set_name_prefix(__file__, klass)
+      full_dirname = File.dirname(File.expand_path(__file__))
+      full_parent_dirname = File.expand_path(File.join(full_dirname, '..'))
+      dirname = File.basename(full_dirname)
+      parent_dirname = File.basename(full_parent_dirname)
+      name = File.basename(__file__, '.rb')
+      klass.const_set('NAME', name)
+
+      short_dirname = dirname[0...-'_subcmd'.size]
+      short_parent_dirname = parent_dirname[0...-'_subcmd'.size]
+      prefix = klass.const_set('PREFIX', %W(#{short_parent_dirname} 
+                                            #{short_dirname} #{name}))
+      klass.const_set('CMD', prefix.join(' '))
+    end
+  end
+end
+
+
 if __FILE__ == $0
   # Demo it.
   require_relative '../../mock'

data/processor/command/base/subsubmgr.rb

@@ -144,6 +144,19 @@ 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,
+                                              self.prefix.join(''))
+  end
+
   def run(args)
     args = @parent.last_args if args.size == 0
     if args.size < 3 || args.size == 3 && args[-1] == '*'

data/processor/command/break.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 require_relative 'base/cmd'
 require_relative '../breakpoint'
 require_relative '../../app/breakpoint'
@@ -7,24 +7,24 @@ class Trepan::Command::BreakCommand < Trepan::Command
   unless defined?(HELP)
     NAME = File.basename(__FILE__, '.rb')
     HELP = <<-HELP
-#{NAME} [LINE-NUMBER|OFFSET]
-#{NAME} METHOD [LINE-NUMBER|OFFSET]
+#{NAME} 
+#{NAME} LOCATION [ {if|unless} CONDITION ]
 
-Set a breakpoint. If a line number is given, a breakpoint is set in
-that line number of the current instruction sequence. If an offset is
-given, a number prefaced with an "O", set a breakpoint at that
-instruction offset.
-
-With method name, a breakpoint it set at the beginning of the method.
-current instruction sequence. Currently you can add a module name in
-front of the method name, like FileUtils.cp, but not a class name like
-Dir.pwd. 
+Set a breakpoint. In the second form where CONDITIOn is given, the
+condition is evaluated in the context of the position. We stop only If
+CONDITION evalutes to non-false/nil and the "if" form used, or it is
+false and the "unless" form used.\
 
 Examples:
    #{NAME}
-   #{NAME} 10    # set breakpoint on line 10
-   #{NAME} o20   # set breakpoint VM Instruction Sequence offset 20
+   #{NAME} 10               # set breakpoint on line 10
+   #{NAME} 10 if 1 == a     # like above but only if a is equal to 1
+   #{NAME} 10 unless 1 == a # like above but only if a is equal to 1
+   #{NAME} me.rb:10
+   #{NAME} @20   # set breakpoint VM Instruction Sequence offset 20
    #{NAME} Kernel.pp # Set a breakpoint at the beginning of Kernel.pp
+
+See also condition, continue and "help location".
     HELP
 
     ALIASES      = %w(b)
@@ -40,17 +40,12 @@ Examples:
       # usage is "break"  which means break right here
       # FIXME: should handle condition
       bp = @proc.breakpoint_offset(@proc.frame.pc_offset, 
-                                   @proc.frame.iseq) 
+                                   @proc.frame.iseq, 'true', false) 
     else
-      position, iseq, use_offset, condition, name = 
-        @proc.breakpoint_position(args[1..-1])
-      return false unless position && iseq
-      bp = 
-        if use_offset
-          @proc.breakpoint_offset(position, iseq)
-        else
-          @proc.breakpoint_line(position, iseq)
-        end
+      iseq, line_number, vm_offset, condition, negate = 
+        @proc.breakpoint_position(@proc.cmd_argstr, true)
+      return false unless iseq && vm_offset
+      bp = @proc.breakpoint_offset(vm_offset, iseq, condition, negate)
     end
     if bp
       bp.condition = condition
@@ -78,15 +73,25 @@ end
 if __FILE__ == $0
   require_relative '../mock'
   dbgr, cmd = MockDebugger::setup
-  cmd.run([cmd.name])
-  cmd.run([cmd.name, __LINE__.to_s])
+  # require_relative '../../lib/trepanning'
+  def run_cmd(cmd, args) 
+    cmd.proc.instance_variable_set('@cmd_argstr', args[1..-1].join(' '))
+    cmd.run(args)
+  end
+
+  run_cmd(cmd, [cmd.name])
+  run_cmd(cmd, [cmd.name, __LINE__.to_s])
   require 'thread_frame'
   tf = RubyVM::ThreadFrame.current
   pc_offset = tf.pc_offset
-  cmd.run([cmd.name, "O#{pc_offset}"])
+  run_cmd(cmd, [cmd.name, "@#{pc_offset}"])
   def foo
     5 
   end
-  cmd.run([cmd.name, 'foo', (__LINE__-2).to_s])
-  cmd.run([cmd.name, 'foo'])
+  run_cmd(cmd, [cmd.name, 'foo', (__LINE__-2).to_s])
+  run_cmd(cmd, [cmd.name, 'foo'])
+  run_cmd(cmd, [cmd.name, "MockDebugger::setup"])
+  require 'irb'
+  run_cmd(cmd, [cmd.name, "IRB.start"])
+  run_cmd(cmd, [cmd.name, 'foo93'])
 end

data/processor/command/complete.rb

@@ -0,0 +1,37 @@
+# Copyright (C) 2011 Rocky Bernstein <rockyb@rubyforge.net>
+require_relative 'base/cmd'
+require_relative '../load_cmds'
+class Trepan::Command::CompleteCommand < Trepan::Command
+
+  unless defined?(HELP)
+    NAME          = File.basename(__FILE__, '.rb')
+    HELP = <<-HELP
+#{NAME} COMMAND-PREFIX
+
+List the completions for the rest of the line as a command.
+    HELP
+    CATEGORY      = 'support'
+    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
+    last_arg = @proc.cmd_argstr.end_with?(' ') ? '' : args[-1]
+    @proc.complete(@proc.cmd_argstr, last_arg).each do |match|
+      msg match
+    end
+  end
+end
+
+if __FILE__ == $0
+  # Demo it.
+  require_relative '../mock'
+  dbgr, cmd = MockDebugger::setup
+  %w(d b bt).each do |prefix|
+    cmd.run [cmd.name, prefix]
+    puts '=' * 40
+  end
+  cmd.run %w(#{cmd.name} fdafsasfda)
+  puts '=' * 40
+end