trepanning 0.1.3 → 0.1.4

data/processor/command/disable.rb

@@ -1,8 +1,9 @@
 # -*- 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'
 require_relative '../breakpoint'
 require_relative '../../app/breakpoint'
+require_relative '../../app/util'
 
 # disable breakpoint command. The difference however is that the
 # parameter to @proc.en_disable_breakpoint_by_number is different (set
@@ -11,21 +12,20 @@ require_relative '../../app/breakpoint'
 # NOTE: The enable command  subclasses this, so beware when changing! 
 class Trepan::Command::DisableCommand < Trepan::Command
 
-  # Silence already initialized constant .. warnings
-  old_verbose = $VERBOSE  
-  $VERBOSE    = nil
-  NAME = File.basename(__FILE__, '.rb')
-  HELP = <<-HELP
-#{NAME} [display] bpnumber [bpnumber ...]
-    
-Disables the breakpoints given as a space separated list of breakpoint
-numbers. See also "info break" to get a list.
-  HELP
+  Trepan::Util.suppress_warnings {
+    NAME = File.basename(__FILE__, '.rb')
+    HELP = <<-HELP
+#{NAME} [display] NUM1 [NUM2 ...]
 
-  CATEGORY      = 'breakpoints'
-  SHORT_HELP    = 'Disable some breakpoints'
+Disables the breakpoints or display given as a space separated list of
+numbers. 
 
-  $VERBOSE      = old_verbose 
+See also "enable" and "info break".
+  HELP
+    
+    CATEGORY      = 'breakpoints'
+    SHORT_HELP    = 'Disable some breakpoints or displays'
+  }
 
   def initialize(proc)
     super
@@ -34,12 +34,18 @@ numbers. See also "info break" to get a list.
   
   def run(args)
     if args.size == 1
-      errmsg('No breakpoint number given.')
+      errmsg('No breakpoint or display number given.')
       return
     end
-#   if args[1] == 'display'
-#     display_enable(args[2:], 0)
-#   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)

data/processor/command/disassemble.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/disassemble'
 require_relative '../../app/file'
 

data/processor/command/display.rb

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
-require_relative 'base/cmd'
+require_relative '../command'
 
 class Trepan::Command::DisplayCommand < Trepan::Command
-
+  
   unless defined?(HELP)
     NAME = File.basename(__FILE__, '.rb')
     HELP = <<-HELP
@@ -22,41 +22,48 @@ case or not.
 With no argument, evaluate and display all currently requested
 auto-display expressions.  Use "undisplay" to cancel display
 requests previously made.
+
+See also "undisplay", "enable", and "disable".
     HELP
     
-    CATEGORY      = 'data'
-    NEED_STACK    = false
-    SHORT_HELP    = 'Display expressions when entering debugger'
-  end
-  
-  def run(args)
+  CATEGORY      = 'data'
+  NEED_STACK    = false
+  SHORT_HELP    = 'Display expressions when entering debugger'
+end
 
-    if args.size == 1
-      # Display anything active
-      @proc.run_eval_display
-    else
-      if %w(/c /x /o /f /s).member?(args[1])
-        if 2 == args.size
-          errmsg("Expecting an expression after the format")
-          return
-        end
-        format = args[1]
-        expr   = args[2..-1].join(' ')
-      else
-        format = nil
-        expr = args[1..-1].join(' ')
-      end
+#def save_command
+#  val     = settings[subcmd_setting_key] ? 'on' : 'off'
+#  ["#{subcmd_prefix_string} #{val}"]
+#end
 
-      dp = @proc.displays.add(@proc.frame, expr, format)
-      unless dp
-        errmsg('Error evaluating "%s" in the current frame' % expr)
+def run(args)
+  
+  if args.size == 1
+    # Display anything active
+    @proc.run_eval_display
+  else
+    if %w(/c /x /o /f /s).member?(args[1])
+      if 2 == args.size
+        errmsg("Expecting an expression after the format")
         return
       end
-      msg(dp.to_s(@proc.frame))
-      @proc.cmdloop_prehooks.insert_if_new(5, *@proc.display_hook)
+      format = args[1]
+      expr   = args[2..-1].join(' ')
+    else
+      format = nil
+      expr = args[1..-1].join(' ')
     end
