trepanning 0.1.3 → 0.1.4

data/processor/command/set_subcmd/auto.rb

@@ -6,7 +6,13 @@ require_relative '../base/subsubmgr'
 class Trepan::SubSubcommand::SetAuto < Trepan::SubSubcommandMgr
   unless defined?(HELP)
     Trepanning::Subcommand.set_name_prefix(__FILE__, self)
-    HELP   = 'Set controls for things with some sort of "automatic" default behavior'
+    HELP   = <<-EOH
+Set controls for things with some sort of "automatic" default behavior.
+
+See "#{PREFIX.join(' ')} *" for a list of subcommands or "#{PREFIX.join(' ')} <name>" 
+for help on a particular trace subcommand.
+    EOH
+    SHORT_HELP = 'Set controls for some "automatic" default behaviors'
   end
 end
 

data/processor/command/set_subcmd/different.rb

@@ -5,10 +5,10 @@ require_relative '../base/subcmd'
 class Trepan::Subcommand::SetDifferent < Trepan::SetBoolSubcommand
   unless defined?(HELP)
     Trepanning::Subcommand.set_name_prefix(__FILE__, self)
-    HELP = "
-set different [on|off|nostack]
+    HELP = <<-EOH
+#{PREFIX.join(' ')} [on|off|nostack]
 
-Set to make sure 'next/step' move to a new position.
+Set to make sure 'next' or 'step' moves to a new position.
 
 Due to the interpretive, expression-oriented nature of the Ruby
 Language and implementation, each line often may contain many possible
@@ -29,7 +29,8 @@ a given line. Also you can use 'next', but that also stepping into
 functions on different lines to also be skipped.
 
 See also 'step', 'next' which have suffixes '+' and '-' which
-override this setting."
+override this setting.
+    EOH
 
     IN_LIST      = true
     MIN_ABBREV   = 'dif'.size

data/processor/command/set_subcmd/substitute_subcmd/eval.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>
 require_relative '../../frame'
 require_relative '../../base/subsubcmd'
 require_relative '../substitute'
@@ -10,7 +10,7 @@ class Trepan::SubSubcommand::SetSubstituteEval < Trepan::SubSubcommand
 'set substitute eval [FRAME-NUM]
 
 Causes lines in an EVAL frame to show up as we stop/step through them. 
-The text fror the eval string comes from the current frame. 
+The text for the eval string comes from the current frame. 
 
 FRAME-NUM is a relative frame number unless prefaced with an "=" which
 indicates how many frames prior to move. The default is "0"

data/processor/command/set_subcmd/trace.rb

@@ -6,14 +6,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 "help #{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

@@ -6,13 +6,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,10 +1,12 @@
 # Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 require 'irb'
-require_relative 'base/cmd'
+require_relative '../command'
 require_relative '../../app/irb'
+
 class Trepan::Command::IRBCommand < Trepan::Command
 
   unless defined?(HELP)
+    require_relative '../../app/irb'
     NAME = File.basename(__FILE__, '.rb')
     HELP = <<-HELP
 #{NAME} [-d]
@@ -37,7 +39,7 @@ Here then is a loop to query VM stack values:
     ALIASES    = %w(irb)
     CATEGORY   = 'support'
     MAX_ARGS   = 1  # Need at most this many
-    SHORT_HELP = "Run #{NAME} as a command subshell"
+    SHORT_HELP = "Run irb as a command shell"
   end
 
   # This method runs the command
@@ -59,8 +61,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

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

@@ -2,7 +2,7 @@
 # Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 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
@@ -31,7 +31,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/show_subcmd/auto_subcmd/eval.rb

@@ -1,18 +1,13 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 require_relative '../../base/subsubcmd'
 
 class Trepan::SubSubcommand::ShowAutoEval < Trepan::ShowBoolSubSubcommand
   unless defined?(HELP)
-    HELP = "set auto eval [ON|OFF]
-
-Set this on if you want things that don't look like debugger command to be eval'd
-as a string."
-
+    HELP = "Show evaluation of unrecognized debugger commands"
     MIN_ABBREV   = 'ev'.size
     NAME         = File.basename(__FILE__, '.rb')
     PREFIX       = %w(show auto eval)
-    SHORT_HELP = "Show evaluation of unrecognized debugger commands"
   end
 
 end

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

@@ -4,11 +4,11 @@ require_relative '../../base/subsubcmd'
 
 class Trepan::SubSubcommand::ShowTracePrint < Trepan::ShowBoolSubSubcommand
   unless defined?(HELP)
-    HELP = "Show tracing print status"
+    HELP         = "Show tracing print (set -x) status"
     MIN_ABBREV   = 'p'.size
     NAME         = File.basename(__FILE__, '.rb')
-    PREFIX       = %w(show trace buffer)
-    SHORT_HELP   = "Show tracing print status"
+    PREFIX       = %w(show trace print)
+    SHORT_HELP   = "Show tracing print (set -x) status"
   end
 
 end

