byebug 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9de6831ec3ce9e27c6e2cca6a3e230f30d4c4498
-  data.tar.gz: 80c1890643664250f76be3332437054636223e6d
+  metadata.gz: 9879e1bf4c99c2ce971bb11d2d0d9e1be2ab6b3f
+  data.tar.gz: 5402c4b2c35821bb2a594dff94b2fe8f5928fa16
 SHA512:
-  metadata.gz: e57c240bc36528ad61d3e44be7819b9e72effe76f61e8895b9e24a8df9ee9a4eabbed01a6edfb6e42529128a02a0b1233761af4f2cf49e0119b49e2bfb4507a5
-  data.tar.gz: 88ce74faec5aef2ae39487e9be5912b1da806e2c8b8fe4513fcb9b0859a1432cc4ab764f95522ba2f01df853ee1fe97d737dd849bc8b42a6b56497fb1986c567
+  metadata.gz: 500afcaa81db3c20f1e36a691d4599d29feeafa0670e7b37e134bd2a9e5afa8f7812caaa85b147ac72b1b870552ff655ffe767e10e4dd07e13359cebcd903039
+  data.tar.gz: f8ac3188a9cd9520f8bd3d3b440ad5f9c29e4ec4feb5fd83236eaa4a43920c81a0fa72a47c5092898bab539fc3fcf1b99fb1d518646444d4d8f6eb2d3c658888

data/CHANGELOG.md

@@ -1,8 +1,20 @@
-## 0.0.1
+## 1.0.2
 
-* Initial release
+* "autolist" and "autoeval" are default settings now
+* Fixes bug which messed up the call-stack when manipulating backtrace
+information and when nexting/stepping
+
+
+## 1.0.1
+
+* Corrected small bug preventing byebug from loading
 
 
 ## 1.0.0
 
 * Green test suite
+
+
+## 0.0.1
+
+* Initial release

data/bin/byebug

@@ -292,15 +292,13 @@ end
 
 opts = process_options(options)
 begin
-  if not defined? Byebug::ARGV
-    Byebug::ARGV = ARGV.clone
-  end
+  Byebug::ARGV = ARGV.clone if not defined? Byebug::ARGV
   byebug_path = File.expand_path($0)
   if RUBY_PLATFORM =~ /mswin/
     byebug_path += '.cmd' unless byebug_path =~ /\.cmd$/i
   end
   Byebug::RDEBUG_SCRIPT = byebug_path
-  Byebug::RDEBUG_FILE = __FILE__
+  Byebug::BYEBUG_BIN = __FILE__
   Byebug::INITIAL_DIR = Dir.pwd
   opts.parse! ARGV
 rescue StandardError => e

data/ext/byebug/byebug.c

@@ -158,13 +158,13 @@ process_line_event(VALUE trace_point, void *data)
 
   load_frame_info(
       trace_point, &path, &lineno, &method_id, &defined_class, &binding, &self);
+  update_frame(context_object, RSTRING_PTR(path), FIX2INT(lineno), method_id,
+                               defined_class, binding, self);
+
   if (debug == Qtrue)
     print_debug_info(
       "line", path, lineno, method_id, defined_class, context->stack_size);
 
-  update_frame(context_object, RSTRING_PTR(path), FIX2INT(lineno), method_id,
-                               defined_class, binding, self);
-
   if (context->last_line != FIX2INT(lineno) || context->last_file == NULL ||
        strcmp(context->last_file, RSTRING_PTR(path)))
   {
@@ -228,12 +228,12 @@ process_return_event(VALUE trace_point, void *data)
 
   load_frame_info(trace_point, &path, &lineno, &method_id, &defined_class,
                                &binding, &self);
+  pop_frame(context_object);
+
   if (debug == Qtrue)
     print_debug_info("return", path, lineno, method_id, defined_class,
                                                            context->stack_size);
-
   //rb_funcall(context_object, idAtReturn, 2, path, lineno);
-  pop_frame(context_object);
 
   cleanup(context);
 }