+    
+    dp = @proc.displays.add(@proc.frame, expr, format)
+    unless dp
+      errmsg('Error evaluating "%s" in the current frame' % expr)
+      return
+    end
+    msg(dp.to_s(@proc.frame))
+    @proc.cmdloop_prehooks.insert_if_new(5, *@proc.display_hook)
   end
 end
+end
 
 if __FILE__ == $0
   # Demo it.

data/processor/command/down.rb

@@ -6,10 +6,10 @@ require_relative 'up'
 # direction (set by DIRECTION) reversed.
 class Trepan::Command::DownCommand < Trepan::Command::UpCommand
 
-  # Silence already initialized constant .. warnings
-  old_verbose = $VERBOSE  
-  $VERBOSE    = nil
-  HELP = <<-HELP
+  Trepan::Util.suppress_warnings {
+    old_verbose = $VERBOSE  
+    $VERBOSE    = nil
+    HELP = <<-HELP
 #{NAME} [count]
 
 Move the current frame down in the stack trace (to a newer frame). 0
@@ -18,10 +18,10 @@ is the most recent frame. If no count is given, move down 1.
 See also 'up' and 'frame'.
   HELP
 
-  ALIASES       = %w(d)
-  NAME          = File.basename(__FILE__, '.rb')
-  SHORT_HELP    = 'Move frame in the direction of the caller of the last-selected frame'
-  $VERBOSE      = old_verbose 
+    ALIASES       = %w(d)
+    NAME          = File.basename(__FILE__, '.rb')
+    SHORT_HELP    = 'Move frame in the direction of the caller of the last-selected frame'
+  }
 
   def initialize(proc)
     super

data/processor/command/edit.rb

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

data/processor/command/enable.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 'disable'
 
 # enable breakpoint command. Is like disable but the parameter
@@ -7,22 +7,20 @@ require_relative 'disable'
 # ENABLE_PARM below).
 class Trepan::Command::EnableCommand < Trepan::Command::DisableCommand
 
-  # Silence already initialized constant .. warnings
-  old_verbose = $VERBOSE  
-  $VERBOSE    = nil
-  NAME        = File.basename(__FILE__, '.rb')
-  HELP        = <<-HELP
-#{NAME} [display] BPNUM1 [BPNUM2 ...]
+  Trepan::Util.suppress_warnings {
+    NAME        = File.basename(__FILE__, '.rb')
+    HELP        = <<-HELP
+#{NAME} [display] NUM1 [NUM2 ...]
     
-Enables breakpoints BPNUM1. Breakpoints numbers are given as a space-
+Enables breakpoints or display NUM1... Breakpoints numbers are given as a space-
 separated list numbers. 
 
-See also "info break" to get a list of breakpoints.
+See also "disable" and "info break".
   HELP
 
-  ALIASES       = %w(en)
-  SHORT_HELP    = 'Enable some breakpoints'
-  $VERBOSE      = old_verbose 
+    ALIASES       = %w(en)
+    SHORT_HELP    = 'Enable some breakpoints'
+  }
 
   def initialize(proc)
     super

data/processor/command/eval.rb

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

data/processor/command/exit.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
-require_relative 'base/cmd'
+require_relative '../command'
 class Trepan::Command::ExitCommand < Trepan::Command
 
   unless defined?(HELP)

data/processor/command/finish.rb

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

data/processor/command/frame.rb

@@ -1,5 +1,5 @@
-# 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/frame'
 
 class Trepan::Command::FrameCommand < Trepan::Command

data/processor/command/help.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
-require_relative 'base/cmd'
+require_relative '../command'
 require_relative '../../app/complete'
 class Trepan::Command::HelpCommand < Trepan::Command
   unless defined?(HELP)
@@ -20,8 +20,6 @@ Some commands like 'info', 'set', and 'show' can accept an
 additional subcommand to give help just about that particular
 subcommand. For example 'help info line' give help about the
 info line command.
-
-See also 'examine' and 'whatis'.
     HELP
 
     ALIASES       = %w(?)
@@ -76,10 +74,10 @@ Type "help" followed by a class name for a list of help items in that class.
 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 all" for a brief description 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.
