rb8-trepanning 0.1.3 → 0.1.4

data/interface/script.rb

@@ -5,7 +5,7 @@
 
 # Our local modules
 require 'rubygems'; require 'require_relative'
-require_relative 'base_intf'
+require_relative '../interface'
 require_relative '../io/input'
 require_relative '../io/string_array'
 

data/interface/server.rb

@@ -3,7 +3,7 @@
 
 # Our local modules
 require 'rubygems'; require 'require_relative'
-require_relative 'base_intf'
+require_relative '../interface'
 require_relative 'comcodes'
 require_relative '../io/input'
 require_relative '../io/tcpserver'

data/interface/user.rb

@@ -6,7 +6,7 @@
 # Our local modules
 
 require 'rubygems'; require 'require_relative'
-require_relative 'base_intf'
+require_relative '../interface'
 require_relative '../io/input'
 
 # Interface when communicating with the user.
@@ -162,4 +162,6 @@ if __FILE__ == $0
     end
   end
   puts "User interface closed?: #{intf.closed?}"
+  intf.close
+  STDERR.puts "User interface closed?: #{intf.closed?}"
 end

data/{interface/base_intf.rb → interface.rb}

@@ -16,7 +16,7 @@ module Trepan
   #  - another interface in another process or computer
   class Interface
 
-    attr_accessor :interactive, :history_io, :history_save, :input, :output
+    attr_accessor :history_io, :history_save, :interactive, :input, :output
 
     unless defined?(YES)
       YES = %w(y yes oui si yep ja)

data/io/input.rb

@@ -6,7 +6,7 @@
 # 
 
 require 'rubygems'; require 'require_relative'
-require_relative 'base_io'
+require_relative '../io'
 
 module Trepan
 

data/io/null_output.rb

@@ -6,7 +6,7 @@
 # 
 
 require 'rubygems'; require 'require_relative'
-require_relative 'base_io'
+require_relative '../io'
 
 class Trepan::OutputNull < Trepan::OutputBase
   def initialize(out, opts={})

data/io/string_array.rb

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
 
 # Simulate I/O using lists of strings.
 
 require 'rubygems'; require 'require_relative'
-require_relative 'base_io'
+require_relative '../io'
 
 # Simulate I/O using an array of strings. Sort of like StringIO, but
 # even simplier.

data/io/tcpclient.rb

@@ -4,7 +4,7 @@
 
 require 'socket'
 require 'rubygems'; require 'require_relative'
-require_relative 'base_io'
+require_relative '../io'
 require_relative 'tcpfns'
 
 module Trepan 

data/io/tcpserver.rb

@@ -5,7 +5,7 @@
 require 'socket'
 require 'rubygems'; require 'require_relative'
 require_relative '../app/default' # For host and port
-require_relative 'base_io'
+require_relative '../io'
 require_relative 'tcpfns'
 
 module Trepan 

data/lib/debugger.rb

@@ -2,7 +2,6 @@
 # minimal fuss. Compare with: require "debug"
 require 'rubygems'
 require 'require_relative'
-require_relative "rubygems"
 require './trepanning'
 Trepan.start
 debugger

data/lib/trepanning.rb

@@ -7,7 +7,8 @@ require 'ruby-debug-base'
 require 'require_relative'
 require_relative '../interface/script'
 require_relative '../interface/user'
-require_relative '../processor/processor'
+require_relative '../processor/old-processor'
+require_relative '../processor'
 
 module Trepan
 
@@ -58,6 +59,7 @@ module Trepan
     @@intf = [Trepan::UserInterface.new(nil, nil, opts)]
 
     attr_accessor :handler
+
     Trepan.handler = Debugger.handler = CommandProcessor.new(@@intf)
 
     # gdb-style annotation mode. Used in GNU Emacs interface

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

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
   unless defined?(ALIASES)

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'
 
 module Trepan
 
@@ -131,10 +131,6 @@ module 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'

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'
 
 module Trepan

data/processor/command/base/subsubmgr.rb

@@ -163,19 +163,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,13 +1,13 @@
 # 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
-
-  ALIASES      = %w(b)
-  CATEGORY     = 'breakpoints'
-  NAME         = File.basename(__FILE__, '.rb')
-  HELP         = <<-HELP
+  Trepan::Util::suppress_warnings {
+    ALIASES      = %w(b)
+    CATEGORY     = 'breakpoints'
+    NAME         = File.basename(__FILE__, '.rb')
+    HELP         = <<-HELP
 #{NAME} LOCATION [ {if|unless} CONDITION ]
 
 Set a breakpoint. In the second form where CONDITIOn is given, the
@@ -25,7 +25,8 @@ Examples:
 
 See also condition, continue and "help location".
       HELP
-  SHORT_HELP   = 'Set a breakpoint at a point in a method'
+    SHORT_HELP   = 'Set a breakpoint at a point in a method'
+  }
 
   # This method runs the command
   def run(args, temp=false)
