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

data/processor/{command/base/cmd.rb → command.rb}

@@ -5,7 +5,7 @@
 # will think this a command name like QuitCommand 
 require 'rubygems'; require 'require_relative'
 require 'columnize'
-require_relative '../../../app/complete'
+require_relative '../app/complete'
 
 class Trepan
   class Command

data/processor/command/alias.rb

@@ -1,6 +1,6 @@
 # Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 require 'rubygems'; require 'require_relative'
-require_relative 'base/cmd'
+require_relative '../command'
 
 class Trepan::Command::AliasCommand < Trepan::Command
 
@@ -9,7 +9,18 @@ class Trepan::Command::AliasCommand < Trepan::Command
     HELP = <<-HELP
 #{NAME} ALIAS COMMAND
 
-Add an alias for a COMMAND
+Add alias ALIAS for a debugger command COMMAND.  
+
+Add an alias when you want to use a command abbreviation for a command
+that would otherwise be ambigous. For example, by default we make 's'
+be an alias of 'step' to force it to be used. Without the alias, "s"
+might be "step", "show", or "set" among others
+
+Example:
+
+alias cat list   # "cat rubyfile.rb" is the same as "list rubyfile.rb"
+alias s   step   # "s" is now an alias for "step".
+                 # The above examples done by default.
 
 See also 'unalias' and 'show #{NAME}'.
     HELP