-Type "help" followed by command name for full documentation.
+Type "help" followed by a command name for full documentation.
 '
     msg(final_msg)  
   end
@@ -102,6 +100,7 @@ Type "help" followed by command name for full documentation.
       elsif cmd_name =~ /^all$/i
         CATEGORIES.sort.each do |category|
           show_category(category[0], [])
+          msg('')
         end
       elsif CATEGORIES.member?(cmd_name)
         show_category(args[1], args[2..-1])
@@ -155,12 +154,11 @@ Type "help" followed by command name for full documentation.
         category == @proc.commands[cmd_name].category
       end.sort
       width = settings[:maxwidth]
-      return columnize_commands(cmds)
+      msg columnize_commands(cmds)
+      return 
     end
     
-    msg('')
     section "Command class: %s" % category
-    msg('')
     @proc.commands.keys.sort.each do |name|
       next if category != @proc.commands[name].category
       msg("%-13s -- %s" % [name, @proc.commands[name].short_help])

data/processor/command/info.rb

@@ -23,5 +23,7 @@ end
 
 if __FILE__ == $0
   require_relative '../mock'
+  require 'ruby-debug'; Debugger.start; debugger
   dbgr, cmd = MockDebugger::setup
+  cmd.run(['info', 'iv'])
 end

data/processor/command/info_subcmd/files.rb

@@ -3,11 +3,11 @@
 require 'linecache'
 require 'columnize'
 require_relative '../base/subcmd'
-require_relative '../../../app/file'
-require_relative '../../../app/complete'
+require_relative '../../../app/run'
+require_relative '../../../app/util'
 
 class Trepan::Subcommand::InfoFiles < Trepan::Subcommand
-  unless defined?(HELP)
+  Trepan::Util::suppress_warnings {
     Trepanning::Subcommand.set_name_prefix(__FILE__, self)
     DEFAULT_FILE_ARGS = %w(size mtime sha1)
 
@@ -46,16 +46,17 @@ Examples:
 EOH
     MIN_ABBREV   = 'fi'.size  # Note we have "info frame"
     NEED_STACK   = false
-  end
+  }
 
   # completion %w(all brkpts iseq sha1 size stat)
 
   include Trepanning
 
   def file_list