@@ -53,10 +54,17 @@ See also condition, continue and "help location".
                  @proc.canonic_file(file)]) 
           return
         end
-        unless LineCache.trace_line_numbers(file).member?(line)
-          errmsg('Line %d is not a stopping point in file "%s".' % 
-                 [line, @proc.canonic_file(file)])
-          return
+        syntax_errors = Trepan::ruby_syntax_errors(file)
+        if syntax_errors
+          msg ["File #{file} is not a syntactically correct Ruby program.",
+               "Therefore we can't check line numbers."]
+          return unless confirm('Set breakpoint anyway?', false)
+        else
+          unless LineCache.trace_line_numbers(file).member?(line)
+            errmsg('Line %d is not a stopping point in file "%s".' % 
+                   [line, @proc.canonic_file(file)])
+            return
+          end
         end
       else
         errmsg('No source file named %s' % @proc.canonic_file(file))

data/processor/command/catch.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 '../stepping'
 
 class Trepan::Command::CatchCommand < 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
 

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
@@ -38,6 +38,12 @@ See also 'step', 'next', 'finish', 'nexti' commands and "help location".
       filename = @proc.frame.file
       line_number = @proc.get_an_int(args[1])
       return unless line_number
+      syntax_errors = Trepan::ruby_syntax_errors(filename)
+      if syntax_errors
+        msg ["File #{filename} is not a syntactically correct Ruby program.",
+             "Therefore we can't check line numbers."]
+        return unless confirm('Set breakpoint anyway?', false)
+      end
       unless LineCache.trace_line_numbers(filename).member?(line_number)
         errmsg("Line %d is not a stopping point in file \"%s\".\n" %
                [line_number, filename])

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)

data/processor/command/disable.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'
 
@@ -12,21 +12,20 @@ require_relative 'base/cmd'
 # 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} bpnumber [bpnumber ...]
+  Trepan::Util.suppress_warnings {
+    NAME = File.basename(__FILE__, '.rb')
+    HELP = <<-HELP
+#{NAME} NUM1 [NUM2 ...]
     
-Disables the breakpoints given as a space separated list of breakpoint
-numbers. See also "info break" to get a list.
-  HELP
+Disables the breakpoints given as a space-separated list of
+numbers. 
 
-  CATEGORY      = 'breakpoints'
-  SHORT_HELP    = 'Disable some breakpoints'
+See also "enable" and "info break".
+  HELP
 
-  $VERBOSE      = old_verbose 
+    CATEGORY      = 'breakpoints'
+    SHORT_HELP    = 'Disable some breakpoints'
+  }
 
   def initialize(proc)
     super

data/processor/command/display.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'
 
 class Trepan::Command::DisplayCommand < Trepan::Command
 
@@ -23,6 +23,8 @@ 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'

data/processor/command/down.rb

@@ -7,10 +7,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
@@ -19,10 +19,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,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'
 
 class Trepan::Command::EditCommand < Trepan::Command
 

data/processor/command/enable.rb

@@ -8,29 +8,24 @@ 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} BPNUM1 [BPNUM2 ...]
+  Trepan::Util.suppress_warnings {
+    NAME        = File.basename(__FILE__, '.rb')
+    HELP        = <<-HELP
+#{NAME} NUM1 [NUM2 ...]
     
-Enables breakpoints BPNUM1. Breakpoints numbers are given as a space-
-separated list numbers. 
+Enables breakpoints 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'
+  }
 
-  ALIASES       = %w(en)
-  SHORT_HELP    = 'Enable some breakpoints'
-  $VERBOSE      = old_verbose 
-
-  def run(args)
-    if args.size == 1
-      errmsg('No breakpoint number given.')
-      return
-    end
-    enable_disable_breakpoints("Disable", args[1..-1])
+  def initialize(proc)
+    super
+    @enable_parm = true # true if enable 
   end
 
 end
@@ -40,9 +35,13 @@ if __FILE__ == $0
   dbgr, cmd = MockDebugger::setup
   cmd.run([cmd.name])
   cmd.run([cmd.name, '1'])
-  cmds = cmd.proc.commands
+  cmdproc = cmd.proc
+  cmds = cmdproc.commands
   break_cmd = cmds['break']
   puts "To be continued..."