data/processor/command/show_subcmd/version.rb

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+require_relative '../base/subcmd'
+require_relative '../../../app/options'
+
+class Trepan::Subcommand::ShowVersion < Trepan::Subcommand
+  unless defined?(HELP)
+    Trepanning::Subcommand.set_name_prefix(__FILE__, self)
+    HELP = "Show debugger name and version"
+  end
+
+  def run(args)
+    msg Trepan.show_version
+  end
+
+end
+
+if __FILE__ == $0
+  # Demo it.
+  require_relative '../../mock'
+  dbgr, parent_cmd = MockDebugger::setup('show')
+  cmd = Trepan::SubSubcommand::ShowVersion.new(parent_cmd)
+  cmd.run(cmd.prefix)
+end

data/processor/command/source.rb

@@ -3,7 +3,7 @@
 require 'optparse'
 
 # Our local modules
-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 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
-require_relative 'base/cmd'
+require_relative '../command'
 require_relative '../../app/condition'
 class Trepan::Command::StepCommand < Trepan::Command
 

data/processor/command/tbreak.rb

@@ -1,4 +1,4 @@
-require_relative './base/cmd'
+require_relative './../command'
 require_relative 'break'
 
 class Trepan::Command::SetTempBreakpointCommand < 

data/processor/command/unalias.rb

@@ -1,16 +1,17 @@
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
-require_relative 'base/cmd'
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+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
@@ -20,6 +21,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|

data/processor/command/undisplay.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
-require_relative 'base/cmd'
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+require_relative '../command'
 
 # undisplay display-number...
 class Trepan::Command::UndisplayCommand < Trepan::Command
@@ -8,37 +8,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,16 +1,15 @@
 # Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
-require_relative 'base/cmd'
+require_relative '../command'
+require_relative '../../app/util'
 
-# 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
@@ -19,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'
+  }
   
   require_relative '../../app/frame'
   include Trepan::Frame

data/processor/command/watchg.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
-require_relative 'base/cmd'
+require_relative '../command'
 require_relative '../../app/complete'
 
 class Trepan::Command::WatchgCommand < Trepan::Command

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

@@ -4,7 +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'
+require_relative '../app/complete'
 
 class Trepan
   class Command
@@ -55,11 +55,12 @@ class Trepan
       obj.class.const_get(name) 
     end
 
+    # Convenience short-hand for @proc.msg
     def msg(message, opts={})
       @proc.msg(message, opts)
     end
 
-    # Convenience short-hand for @dbgr.intf[-1].msg_nocr
+    # Convenience short-hand for @proc.msg_nocr
     def msg_nocr(msg, opts={})
       @proc.msg_nocr(msg, opts)
     end

data/processor/display.rb

@@ -9,6 +9,40 @@ class Trepan
       @displays = DisplayMgr.new
     end
 
+    def display_find(num, show_errmsg = true)
+      if 0 == @displays.size 
+        errmsg('No display expressions set.') if show_errmsg
+        return nil
+      elsif num > @displays.max || num < 1
+        errmsg('Display number %d is out of range 1..%d' %
+               [num, @displays.max]) if show_errmsg
+        return nil
+      end
+      disp = @displays[num]
+      if disp
+        return disp
+      else
+        errmsg('Display number %d previously deleted.' %
+               num) if show_errmsg
+        return nil
+      end
+    end
+
+    # Enable or disable a breakpoint given its breakpoint number.
+    def en_disable_display_by_number(num, do_enable=true)
+      disp = display_find(num)
+      return false unless disp
+          
+      enable_disable = do_enable ? 'en' : 'dis'
+      if disp.enabled? == do_enable
+        errmsg('Display %d previously %sabled.' % 
+               [num, enable_disable])
+        return false
+      end
+      disp.enabled = do_enable
+      return true
+    end
+
     def run_eval_display(args={})
       for line in @displays.display(@frame) do 
         msg(line)

data/processor/frame.rb

@@ -217,8 +217,8 @@ if __FILE__ == $0
   # Demo it.
   require 'thread_frame'
   require_relative '../app/mock'
-  require_relative 'main'   # Have to include before defining CmdProcessor!
-                            # FIXME
+
+
   class Trepan::CmdProcessor
     def errmsg(msg)
       puts msg

data/processor/help.rb

@@ -1,4 +1,5 @@
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+
 class Trepan
   # class SubHelp
   #   def initialize(name, dir)
@@ -48,7 +49,7 @@ class Trepan
     # like "show", "info" or "set". Generally this means list
     # all of the subcommands.
     def summary_list(name, subcmds)
-      msg "List of #{name} commands (with minimum abbreviation in parenthesis):"
+      section "List of #{name} commands (with minimum abbreviation in parenthesis):"
       subcmds.list.each do |subcmd_name|
         # Some commands have lots of output.
         # they are excluded here because 'in_list' is false.
@@ -59,8 +60,9 @@ class Trepan
 
     # Error message when subcommand asked for but doesn't exist
     def undefined_subcmd(cmd, subcmd)
-      errmsg(('Undefined "%s" subcommand: "%s". ' + 
-              'Try "help %s *".') % [cmd, subcmd, cmd])
+      ambig = settings[:abbrev] ? 'or ambiguous ' : ''
+      errmsg(['Undefined %s"%s" subcommand: "%s". ' % [ambig, cmd, subcmd],
+              'Try "help %s *".' % cmd])
     end
 
   end