@@ -252,13 +252,13 @@ process_call_event(VALUE trace_point, void *data)
 
   load_frame_info(trace_point, &path, &lineno, &method_id, &defined_class,
                                &binding, &self);
+  push_frame(context_object, RSTRING_PTR(path), FIX2INT(lineno), method_id,
+                             defined_class, binding, self);
+
   if (debug == Qtrue)
     print_debug_info("call", path, lineno, method_id, defined_class,
                                                            context->stack_size);
 
-  push_frame(context_object, RSTRING_PTR(path), FIX2INT(lineno), method_id,
-                             defined_class, binding, self);
-
   breakpoint = find_breakpoint_by_method(breakpoints, defined_class,
                                                       SYM2ID(method_id),
                                                       binding, self);
@@ -343,12 +343,12 @@ Byebug_setup_tracepoints(VALUE self)
   rb_tracepoint_enable(tpLine);
 
   tpReturn = rb_tracepoint_new(Qnil,
-      RUBY_EVENT_RETURN | RUBY_EVENT_C_RETURN | RUBY_EVENT_B_RETURN | RUBY_EVENT_CLASS | RUBY_EVENT_END,
+      RUBY_EVENT_RETURN | RUBY_EVENT_C_RETURN | RUBY_EVENT_B_RETURN | RUBY_EVENT_END,
       process_return_event, NULL);
   rb_tracepoint_enable(tpReturn);
 
   tpCall = rb_tracepoint_new(Qnil,
-      RUBY_EVENT_CALL | RUBY_EVENT_C_CALL | RUBY_EVENT_B_CALL,
+      RUBY_EVENT_CALL | RUBY_EVENT_C_CALL | RUBY_EVENT_B_CALL | RUBY_EVENT_CLASS,
       process_call_event, NULL);
   rb_tracepoint_enable(tpCall);
 

data/lib/byebug/command.rb

@@ -24,19 +24,26 @@ module Byebug
     SubcmdStruct = Struct.new(:name, :min, :short_help, :long_help) unless
       defined?(SubcmdStruct)
 
-    def print_subcommands
-      cmd_name = self.class.name.chomp("Command").downcase
-      errmsg "#{cmd_name} must be followed by the name of a subcommand.\n"
-      print "List of #{cmd_name} subcommands:\n\n"
-      for subcmd in Subcommands do
+    ##
+    # Print list of subcmds
+    #
+    def print_subcmds(subcmds)
+      cmd_name = self.class.name[/Byebug::(.*)Command/, 1].downcase
+      errmsg "\"#{cmd_name}\" must be followed by the name of a subcommand.\n"
+      print "List of \"#{cmd_name}\" subcommands:\n"
+      for subcmd in subcmds do
         print "#{cmd_name} #{subcmd.name} -- #{subcmd.short_help}\n"
       end
     end
 
     include Columnize
 
-    # Find param in subcmds. param id downcased and can be abbreviated
-    # to the minimum length listed in the subcommands
+    ##
+    # Find param in subcmds.
+    #
+    # @param is downcased and can be abbreviated to the minimum length listed in
+    # the subcommands.
+    #
     def find(subcmds, param)
       param.downcase!
       for try_subcmd in subcmds do
