rb8-trepanning 0.1.3 → 0.1.4

data/processor/command/set_subcmd/trace.rb

@@ -7,14 +7,15 @@ require_relative '../base/subsubmgr'
 class Trepan::SubSubcommand::SetTrace < Trepan::SubSubcommandMgr 
   unless defined?(HELP)
     Trepanning::Subcommand.set_name_prefix(__FILE__, self)
-    HELP = "Set tracing of various sorts.
+    HELP = <<-EOH
+Set tracing of various sorts.
 
 The types of tracing include events from the trace buffer, or printing
 those events.
 
-See 'help #{PREFIX.join(' ')} *' for a list of subcommands or 'help set trace
-<name>' for help on a particular trace subcommand."
-
+See "help #{PREFIX.join(' ')} *" for a list of subcommands or "#{PREFIX.join(' ')} <name>" 
+for help on a particular trace subcommand.
+    EOH
     IN_LIST    = true
     MIN_ABBREV = 'tr'.size
     SHORT_HELP = 'Set tracing of various sorts.'

data/processor/command/set_subcmd/trace_subcmd/print.rb

@@ -7,13 +7,14 @@ class Trepan::SubSubcommand::SetTracePrint < Trepan::SetBoolSubSubcommand
   unless defined?(HELP)
     Trepanning::SubSubcommand.set_name_prefix(__FILE__, self)
     HELP         = <<-EOH
-#{CMD} [on|off|1|0]
+#{CMD} [on|off]
 
-Set printing trace events.
+Set printing trace events. This is similar to "set -x" tracing in 
+POSIX shells.
     EOH
 
     MIN_ABBREV   = 'p'.size  
-    SHORT_HELP   = 'Set print trace events'
+    SHORT_HELP   = 'Set print trace events, like "set -x" of POSIX shell'
   end
 
   def run(args)

data/processor/command/shell.rb

@@ -1,13 +1,13 @@
 # Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 require 'rubygems'; require 'require_relative'
-require_relative '../../io/input' # For GNU_readline?
-Trepan.suppress_warnings { require 'irb' }
-require_relative 'base/cmd'
+require_relative '../command'
 require_relative '../../app/irb'
 
 class Trepan::Command::IRBCommand < Trepan::Command
 
   unless defined?(HELP)
+    require_relative '../../io/input' # For GNU_readline? and supress_warnings
+    Trepan.suppress_warnings { require 'irb' }
     NAME = File.basename(__FILE__, '.rb')
     HELP = <<-HELP
 #{NAME} [-d]
@@ -62,8 +62,8 @@ Here then is a loop to query VM stack values:
     end
 
     $trepan = @proc.dbgr 
+    $trepan_cmdproc  = @proc
     if add_debugging
-      $trepan_cmdproc  = @proc
       $trepan_frame    = @proc.frame
     end
     $trepan_in_irb = true
@@ -127,6 +127,7 @@ end
 
 if __FILE__ == $0
   require_relative '../mock'
+  require_relative '../../app/irb'
   # dbgr, cmd = MockDebugger::setup
   dbgr, cmd = MockDebugger::setup(nil, false)
   cmd.proc.frame.instance_variable_set('@binding', binding)

data/processor/command/show_subcmd/{alias.rb → aliases.rb}

@@ -3,7 +3,7 @@
 require 'rubygems'; require 'require_relative'
 require_relative '../base/subcmd'
 
-class Trepan::Subcommand::ShowAlias < Trepan::Subcommand
+class Trepan::Subcommand::ShowAliases < Trepan::Subcommand
   Trepanning::Subcommand.set_name_prefix(__FILE__, self)
   unless defined?(HELP)
     HELP         = <<-EOH
@@ -32,7 +32,7 @@ all alias names
     elsif @proc.aliases.empty?
       msg "No aliases defined."
     else
-      section "List of aliases names currently defined:"
+      section "List of alias names currently defined:"
       msg columnize_commands(@proc.aliases.keys.sort)
     end
   end

data/processor/command/source.rb

@@ -4,7 +4,7 @@ require 'optparse'
 
 # Our local modules
 require 'rubygems'; require 'require_relative'
-require_relative 'base/cmd'
+require_relative '../command'
 require_relative '../../interface/script'
 require_relative '../../io/null_output'
 require_relative '../../app/default'

data/processor/command/step.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::StepCommand < Trepan::Command
 
@@ -68,10 +68,7 @@ See also the commands:
       step_count = @proc.get_an_int(step_str, count_opts)
       return unless step_count
     end
-    ## @proc.state.context.step(step_count, force)
-    @proc.context.step(step_count, opts[:different_pos])
-    @proc.state.proceed
-    @proc.leave_cmd_loop = true
+    @proc.step(step_count, opts)
   end
 end
 

data/processor/command/tbreak.rb

@@ -1,5 +1,5 @@
 require 'rubygems'; require 'require_relative'