-  # break_cmd.run(['break', cmdproc.frame.source_location[0].to_s])
-  # cmd.run([cmd.name, '1'])
+  require 'ruby-debug-base';
+  cmdproc.frame_setup(Debugger.current_context, nil)
+  cmdproc.frame.instance_variable_set('@binding', TOPLEVEL_BINDING)
+  break_cmd.run(['break', __LINE__.to_s])
+  cmd.run([cmd.name, '1'])
 end

data/processor/command/eval.rb

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

data/processor/command/exit.rb

@@ -1,13 +1,13 @@
-# 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::ExitCommand < Trepan::Command
 
   unless defined?(HELP)
     NAME         = File.basename(__FILE__, '.rb')
     ALIASES      = %w(quit q q! quit! exit!)
     HELP = <<-HELP
-#{NAME} [exitcode] - hard exit of the debugged program.  
+#{NAME} [exitcode] [unconditionally] - hard exit of the debugged program.  
 
 The program being debugged is exited via exit!() which does not run
 the Kernel at_exit finalizers. If a return code is given, that is the
@@ -18,6 +18,13 @@ If you are in interactive mode, and confirm is not set off, you are
 prompted to confirm quitting. However if you do not want to be
 prompted, add ! the end.  (vim/vi/ed users can use alias q!).
 
+Examples: 
+ #{NAME}                 # quit prompting if we are interactive
+ #{NAME} unconditionally # quit without prompting
+ #{NAME}!                # same as above
+ #{NAME} 0               # same as "quit"
+ #{NAME}! 1              # unconditional quit setting exit code 1
+
 See also "kill" and "set confirm".'
     HELP
 
@@ -32,7 +39,7 @@ See also "kill" and "set confirm".'
   # This method runs the command
   def run(args) # :nodoc
     unconditional = 
-      if args.size > 1 && args[1] == 'unconditionally'
+      if args.size > 1 && args[-1] == 'unconditionally'
         args.shift
         true
       elsif args[0][-1..-1] == '!'
@@ -44,7 +51,17 @@ See also "kill" and "set confirm".'
       msg('Quit not confirmed.')
       return
     end
-    exitrc = (args.size > 1) ? exitrc = Integer(args[1]) rescue 0 : 0
+    
+    if (args.size > 1)
+      if  args[1] =~ /\d+/
+        exitrc = args[1].to_i;
+      else
+        errmsg "Bad an Integer return type \"#{args[1]}\"";
+        return;
+      end
+    else
+      exitrc = 0
+    end
 
     # FIXME: Is this the best/most general way?
     ##  @proc.finalize
@@ -59,8 +76,8 @@ end
 if __FILE__ == $0
   require_relative '../mock'
   dbgr, cmd = MockDebugger::setup
-  puts "before #{cmd.name}"
-  fork { cmd.run([cmd.name]) }
-  puts "before #{cmd.name} 10"
+  Process.fork { cmd.run([cmd.name]) } if 
+    Process.respond_to?(:fork) 
+  cmd.run([cmd.name, 'foo'])
   cmd.run([cmd.name, '10'])
 end

data/processor/command/finish.rb

@@ -1,6 +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'
 
 class Trepan::Command::FinishCommand < Trepan::Command
 
@@ -11,13 +12,17 @@ class Trepan::Command::FinishCommand < Trepan::Command
     HELP         = <<-HELP
 #{NAME} [FRAME_NUM]
 
-Execute until selected stack frame returns.
+Continue execution until leaving the current method.  Sometimes this
+is called 'step out'.
 
 If no frame number is given, we run until the currently selected frame
 returns.  The currently selected frame starts out the most-recent
 frame or 0 if no frame positioning (e.g "up", "down" or "frame") has
 been performed. If a frame number is given we run until that frame
 returns.
+
+See also commands:
+'continue', 'break', 'next', 'nexti', 'step' for other ways to continue.
       HELP
     NEED_RUNNING = true
     SHORT_HELP   = 'Step into next method call or to next line'

data/processor/command/frame.rb

@@ -1,5 +1,5 @@
 require 'rubygems'; require 'require_relative'
-require_relative './base/cmd'
+require_relative '../command'
 
 class Trepan::Command::FrameCommand < Trepan::Command
   CATEGORY     = 'stack'

data/processor/command/help.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 '../../app/complete'
 class Trepan::Command::HelpCommand < Trepan::Command
   unless defined?(HELP)
@@ -21,8 +21,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(?)
@@ -155,7 +153,8 @@ 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('')

data/processor/command/info.rb

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