@@ -55,7 +62,7 @@ module Byebug
 
       DEF_OPTIONS = {
         :allow_in_control     => false,
-        :allow_in_post_mortem => false ,
+        :allow_in_post_mortem => false,
         :event                => true ,
         :always_run           => 0    ,
         :unknown              => false,
@@ -153,7 +160,6 @@ module Byebug
     register_setting_var(:byebugtesting, false)
     register_setting_var(:force_stepping, false)
     register_setting_var(:full_path, true)
-    register_setting_var(:autolist, 1)
     register_setting_var(:listsize, 10)
     register_setting_var(:stack_trace_on_error, false)
     register_setting_var(:tracing_plus, false)

data/lib/byebug/commands/breakpoints.rb

@@ -81,15 +81,16 @@ module Byebug
         end
         b = Byebug.add_breakpoint brkpt_filename, line, expr
         print "Created breakpoint #{b.id} at " \
-              "#{CommandProcessor.canonic_file(brkpt_filename)}:#{line.to_s}"
+              "#{CommandProcessor.canonic_file(brkpt_filename)}:#{line.to_s}\n"
         unless syntax_valid?(expr)
-          errmsg("Expression \"#{expr}\" syntactically incorrect; breakpoint disabled.\n")
+          errmsg "Expression \"#{expr}\" syntactically incorrect; breakpoint" \
+                 " disabled.\n"
           b.enabled = false
         end
       else
         method = line.intern
         b = Byebug.add_breakpoint class_name, method, expr
-        print "Created breakpoint #{b.id} at #{class_name}::#{method.to_s}"
+        print "Created breakpoint #{b.id} at #{class_name}::#{method.to_s}\n"
       end
     end
 

data/lib/byebug/commands/enable.rb

@@ -1,6 +1,7 @@
 module Byebug
+
   # Mix-in module to assist in command parsing.
-  module EnableDisableFunctions # :nodoc:
+  module EnableDisableFunctions
     def enable_disable_breakpoints(is_enable, args)
       breakpoints = Byebug.breakpoints.sort_by{|b| b.id }
       largest = breakpoints.inject(0) do |tally, b|
@@ -14,7 +15,7 @@ module Byebug
         pos = get_int(pos, "#{is_enable} breakpoints", 1, largest)
         return nil unless pos
         breakpoints.each do |b|
-          if b.id == pos 
+          if b.id == pos
             enabled = ("Enable" == is_enable)
             if enabled
               unless syntax_valid?(b.expr)
@@ -30,7 +31,7 @@ module Byebug
     end
 
     def enable_disable_display(is_enable, args)
-      if 0 == @state.display.size 
+      if 0 == @state.display.size
         errmsg "No display expressions have been set.\n"
         return
       end
@@ -43,25 +44,25 @@ module Byebug
 
   end
 
-  class EnableCommand < Command # :nodoc:
-    Subcommands = 
+  class EnableCommand < Command
+    Subcommands =
       [
-       ['breakpoints', 2, "Enable specified breakpoints",
-"Give breakpoint numbers (separated by spaces) as arguments.
-This is used to cancel the effect of the \"disable\" command."
-       ],
-       ['display', 2, 
-        "Enable some expressions to be displayed when program stops",
-"Arguments are the code numbers of the expressions to resume displaying.
-Do \"info display\" to see current list of code numbers."],
-      ].map do |name, min, short_help, long_help| 
+       ['breakpoints', 2, 'Enable specified breakpoints',
+        'Give breakpoint numbers (separated by spaces) as arguments. This is ' \
+        'used to cancel the effect of the \"disable\" command.'],
+       ['display', 2,
+        'Enable some expressions to be displayed when program stops',
+        'Arguments are the code numbers of the expressions to resume '     \
+        'displaying. Do \"info display\" to see the current list of code ' \
+        'numbers.'],
+      ].map do |name, min, short_help, long_help|
       SubcmdStruct.new(name, min, short_help, long_help)
     end unless defined?(Subcommands)
 
     def regexp
       /^\s* en(?:able)? (?:\s+(.*))?$/ix
     end
-    
+
     def execute
       if not @match[1]
         errmsg "\"enable\" must be followed \"display\", \"breakpoints\"" +
@@ -77,41 +78,38 @@ Do \"info display\" to see current list of code numbers."],
         end
       end
     end
-    
+
     def enable_breakpoints(args)
       enable_disable_breakpoints("Enable", args)
     end
-    
+
     def enable_display(args)
       enable_disable_display("Enable", args)
     end
-    
+
     class << self
       def help_command
         'enable'
       end
 
       def help(args)