-    (LineCache.class_variable_get('@@file_cache').keys +
+    (LineCache.cached_files + 
      LineCache.class_variable_get('@@file2file_remap').keys).uniq
   end
+
   def complete(prefix)
     completions = ['.'] + file_list
     Trepan::Complete.complete_token(completions, prefix)
@@ -84,8 +85,8 @@ EOH
           return false
           nil
         else
-          frame_file = @proc.frame.file
-          LineCache::map_file(frame_file) || File.expand_path(frame_file)
+          frame_file = @proc.frame.source_container[1]
+          LineCache::unmap_file(frame_file) || File.expand_path(frame_file)
         end
       else
         args[2]
@@ -149,10 +150,15 @@ EOH
 
       if %w(all brkpts).member?(arg)
         unless seen[:brkpts]
-          msg("Possible breakpoint line numbers:")
-          lines = LineCache.trace_line_numbers(canonic_name)
-          fmt_lines = columnize_numbers(lines)
-          msg(fmt_lines)
+          syntax_errors = Trepanning::ruby_syntax_errors(canonic_name)
+          if syntax_errors
+            msg('Not a syntactically-correct Ruby program.')
+          else
+            msg("Possible breakpoint line numbers:")
+            lines = LineCache.trace_line_numbers(canonic_name)
+            fmt_lines = columnize_numbers(lines)
+            msg(fmt_lines)
+          end
         end
         processed_arg = seen[:brkpts] = true
       end

data/processor/command/info_subcmd/frame.rb

@@ -60,7 +60,6 @@ end
 if __FILE__ == $0
   # Demo it.
   require_relative '../../mock'
-  dbgr, cmd = MockDebugger::setup('info')
   cmd = MockDebugger::sub_setup(Trepan::Subcommand::InfoFrame, false)
   cmd.run(cmd.prefix)
 end

data/processor/command/info_subcmd/locals.rb

@@ -1,88 +1,21 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
-require 'columnize'
+# Copyright (C) 2011 Rocky Bernstein <rockyb@rubyforge.net>
 require_relative '../base/subcmd'
-require_relative '../../../app/frame'
 
 class Trepan::Subcommand::InfoLocals < Trepan::Subcommand
   unless defined?(HELP)
     Trepanning::Subcommand.set_name_prefix(__FILE__, self)
-    HELP         = <<-EOH
-#{CMD}
-#{CMD} [names]
-
-Show local variables including parameters of the current stack frame.
-Normally for each which show both the name and value. If you just
-want a list of names add parameter 'names'.
-EOH
-    SHORT_HELP   = 'Show local variables of the current stack frame'
-    MIN_ARGS     = 0
-    MAX_ARGS     = 1
-    MIN_ABBREV   = 'lo'.size 
-    NEED_STACK   = true
-  end
-
-  def get_local_names
-    iseq = @proc.frame.iseq
-    0.upto(iseq.local_size-2).map do
-      |i|
-      iseq.local_name(i)
-    end
-  end
+    HELP = 'Same thing as "info locals"'
+    NEED_LOCALS   = true
+   end
 
   def run(args)
-    if args.size == 3
-      if 0 == 'names'.index(args[-1].downcase)
-        if 'CFUNC' == @proc.frame.type
-          errmsg('info local names not supported for C frames')
-        else
-          local_names = get_local_names()
-          if local_names.empty?
-            msg "No local variables defined."
-          else
-            section "Local variable names:"
-            width = settings[:maxwidth]
-            mess = Columnize::columnize(local_names, 
-                                        @proc.settings[:maxwidth], '  ',
-                                        false, true, ' ' * 2).chomp
-            msg mess
-          end
-        end
-      else
-        errmsg("unrecognized argument #{args[2]}")
-      end
-    elsif args.size == 2
-      if 'CFUNC' == @proc.frame.type
-        argc = @proc.frame.argc
-        if argc > 0 
-          1.upto(argc).each do |i| 
-            msg "#{i}: #{@proc.frame.sp(argc-i+3).inspect}"
-          end
-        else
-          msg("No parameters in C call; showing other C locals is not supported.")
-        end
-      else
-        local_names = get_local_names
-        if local_names.empty?
-          msg "No local variables defined."
-        else
-          section "Local variables:"
-          get_local_names.each_with_index do |var_name, i| 
-            var_value = @proc.safe_rep(@proc.debug_eval_no_errmsg(var_name).inspect)
-            msg("#{var_name} = #{var_value}")
-          end
-        end
-      end
-    else
-      errmsg("Wrong number of arguments #{args.size}")
-    end
+    @proc.commands['info'].run(%w(info variables locals))
   end
 end
 
 if __FILE__ == $0
   # Demo it.
   require_relative '../../mock'
-  cmd = MockDebugger::sub_setup(Trepan::Subcommand::InfoLocals, false)
-  cmd.run(cmd.prefix)
-  cmd.run(cmd.prefix + ['name'])
+  # ???
 end

data/processor/command/info_subcmd/source.rb

@@ -6,6 +6,7 @@ require 'columnize'
 require_relative '../base/subcmd'
 require_relative '../../../app/file'
 require_relative '../../../app/complete'
+require_relative '../../../app/run'
 
 class Trepan::Subcommand::InfoSource < Trepan::Subcommand
   unless defined?(HELP)
@@ -48,10 +49,15 @@ EOH
     max_line = LineCache::size(canonic_name)
     msg 'File has %d lines.' % max_line if max_line
     msg('SHA1 is %s.' % LineCache::sha1(canonic_name))
-    msg('Possible breakpoint line numbers:')
-    lines = LineCache.trace_line_numbers(canonic_name)
-    fmt_lines = columnize_numbers(lines)
-    msg(fmt_lines)
+    syntax_errors = Trepan::ruby_syntax_errors(canonic_name)
+    if syntax_errors
+      msg('Not a syntactically-correct Ruby program.')
+    else
+      msg('Possible breakpoint line numbers:')
+      lines = LineCache.trace_line_numbers(canonic_name)
+      fmt_lines = columnize_numbers(lines)
+      msg(fmt_lines)
+    end
     if SCRIPT_ISEQS__.member?(canonic_name)
       msg("File contains instruction sequences:")
       SCRIPT_ISEQS__[canonic_name].each do |iseq|

data/processor/command/info_subcmd/variables.rb

@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+require_relative '../base/subsubcmd'
+require_relative '../base/subsubmgr'
+
+class Trepan::SubSubcommand::InfoVariables < Trepan::SubSubcommandMgr
+  unless defined?(HELP)
+    Trepanning::Subcommand.set_name_prefix(__FILE__, self)
+    HELP = <<-EOH
+#{CMD} [class|globals|locals|instance]
+
+List various classes of variables for the current stack frame.
+
+Examples:
+#{CMD} locals    # show local variables
+#{CMD} globals   # show global variables
+    EOH
+    NEED_STACK   = true
+    SHORT_HELP   = 'List variable names/values via the current stack frame'
+  end
+end
+
+if __FILE__ == $0
+  # Demo it.
+  require_relative '../../mock'
+  dbgr, parent_cmd = MockDebugger::setup('info', false)
+  cmd = Trepan::SubSubcommand::InfoVariables.new(dbgr.core.processor, 
+                                                 parent_cmd)
+  cmd.run(cmd.prefix + %w(locals))
+  cmd.run(cmd.prefix + %w(globals name))
+  %w(loc glo globals i).each do |prefix|
+    p [prefix, cmd.complete(prefix)]
+    end
+  end

data/processor/command/info_subcmd/variables_subcmd/.gitignore

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

data/processor/command/info_subcmd/variables_subcmd/class.rb

@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+require_relative 'locals'
+
+class Trepan::Subcommand::InfoVariablesClass < 
+    Trepan::Subcommand::InfoVariablesLocals
+  Trepan::Util.suppress_warnings {
+    Trepanning::Subcommand.set_name_prefix(__FILE__, self)
+    HELP         = <<-EOH
+#{CMD}
+#{CMD} [names]
+
+Show class variables of the current stack frame.
+Normally for each which show both the name and value. If you just
+want a list of names add parameter 'names'.
+EOH
+    SHORT_HELP   = 'Show instance variables of the current stack frame'
+    MIN_ARGS     = 0
+    MAX_ARGS     = 1
+    NEED_STACK   = true
+  }
+
+  def get_names
+    @proc.debug_eval_no_errmsg('self.class_variables') || []
+  end
+
+  def run(args)
+    run_for_type(args, 'class', @proc.debug_eval('self'))
+  end
+end
+
+if __FILE__ == $0
+  # Demo it.
+  require_relative '../../mock'
+  cmd = 
+    MockDebugger::subsub_setup(Trepan::Subcommand::InfoVariables,
+                               Trepan::Subcommand::InfoVariablesClass)
+  cmd.run(cmd.prefix)
+  cmd.run(cmd.prefix + ['name'])
+end

data/processor/command/info_subcmd/variables_subcmd/constant.rb

@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+require_relative 'locals'
+
+class Trepan::Subcommand::InfoVariablesConstant < 
+    Trepan::Subcommand::InfoVariablesLocals
+  Trepan::Util.suppress_warnings {
+    Trepanning::Subcommand.set_name_prefix(__FILE__, self)
+    HELP         = <<-EOH
+#{CMD}
+#{CMD} [names]
+
+Show class constants of the current stack frame.
+Normally for each which show both the name and value. If you just
+want a list of names add parameter 'names'.
+EOH
+    SHORT_HELP   = 'Show class constants via the current stack frame'
+    MIN_ABBREV   = 'co'.size
+    MIN_ARGS     = 0
+    MAX_ARGS     = 1
+    NEED_STACK   = true
+  }
+
+  def get_names
+    @proc.debug_eval_no_errmsg('self.class.constants.sort') || []
+  end
+
+  def run(args)
+    run_for_type(args, 'constant', @proc.debug_eval('self'))
+  end
+end
+
+if __FILE__ == $0
+  # Demo it.
+  require_relative '../../mock'
+  cmd = 
+    MockDebugger::subsub_setup(Trepan::Subcommand::InfoVariables,
+                               Trepan::Subcommand::InfoVariablesConstant)
+  cmd.run(cmd.prefix)
+  cmd.run(cmd.prefix + ['name'])
+end