-require_relative './base/cmd'
+require_relative '../command'
 require_relative 'break'
 
 class Trepan::Command::SetTempBreakpointCommand < 

data/processor/command/unalias.rb

@@ -1,17 +1,18 @@
-# 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 '../../app/complete'
 
 class Trepan::Command::UnaliasCommand < Trepan::Command
 
   unless defined?(HELP)
-    HELP = 
-"unalias COMMAND
+    HELP = <<-HELP
+unalias ALIAS
 
-Remove alias for COMMAND
+Remove alias ALIAS
 
 See also 'alias'.
-"
+HELP
 
     CATEGORY      = 'support'
     MIN_ARGS      = 1
@@ -21,6 +22,10 @@ See also 'alias'.
     SHORT_HELP    = 'Remove an alias'
   end
   
+  def complete(prefix)
+    Trepan::Complete.complete_token(@proc.aliases.keys, prefix)
+  end
+
   # Run command. 
   def run(args)
     args[1..-1].each do |arg|
@@ -38,7 +43,7 @@ if __FILE__ == $0
   # Demo it.
   require_relative '../mock'
   dbgr, cmd = MockDebugger::setup
-  cmd.run %w(cmd.name exit!)
-  cmd.run %w(cmd.name exit!)
+  cmd.run %w(cmd.name n)
+  cmd.run %w(cmd.name n)
   cmd.run %w(cmd.name foo bar c)
 end

data/processor/command/undisplay.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 require 'rubygems'; require 'require_relative'
-require_relative 'base/cmd'
+require_relative '../command'
 
 # undisplay display-number...
 class Trepan::Command::UndisplayCommand < Trepan::Command
@@ -9,37 +9,41 @@ class Trepan::Command::UndisplayCommand < Trepan::Command
   unless defined?(HELP)
     NAME = File.basename(__FILE__, '.rb')
     HELP = <<EOH
-undisplay DISPLAY_NUMBER ...
+#{NAME} DISPLAY_NUMBER ...
 Cancel some expressions to be displayed when program stops.
 Arguments are the code numbers of the expressions to stop displaying.
 No argument means cancel all automatic-display expressions.
 "delete display" has the same effect as this command.
-Do "info display" to see current list of code numbers.
+Use "info display" to see current list of display numbers.
 EOH
 
-    ALIASES       = %w(und)
     CATEGORY      = 'data'
     NEED_STACK    = false
     SHORT_HELP    = 'Cancel some expressions to be displayed when program stops'
   end
 
+  def complete(prefix)
+    @proc.displays.nums.map{|disp| disp.to_s}
+  end
+
   def run(args)
     
     if args.size == 1
-      @proc.displays.clear
-      return
+      if confirm('Delete all displays?', false)
+        @proc.displays.clear
+        return
+      end
     end
     opts = {}
     args[1..-1].each do |arg|
-      opts[:msg_on_error] = '%s must be a display number' % arg
+      opts = {:msg_on_error => '%s must be a display number' % arg}
       i = @proc.get_an_int(arg, opts)
       if i 
         unless @proc.displays.delete_index(i)
-          errmsg("no display number %d." % i)
+          errmsg("No display number %d." % i)
           return
         end
       end
-      return false
     end
   end
 end

data/processor/command/up.rb

@@ -1,17 +1,15 @@
-# 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'
 
-# up command. Like 'down' butthe direction (set by DIRECTION) is different.
+# up command. Like 'down' but the direction (set by DIRECTION) is different.
 #
 # NOTE: The down command  subclasses this, so beware when changing! 
 class Trepan::Command::UpCommand < Trepan::Command
 
-  # Silence already initialized constant .. warnings
-  old_verbose = $VERBOSE  
-  $VERBOSE    = nil
-  NAME        = File.basename(__FILE__, '.rb')
-  HELP        = <<-HELP
+  Trepan::Util.suppress_warnings {
+    NAME        = File.basename(__FILE__, '.rb')
+    HELP        = <<-HELP
 #{NAME} [count]
 
 Move the current frame up in the stack trace (to an older frame). 0 is
@@ -20,12 +18,12 @@ the most recent frame. If no count is given, move up 1.
 See also 'down' and 'frame'.
   HELP
 
-  ALIASES       = %w(u)
-  CATEGORY      = 'stack'
-  MAX_ARGS      = 1  # Need at most this many
-  NEED_STACK    = true
-  SHORT_HELP    = 'Move frame in the direction of the caller of the last-selected frame'
-  $VERBOSE      = old_verbose
+    ALIASES       = %w(u)
+    CATEGORY      = 'stack'
+    MAX_ARGS      = 1  # Need at most this many
+    NEED_STACK    = true
+    SHORT_HELP    = 'Move frame in the direction of the caller of the last-selected frame'
+  }
 
   def complete(prefix)
     @proc.frame_complete(prefix, @direction)