-        if args[1] 
-          s = args[1]
-          subcmd = Subcommands.find do |try_subcmd| 
-            (s.size >= try_subcmd.min) and
-              (try_subcmd.name[0..s.size-1] == s)
-          end
-          if subcmd
-            str = subcmd.short_help + '.'
-            str += "\n" + subcmd.long_help if subcmd.long_help
-            return str
-          else
-            return "Invalid 'enable' subcommand '#{args[1]}'."
-          end
+        # specific subcommand help
+        if args[1]
+          subcmd = find(Subcommands, args[1])
+          return "Invalid \"enable\" subcommand \"#{args[1]}\"." unless subcmd
+
+          str = subcmd.short_help + '.'
+          str += "\n" + subcmd.long_help if subcmd.long_help
+          return str
         end
+
+        # general help
         s = %{
           Enable some things.
           This is used to cancel the effect of the "disable" command.
-          -- 
+          --
           List of enable subcommands:
-          --  
+          --
         }
         for subcmd in Subcommands do
           s += "enable #{subcmd.name} -- #{subcmd.short_help}\n"
@@ -121,23 +119,24 @@ Do \"info display\" to see current list of code numbers."],
     end
   end
 
-  class DisableCommand < Command # :nodoc:
-    Subcommands = 
+  class DisableCommand < Command
+    Subcommands =
       [
-       ['breakpoints', 1, "Disable some breakpoints",
-"Arguments are breakpoint numbers with spaces in between.
-A disabled breakpoint is not forgotten, but has no effect until reenabled."],
-       ['display', 1, "Disable some display expressions when program stops",
-"Arguments are the code numbers of the expressions to stop displaying.
-Do \"info display\" to see current list of code numbers."],
-      ].map do |name, min, short_help, long_help| 
+       ['breakpoints', 1, 'Disable some breakpoints',
+        'Arguments are breakpoint numbers with spaces in between. A disabled ' \
+        'breakpoint is not forgotten, but has no effect until reenabled.'],
+       ['display', 1, 'Disable some display expressions when program stops',
+        'Arguments are the code numbers of the expressions to stop '       \
+        'displaying. Do \"info display\" to see the current list of code ' \
+        'numbers.'],
+      ].map do |name, min, short_help, long_help|
       SubcmdStruct.new(name, min, short_help, long_help)
     end unless defined?(Subcommands)
 
     def regexp
       /^\s* dis(?:able)? (?:\s+(.*))?$/ix
     end
-    
+
     def execute
       if not @match[1]
         errmsg "\"disable\" must be followed \"display\", \"breakpoints\"" +
@@ -153,43 +152,40 @@ Do \"info display\" to see current list of code numbers."],
         end
       end
     end
-    
+
     def disable_breakpoints(args)
       enable_disable_breakpoints("Disable", args)
     end
-    
+
     def disable_display(args)
       enable_disable_display("Disable", args)
     end
-    
+
     class << self
       def help_command
         'disable'
       end
 
       def help(args)
-        if args[1] 
-          s = args[1]
-          subcmd = Subcommands.find do |try_subcmd| 
-            (s.size >= try_subcmd.min) and
-              (try_subcmd.name[0..s.size-1] == s)
-          end
-          if subcmd
-            str = subcmd.short_help + '.'
-            str += "\n" + subcmd.long_help if subcmd.long_help
-            return str
-          else
-            return "Invalid 'disable' subcommand '#{args[1]}'."
-          end
+        # specific subcommand help
+        if args[1]
+          subcmd = find(Subcommands, args[1])
+          return "Invalid \"disable\" subcommand \"#{args[1]}\"." unless subcmd
+
+          str = subcmd.short_help + '.'
+          str += "\n" + subcmd.long_help if subcmd.long_help
+          return str
         end
+
+        # general help
         s = %{
           Disable some things.
 
           A disabled item is not forgotten, but has no effect until reenabled.
           Use the "enable" command to have it take effect again.
-          -- 
+          --
           List of disable subcommands:
-          --  
+          --
         }
         for subcmd in Subcommands do
           s += "disable #{subcmd.name} -- #{subcmd.short_help}\n"

data/lib/byebug/commands/eval.rb

@@ -1,5 +1,6 @@
 module Byebug
-  module EvalFunctions # :nodoc:
+
+  module EvalFunctions
     def run_with_binding
       binding = @state.context ? get_binding : TOPLEVEL_BINDING
       $__dbg_interface = @state.interface