@@ -50,5 +61,5 @@ if __FILE__ == $0
   dbgr, cmd = MockDebugger::setup
   cmd.run %W(#{cmd.name} yy foo)
   cmd.run [cmd.name]
-  cmd.run %W(cmd.name yy next)
+  cmd.run %W(cmd.name yy alias)
 end

data/processor/command/backtrace.rb

@@ -1,5 +1,6 @@
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 require 'rubygems'; require 'require_relative'
-require_relative './base/cmd'
+require_relative '../command'
 
 class Trepan::Command::BacktraceCommand < Trepan::Command
   ALIASES      = %w(bt where)

data/processor/command/base/subcmd.rb

@@ -10,7 +10,7 @@
 # functions for command from module cmdfns.
 
 require 'rubygems'; require 'require_relative'
-require_relative 'cmd'
+require_relative '../../command'
 
 class Trepan
 
@@ -131,10 +131,6 @@ class Trepan
       ["#{subcmd_prefix_string} #{settings[subcmd_setting_key]}"]
     end
 
-    def settings
-      @proc.settings
-    end
-        
     def subcmd_prefix_string
       self.class.const_get(:PREFIX).join(' ')
     end

data/processor/command/base/submgr.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 require 'rubygems'; require 'require_relative'
-require_relative 'cmd'
+require_relative '../../command'
 require_relative '../../subcmd'
 require_relative '../../help'
 require_relative '../../../app/complete'
@@ -165,7 +165,10 @@ class Trepan::SubcommandMgr < Trepan::Command
     # Run that.
     subcmd = @subcmds.lookup(subcmd_prefix)
     if subcmd
-      subcmd.run(args)
+      if @proc.ok_for_running(subcmd, subcmd.class.const_get('CMD'),
+                              args.size-2)
+        subcmd.run(args)
+      end
     else
       undefined_subcmd(@name, subcmd_prefix)
     end

data/processor/command/base/subsubcmd.rb

@@ -10,7 +10,7 @@
 # functions for command from module cmdfns.
 
 require 'rubygems'; require 'require_relative'
-require_relative 'cmd'
+require_relative '../../command'
 require_relative 'subcmd'
 
 class Trepan

data/processor/command/base/subsubmgr.rb

@@ -160,19 +160,19 @@ class Trepan::SubSubcommandMgr < Trepan::Subcommand
 
   def run(args)
     args = @parent.last_args if args.size == 0
-    if args.size < 3 || args.size == 3 && args[-1] == '*'
+    if args.size < 3 || args.size == 3 && args[2] == '*'
       summary_list(obj_const(self, :NAME), @subcmds)
       return false
     end
 
-    subcmd_prefix = args[0..2].join('')
+    subcmd_prefix = obj_const(self, :PREFIX).join('')
     # We were given: cmd subcmd ...
     # Run that.
-    subcmd = @subcmds.lookup(subcmd_prefix)
+    subcmd = @subcmds.lookup(subcmd_prefix + args[2])
     if subcmd
       subcmd.run(args[2..-1])
     else
-      undefined_subcmd(obj_const(self, :PREFIX).join(' '), args[-1])
+      undefined_subcmd(obj_const(self, :PREFIX).join(' '), args[2])
     end
   end
 

data/processor/command/break.rb

@@ -1,6 +1,6 @@
 # Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 require 'rubygems'; require 'require_relative'
-require_relative './base/cmd'
+require_relative '../command'
 
 class Trepan::Command::BreakCommand < Trepan::Command
 

data/processor/command/complete.rb

@@ -1,6 +1,6 @@
 # Copyright (C) 2011 Rocky Bernstein <rockyb@rubyforge.net>
 require 'rubygems'; require 'require_relative'
-require_relative 'base/cmd'
+require_relative '../command'
 require_relative '../load_cmds'
 class Trepan::Command::CompleteCommand < Trepan::Command
 
@@ -30,6 +30,7 @@ if __FILE__ == $0
   require_relative '../mock'
   dbgr, cmd = MockDebugger::setup
   %w(d b bt).each do |prefix|
+    cmd.proc.instance_variable_set('@cmd_argstr', prefix)
     cmd.run [cmd.name, prefix]
     puts '=' * 40
   end

data/processor/command/condition.rb

@@ -1,7 +1,7 @@
 # -*- 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 'base/cmd'
+require_relative '../command'
 require_relative '../breakpoint'
 require_relative '../../app/breakpoint'
 require_relative '../../app/condition'

data/processor/command/continue.rb

@@ -1,6 +1,6 @@
 # Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 require 'rubygems'; require 'require_relative'
-require_relative 'base/cmd'
+require_relative '../command'
 require_relative '../stepping'
 
 class Trepan::Command::ContinueCommand < Trepan::Command
@@ -14,15 +14,15 @@ the debugger however may occur via breakpoints or explicit calls, or
 exceptions.
 
 If a parameter is given, a temporary breakpoint is set at that position
-before continuing. Offset are numbers prefixed with an "O" otherwise
+before continuing. Offset are numbers prefixed with an "@" otherwise
 the parameter is taken as a line number.
 
 Examples:
    #{NAME}
    #{NAME} 10    # continue to line 10
-   #{NAME} o20   # continue to VM Instruction Sequence offset 20
+   #{NAME} @20   # 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
+   #{NAME} IRB.start @7 # continue to IRB.start offset 7
 
 See also 'step', 'next', 'finish', 'nexti' commands and "help location".
     HELP

data/processor/command/delete.rb

@@ -1,29 +1,43 @@
+# Copyright (C) 2011 Rocky Bernstein <rockyb@rubyforge.net>
 require 'rubygems'; require 'require_relative'
-require_relative './base/cmd'
+require_relative '../command'
 
 class Trepan::Command::DeleteBreakpontCommand < Trepan::Command
-  CATEGORY     = 'breakpoints'
-  NAME         = File.basename(__FILE__, '.rb')
-  SHORT_HELP   = 'Delete a breakpoint'
-  HELP         = <<-HELP
-Specify the breakpoint by number, use 'info break' to see the numbers
-      HELP
 
-  def run(args)
-    if args.size != 2
-      errmsg 'Please specify which breakpoint by number'
-      return
-    end
+  unless defined?(HELP)
+    NAME = File.basename(__FILE__, '.rb')
+    HELP = <<-HELP
+#{NAME} [bpnumber [bpnumber...]]  
+
+Delete some breakpoints.
+
+Arguments are breakpoint numbers with spaces in between.  To delete
+all breakpoints, give no argument.  those breakpoints.  Without
+argument, clear all breaks (but first ask confirmation).
     
-    begin
-      i = Integer(args[1])
-    rescue ArgumentError
-      errmsg "'#{args}' is not a number"
-      return
+See also the "clear" command which clears breakpoints by line/file
+number.
+    HELP
+
+    CATEGORY      = 'breakpoints'
+    SHORT_HELP    = 'Delete some breakpoints'
+  end
+
+  def run(args)
+    if args.size == 1
+      if confirm('Delete all breakpoints?', false)
+        @proc.brkpts.reset
+        return
+      end
     end
-    
-    if @proc.delete_breakpoint_by_number(i)
-      msg('Deleted breakpoint %d.' % i)
+    first = args.shift
+    args.each do |num_str|
+      opts = {:msg_on_error => '%s must be a number' % num_str}
+      i = @proc.get_an_int(num_str, opts)
+      if i 
+        success = @proc.delete_breakpoint_by_number(num_str.to_i, false) if i
+        msg('Deleted breakpoint %d.' % i) if success
+      end
     end
   end
 end

data/processor/command/directory.rb

@@ -1,6 +1,6 @@
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 require 'rubygems'; require 'require_relative'
-require_relative 'base/cmd'
+require_relative '../command'
 class Trepan::Command::DirectoryCommand < Trepan::Command
 
   unless defined?(HELP)
@@ -36,8 +36,8 @@ Examples:
       msg "Source directories searched: #{settings[:directory]}"
     else
       if confirm('Reintialize source path to empty?', false)
-        settings[:directory] = '$cdir:$cwd'
-        msg 'Source directories searched: $cdir:$cwd'
+        settings[:directory] = '$rbx:$cdir:$cwd'
+        msg "Source directories searched: #{settings[:directory]}"
       end
     end
   end

data/processor/command/disable.rb

@@ -0,0 +1,71 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+require 'rubygems'; require 'require_relative'
+require_relative '../command'
+require_relative '../../app/util'
+require_relative '../breakpoint'
+require_relative '../../app/breakpoint'
+
+# disable breakpoint command. The difference however is that the
+# parameter to @proc.en_disable_breakpoint_by_number is different (set
+# as ENABLE_PARM below).
+#
+# NOTE: The enable command  subclasses this, so beware when changing! 
+class Trepan::Command::DisableCommand < Trepan::Command
+
+  Trepan::Util.suppress_warnings {
+    NAME = File.basename(__FILE__, '.rb')
+    HELP = <<-HELP
+#{NAME} [display] NUM1 [NUM2 ...]
+
+Disables the breakpoints or display given as a space separated list of
+numbers. 
+
+See also "enable" and "info break".
+  HELP
+
+    CATEGORY      = 'breakpoints'
+    SHORT_HELP    = 'Disable some breakpoints or displays'
+  }
+
+  def initialize(proc)
+    super
+    @enable_parm = false # true if enable 
+  end
+  
+  def run(args)
+    if args.size == 1
+      errmsg('No breakpoint or display number given.')
+      return
+    end
+  if args[1] == 'display'
+    args.shift
+    first = args.shift
+    args.each do |num_str|
+      i = @proc.get_an_int(num_str)
+      success = @proc.en_disable_display_by_number(i, @enable_parm) if i
+      msg("Display %s #{@name}d." % i) if success
+    end
+  end
+    first = args.shift
+    args.each do |num_str|
+      i = @proc.get_an_int(num_str)
+      success = @proc.en_disable_breakpoint_by_number(i, @enable_parm) if i
+      msg("Breakpoint %s #{@name}d." % i) if success
+    end
+  end
+end
+        
+if __FILE__ == $0
+  require_relative '../mock'
+  dbgr, cmd = MockDebugger::setup
+  cmd.run([cmd.name])
+  cmd.run([cmd.name, '1'])
+  cmdproc = dbgr.core.processor
+  cmds = cmdproc.commands
+  break_cmd = cmds['break']
+  break_cmd.run(['break', cmdproc.frame.source_location[0].to_s])
+  # require_relative '../../lib/trepanning'
+  # Trepan.debug
+  cmd.run([cmd.name, '1'])
+end

data/processor/command/disassemble.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 2011 Rocky Bernstein <rockyb@rubyforge.net>
 require 'rubygems'; require 'require_relative'
-require_relative './base/cmd'
+require_relative '../command'
 require_relative '../../app/method'
 require_relative '../../app/iseq'
 
@@ -10,10 +10,10 @@ class Trepan::Command::DisassembleCommand < Trepan::Command
   include Trepanning::Method
 
   NAME         = File.basename(__FILE__, '.rb')
-  ALIASES       = %w(disas disassem) # Note we (will) have disable
+  ALIASES      = %w(disasm) # Note we have disable
   CATEGORY     = 'data'
   HELP         = <<-HELP
-#{NAME} [all]
+#{NAME} [--all | -a]
 #{NAME} [method|LINE-NUM]...
 
 Disassembles Rubinius VM instructions. By default, the bytecode for the
@@ -26,11 +26,11 @@ 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.
+If the argument is '--all', the entire method is shown as bytecode.
 
 Examples:
    #{NAME}              # dissasemble VM for current line
-   #{NAME} all          # disassemble entire current method
+   #{NAME} --all        # disassemble entire current method
    #{NAME} [1,2].max    # disassemble max method of Array
    #{NAME} Object.is_a? # disassemble Object.is_a?
    #{NAME} is_a?        # same as above (probably)
@@ -40,6 +40,11 @@ Examples:
 
   NEED_STACK   = true
   SHORT_HELP   = 'Show the bytecode for the current method'
+  DEFAULT_OPTIONS = {
+      :all => false,
+  }
+
+  completion %w(-a --all)
 
   def disassemble_method(cm)
     frame_ip = (@proc.frame.method == cm) ? @proc.frame.next_ip : nil
@@ -77,11 +82,15 @@ Examples:
 
     # FIXME DRY with ../disassemble.rb
     if settings[:highlight]
-      require_relative '../../app/rbx-llvm'
-      @llvm_highlighter ||= CodeRay::Duo[:llvm, :term]
-      # llvm_scanner = CodeRay.scanner :llvm
-      # p llvm_scanner.tokenize(disasm)
-      disasm = @llvm_highlighter.encode(disasm)
+      begin
+        require_relative '../../app/rbx-llvm'
+        @llvm_highlighter ||= CodeRay::Duo[:llvm, :term]
+        # llvm_scanner = CodeRay.scanner :llvm
+        # p llvm_scanner.tokenize(disasm)
+        disasm = @llvm_highlighter.encode(disasm)
+      rescue LoadError
+        errmsg 'Highlighting requested but CodeRay is not installed.'
+      end
     end
       
     disasm.split("\n").each_with_index do |inst, i|
@@ -89,13 +98,33 @@ Examples:
     end
   end
 
+  def parse_options(options, args) # :nodoc
+    parser = OptionParser.new do |opts|
+      opts.on('-a', '--all', 
+              'show entire method') do
+        options[:all] = true
+      end
+    end
+    begin
+      parser.parse! args
+    rescue OptionParser::InvalidOption => e
+      errmsg e
+    end
+    return options
+
+  end
+
   # Run command. 
   def run(args)
-    if 1 == args.size
-      @proc.show_bytecode
-    elsif 'all' == args[1]
-      section "Bytecode for #{@proc.frame.vm_location.describe}"
-      disassemble_method(current_method)
+    my_args = args[1..-1]
+    options = parse_options(DEFAULT_OPTIONS.dup, my_args)
+    if my_args.empty?
+      if options[:all]
+        section "Bytecode for #{@proc.frame.vm_location.describe}"
+        disassemble_method(current_method)
+      else
+        @proc.show_bytecode
+      end
     else
       args[1..-1].each do |arg|
         cm = @proc.parse_method(arg)
@@ -125,19 +154,23 @@ if __FILE__ == $0
   # Demo it.
   require_relative '../mock'
   dbgr, cmd = MockDebugger::setup
+  def five; 5 end
   def foo(cmd)
     puts "#{cmd.name}"
     cmd.run([cmd.name])
     puts '=' * 40
-    puts "#{cmd.name} all"
-    cmd.run([cmd.name, 'all'])
+    puts "#{cmd.name} --all"
+    # require_relative '../../lib/trepanning'; debugger
+    cmd.run([cmd.name, '--all'])
+    puts '=' * 40
+    cmd.run([cmd.name, '-a'])
     puts '=' * 40
-    p cmd.proc.frame.vm_location.describe
-    cmd.run([cmd.name, 'foo'])
+    cmd.run([cmd.name, 'five'])
+    ## FIXME: someday handle:
+    # puts '=' * 40
+    # cmd.run([cmd.name, '-a', 'five'])
     puts '=' * 40
-    # require_relative '../../lib/trepanning'
-    # debugger
-    cmd.run([cmd.name, 'self.setup'])
+    cmd.run([cmd.name, 'MockDebugger::setup'])
     puts '=' * 40
     cmd.run([cmd.name, __LINE__.to_s])
     require 'irb'