@@ -21,10 +22,10 @@ module Byebug
       $__dbg_interface = nil
     end
   end
-  
+
   class EvalCommand < Command # :nodoc:
     self.allow_in_control = true
-    
+
     register_setting_get(:autoeval) do
       EvalCommand.unknown
     end
@@ -32,11 +33,14 @@ module Byebug
       EvalCommand.unknown = value
     end
 
+    # Set default value
+    Command.settings[:autoeval] = 1
+
     def match(input)
       @input = input
       super
     end
-    
+
     def regexp
       /^\s*(p|e(?:val)?)\s+/
     end
@@ -44,7 +48,7 @@ module Byebug
     def execute
       expr = @match ? @match.post_match : @input
       run_with_binding do |b|
-        print "%s\n", debug_eval(expr, b).inspect
+        print "#{debug_eval(expr, b).inspect}\n"
       end
     end
 
@@ -56,22 +60,22 @@ module Byebug
       def help(cmd)
         if cmd == 'p'
           %{
-            p expression\tevaluate expression and print its value
-          }
+           p expression\tevaluate expression and print its value
+           }
         else
           %{
-            e[val] expression\tevaluate expression and print its value,
-            \t\t\talias for p.
-            * NOTE - to turn on autoeval, use 'set autoeval'
-          }
+           e[val] expression\tevaluate expression and print its value,
+           \t\t\talias for p.
+           * NOTE - to turn on autoeval, use 'set autoeval'
+           }
         end
       end
     end
   end
 
-  class PPCommand < Command # :nodoc:
+  class PPCommand < Command
     self.allow_in_control = true
-    
+
     def regexp
       /^\s*pp\s+/
     end
@@ -82,7 +86,7 @@ module Byebug
         PP.pp(debug_eval(@match.post_match, b), out)
       end
       print out.string
-    rescue 
+    rescue
       out.puts $!.message
     end
 
@@ -93,15 +97,15 @@ module Byebug
 
       def help(cmd)
         %{
-          pp expression\tevaluate expression and pretty-print its value
-        }
+         pp expression\tevaluate expression and pretty-print its value
+         }
       end
     end
   end
 
-  class PutLCommand < Command # :nodoc:
+  class PutLCommand < Command
     self.allow_in_control = true
-    
+
     def regexp
       /^\s*putl\s+/
     end
@@ -112,13 +116,13 @@ module Byebug
         vals = debug_eval(@match.post_match, b)
         if vals.is_a?(Array)
           vals = vals.map{|item| item.to_s}
-          print "%s\n", columnize(vals, self.class.settings[:width])
+          print "#{columnize(vals, self.class.settings[:width])}\n"
         else
           PP.pp(vals, out)
           print out.string
         end
       end
-    rescue 
+    rescue
       out.puts $!.message
     end
 
@@ -129,17 +133,17 @@ module Byebug
 
       def help(cmd)
         %{
-          putl expression\t\tevaluate expression, an array, and columnize its value
-        }
+         putl expression\tevaluate expression, an array, and columnize its value
+         }
       end
     end
   end
-  
-  class PSCommand < Command # :nodoc:
+
+  class PSCommand < Command
     self.allow_in_control = true
-    
+
     include EvalFunctions
-    
+
     def regexp
       /^\s*ps\s+/
     end
@@ -150,13 +154,13 @@ module Byebug
         vals = debug_eval(@match.post_match, b)
         if vals.is_a?(Array)
           vals = vals.map{|item| item.to_s}
-          print "%s\n", columnize(vals.sort!, self.class.settings[:width])
+          print "#{columnize(vals.sort!, self.class.settings[:width])}\n"
         else
           PP.pp(vals, out)
           print out.string
         end
       end
-    rescue 
+    rescue
       out.puts $!.message
     end
 
@@ -167,10 +171,10 @@ module Byebug
 
       def help(cmd)
         %{
-          ps expression\tevaluate expression, an array, sort, and columnize its value
-        }
+         ps expression\tevaluate expression, an array, sort and columnize its value
+         }
       end
     end
   end
-  
+
 end