byebug 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8478138d1bb0441775054b1f4ba7feb59429a60
-  data.tar.gz: 1404c249bcc849e2b9ae0240617ef590e88b8b96
+  metadata.gz: fd86d998df7e4fd1df7269ddf72438a2623792b5
+  data.tar.gz: 0f125b6a5654b3ef774f0e009312024ce63df907
 SHA512:
-  metadata.gz: 1cc5b019263bc58a174d59b5ad8829dc8781e53722b3742091e879122916484d3ef73e46be20f20cbb72359a0cee62843ca8cfde9676ff15a1101f0c27519914
-  data.tar.gz: 46c6792714d460d1aaaf99cc487da5a8d0f0a72c81253e3c6e0d98df1af90358be796ef1de87ce7f1e43f44e4f6d1f575896683acde1e4811325c5c5c0511236
+  metadata.gz: f3ea7b37bdb6e6376b0d1c1058e99c71a64106d5895147691f28f567fdc95b2c2eac506aeefe172af7e7c8b4c1c8dba3dd47e26a694655685f8a8f037cc372de
+  data.tar.gz: 15d579ce1035bcfa73390774839a6ff4e4eb4448a9bf17d6f9c245089fe5337baee132020adba790082713b85d22a88f490e70d82c26db32ce9b0d97cca2913c

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 2.2.1
+
+* Fix compilation issue introduced by 2.2.0 (#26)
+* "show" and "set" option `stack_trace_on_error` is now called `stack_on_error`
+
+
 # 2.2.0
 
 * Small fixes in stack_size calculations

data/README.md

@@ -125,11 +125,10 @@ Full lists of subcommands:
 `variables`.
 * set: `args`,`autoeval`,`autoirb`,`autolist`,`autoreload`,`basename`,
 `callstyle`,`forcestep`,`fullpath`,`history`,`linetrace`,`linetrace_plus`,
-`listsize`,`post_mortem`,`stack_trace_on_error`,`testing`,`verbose`,`width`.
+`listsize`,`post_mortem`,`stack_on_error`,`testing`,`verbose`,`width`.
 * show: `args`,`autoeval`,`autoirb`,`autolist`,`autoreload`,`basename`,
 `callstyle`,`commands`,`forcestep`,`fullpath`,`history`,`linetrace`,
-`linetrace_plus`, `listsize`,`post_mortem`,`stack_trace_on_error`,`verbose`,
-`width`.
+`linetrace_plus`, `listsize`,`post_mortem`,`stack_on_error`,`verbose`, `width`.
 
 
 ## Getting Started

data/bin/byebug

@@ -225,11 +225,7 @@ options.stop = false if options.tracing
 Byebug.tracing = options.tracing
 
 loop do
-  begin
-    debug_program(options)
-  rescue Exception
-    p $!, $@
-  end
+  debug_program(options)
 
   break if options.quit
 

data/ext/byebug/breakpoint.c

@@ -277,31 +277,6 @@ brkpt_initialize(VALUE self, VALUE source, VALUE pos, VALUE expr)
   return Qnil;
 }
 
-static VALUE
-brkpt_remove(VALUE self, VALUE breakpoints, VALUE id_value)
-{
-  int i;
-  int id;
-  VALUE breakpoint_object;
-  breakpoint_t *breakpoint;
-
-  if (breakpoints == Qnil) return Qnil;
-
-  id = FIX2INT(id_value);
-
-  for(i = 0; i < RARRAY_LEN(breakpoints); i++)
-  {
-    breakpoint_object = rb_ary_entry(breakpoints, i);
-    Data_Get_Struct(breakpoint_object, breakpoint_t, breakpoint);
-    if(breakpoint->id == id)
-    {
-      rb_ary_delete_at(breakpoints, i);
-      return breakpoint_object;
-    }
-  }
-  return Qnil;
-}
-
 int
 filename_cmp_impl(VALUE source, char *file)
 {
@@ -512,8 +487,6 @@ Init_breakpoint(VALUE mByebug)
   rb_define_alloc_func(cBreakpoint, brkpt_create);
   rb_define_method(cBreakpoint, "initialize", brkpt_initialize, 3);
 
-  rb_define_singleton_method(cBreakpoint, "remove", brkpt_remove, 2);
-
   rb_define_method(cBreakpoint, "enabled?"      , brkpt_enabled          , 0);
   rb_define_method(cBreakpoint, "enabled="      , brkpt_set_enabled      , 1);
   rb_define_method(cBreakpoint, "expr"          , brkpt_expr             , 0);

data/ext/byebug/byebug.c

@@ -37,7 +37,7 @@ trace_print(rb_trace_arg_t *trace_arg, debug_context_t *dc)
     VALUE line  = rb_tracearg_lineno(trace_arg);
     VALUE event = rb_tracearg_event(trace_arg);
     VALUE mid   = rb_tracearg_method_id(trace_arg);
-    for (i=0; i<dc->stack_size; i++) putc('|', stderr);
+    for (i=0; i<dc->calced_stack_size; i++) putc('|', stderr);
     fprintf(stderr, "[#%d] %s@%s:%d %s\n", dc->thnum,
       rb_id2name(SYM2ID(event)), RSTRING_PTR(path), NUM2INT(line),
       NIL_P(mid) ? "" : rb_id2name(SYM2ID(mid)));
@@ -194,7 +194,7 @@ line_event(VALUE trace_point, void *data)
 
   EVENT_COMMON
 
-  if (dc->stack_size == 0) dc->stack_size++;
+  if (dc->calced_stack_size == 0) dc->calced_stack_size++;
 
   if (dc->last_line != rb_tracearg_lineno(trace_arg) ||
       dc->last_file != rb_tracearg_path(trace_arg))
@@ -208,12 +208,12 @@ line_event(VALUE trace_point, void *data)
   if (moved || !CTX_FL_TEST(dc, CTX_FL_FORCE_MOVE))
   {
     dc->steps = dc->steps <= 0 ? -1 : dc->steps - 1;
-    if (dc->stack_size <= dc->dest_frame)
+    if (dc->calced_stack_size <= dc->dest_frame)
     {
       dc->lines = dc->lines <= 0 ? -1 : dc->lines - 1;
-      if (dc->stack_size < dc->dest_frame)
+      if (dc->calced_stack_size < dc->dest_frame)
       {
-        dc->dest_frame = dc->stack_size;
+        dc->dest_frame = dc->calced_stack_size;
         rb_funcall(mByebug, rb_intern("print"), 1,
           rb_str_new2("Next went up a frame because previous frame finished\n"));
       }
@@ -238,7 +238,7 @@ call_event(VALUE trace_point, void *data)
 
   EVENT_SETUP
 
-  dc->stack_size++;
+  dc->calced_stack_size++;
 
   EVENT_COMMON
 
@@ -265,11 +265,11 @@ return_event(VALUE trace_point, void *data)
 {
   EVENT_SETUP
 
-  if (dc->stack_size > 0) dc->stack_size--;
+  if (dc->calced_stack_size > 0) dc->calced_stack_size--;
 
   EVENT_COMMON
 
-  if (dc->stack_size + 1 == dc->before_frame)
+  if (dc->calced_stack_size + 1 == dc->before_frame)
   {
     VALUE file, line;
 
@@ -279,7 +279,7 @@ return_event(VALUE trace_point, void *data)
     call_at_return(context, dc, file, line);
   }
 
-  if (dc->stack_size + 1 == dc->after_frame)
+  if (dc->calced_stack_size + 1 == dc->after_frame)
   {
     reset_stepping_stop_points(dc);
     dc->steps = 1;
@@ -293,7 +293,7 @@ c_call_event(VALUE trace_point, void *data)
 {
   EVENT_SETUP
 
-  dc->stack_size++;
+  dc->calced_stack_size++;
 
   EVENT_COMMON
 
@@ -305,7 +305,7 @@ c_return_event(VALUE trace_point, void *data)
 {
   EVENT_SETUP
 
-  if (dc->stack_size > 0) dc->stack_size--;
+  if (dc->calced_stack_size > 0) dc->calced_stack_size--;
 
   EVENT_COMMON
 
@@ -346,7 +346,7 @@ raise_event(VALUE trace_point, void *data)
 
   expn_class = rb_obj_class(err);
 
-  if (catchpoints == Qnil || dc->stack_size == 0 ||
+  if (catchpoints == Qnil || dc->calced_stack_size == 0 ||
       CTX_FL_TEST(dc, CTX_FL_CATCHING) ||
       RHASH_TBL(catchpoints)->num_entries == 0)
   {
@@ -607,9 +607,6 @@ bb_load(int argc, VALUE *argv, VALUE self)
 
   if (RTEST(stop)) dc->steps = 1;
 
-  /* Reset stack size to ignore byebug's own frames */
-  dc->stack_size = 0;
-
   /* Initializing $0 to the script's path */
   ruby_script(RSTRING_PTR(file));
   rb_load_protect(file, 0, &state);

data/ext/byebug/byebug.h

@@ -29,7 +29,7 @@ typedef enum {
 } ctx_stop_reason;
 
 typedef struct {
-  int stack_size;
+  int calced_stack_size;
   int flags;
   ctx_stop_reason stop_reason;
 

data/ext/byebug/context.c

@@ -55,15 +55,15 @@ context_create(VALUE thread)
 {
   debug_context_t *context = ALLOC(debug_context_t);
 
-  context->last_file   = Qnil;
-  context->last_line   = Qnil;
-  context->flags       = 0;
-  context->stack_size  = real_stack_size();
-  context->thnum       = ++thnum_max;
-  context->thread      = thread;
+  context->last_file         = Qnil;
+  context->last_line         = Qnil;
+  context->flags             = 0;
+  context->calced_stack_size = real_stack_size();
+  context->thnum             = ++thnum_max;
+  context->thread            = thread;
   reset_stepping_stop_points(context);
-  context->stop_reason = CTX_STOP_NONE;
-  context->backtrace   = Qnil;
+  context->stop_reason       = CTX_STOP_NONE;
+  context->backtrace         = Qnil;
 
   if (rb_obj_class(thread) == cDebugThread) CTX_FL_SET(context, CTX_FL_IGNORE);
 
@@ -192,16 +192,17 @@ call_with_debug_inspector(struct call_with_inspection_data *data)
 #define FRAME_SETUP                                                   \
   debug_context_t *context;                                           \
   VALUE frame_no;                                                     \
-  int frame_n;                                                        \
+  int frame_n, stack_size;                                            \
   Data_Get_Struct(self, debug_context_t, context);                    \
   if (!rb_scan_args(argc, argv, "01", &frame_no))                     \
     frame_n = 0;                                                      \
   else                                                                \
     frame_n = FIX2INT(frame_no);                                      \
-  if (frame_n < 0 || frame_n >= real_stack_size(rb_thread_current())) \
+  stack_size = real_stack_size();                                     \
+  if (frame_n < 0 || frame_n >= stack_size)                           \
   {                                                                   \
     rb_raise(rb_eArgError, "Invalid frame number %d, stack (0...%d)", \
-             frame_n, real_stack_size(rb_thread_current() - 1));      \
+             frame_n, stack_size - 1);                                \
   }                                                                   \
 
 /*
@@ -349,17 +350,20 @@ Context_resume(VALUE self)
 
 /*
  *  call-seq:
- *    context.stack_size-> int
+ *    context.calced_stack_size-> int
  *
- *  Returns the size of the context stack.
+ *  Returns the calculated size of the context stack.
+ *
+ *  NOTE: it shouldn't be necessary to expose this, this is only done to ease
+ *  the detection of TracePoint API bugs.
  */
 static inline VALUE
-Context_stack_size(VALUE self)
+Context_calced_stack_size(VALUE self)
 {
   debug_context_t *context;
   Data_Get_Struct(self, debug_context_t, context);
 
-  return INT2FIX(context->stack_size);
+  return INT2FIX(context->calced_stack_size);
 }
 
 static VALUE
@@ -431,12 +435,13 @@ static VALUE
 Context_step_out(VALUE self, VALUE frame)
 {
   debug_context_t *context;
+
   Data_Get_Struct(self, debug_context_t, context);
 
-  if (FIX2INT(frame) < 0 || FIX2INT(frame) >= context->stack_size)
+  if (FIX2INT(frame) < 0 || FIX2INT(frame) >= context->calced_stack_size)
     rb_raise(rb_eRuntimeError, "Stop frame is out of range.");
 
-  context->after_frame = context->stack_size - FIX2INT(frame);
+  context->after_frame = context->calced_stack_size - FIX2INT(frame);
 
   return frame;
 }
@@ -458,15 +463,15 @@ Context_step_over(int argc, VALUE *argv, VALUE self)
 
   Data_Get_Struct(self, debug_context_t, context);
 
-  if (context->stack_size == 0)
+  if (context->calced_stack_size == 0)
     rb_raise(rb_eRuntimeError, "No frames collected.");
 
   rb_scan_args(argc, argv, "12", &lines, &frame, &force);
-  context->lines = FIX2INT(lines);
-
-  if (FIX2INT(frame) < 0 || FIX2INT(frame) >= context->stack_size)
+  if (FIX2INT(frame) < 0 || FIX2INT(frame) >= context->calced_stack_size)
     rb_raise(rb_eRuntimeError, "Destination frame is out of range.");
-  context->dest_frame = context->stack_size - FIX2INT(frame);
+
+  context->lines = FIX2INT(lines);
+  context->dest_frame = context->calced_stack_size - FIX2INT(frame);
 
   if (RTEST(force))
     CTX_FL_SET(context, CTX_FL_FORCE_MOVE);
@@ -487,12 +492,12 @@ static VALUE
 Context_stop_return(VALUE self, VALUE frame)
 {
   debug_context_t *context;
-  Data_Get_Struct(self, debug_context_t, context);
 
-  if (FIX2INT(frame) < 0 || FIX2INT(frame) >= context->stack_size)
+  Data_Get_Struct(self, debug_context_t, context);
+  if (FIX2INT(frame) < 0 || FIX2INT(frame) >= context->calced_stack_size)
     rb_raise(rb_eRuntimeError, "Stop frame is out of range.");
 
-  context->before_frame = context->stack_size - FIX2INT(frame);
+  context->before_frame = context->calced_stack_size - FIX2INT(frame);
 
   return frame;
 }
@@ -628,27 +633,27 @@ Init_context(VALUE mByebug)
 {
   cContext = rb_define_class_under(mByebug, "Context", rb_cObject);
 
-  rb_define_method(cContext, "dead?"        , Context_dead         ,  0);
-  rb_define_method(cContext, "frame_binding", Context_frame_binding, -1);
-  rb_define_method(cContext, "frame_class"  , Context_frame_class  , -1);
-  rb_define_method(cContext, "frame_file"   , Context_frame_file   , -1);
-  rb_define_method(cContext, "frame_line"   , Context_frame_line   , -1);
-  rb_define_method(cContext, "frame_method" , Context_frame_method , -1);
-  rb_define_method(cContext, "frame_self"   , Context_frame_self   , -1);
-  rb_define_method(cContext, "ignored?"     , Context_ignored      ,  0);
-  rb_define_method(cContext, "resume"       , Context_resume       ,  0);
-  rb_define_method(cContext, "stack_size"   , Context_stack_size   ,  0);
-  rb_define_method(cContext, "step_into"    , Context_step_into    , -1);
-  rb_define_method(cContext, "step_out"     , Context_step_out     ,  1);
-  rb_define_method(cContext, "step_over"    , Context_step_over    , -1);
-  rb_define_method(cContext, "stop_return"  , Context_stop_return  ,  1);
-  rb_define_method(cContext, "stop_reason"  , Context_stop_reason  ,  0);
-  rb_define_method(cContext, "suspend"      , Context_suspend      ,  0);
-  rb_define_method(cContext, "suspended?"   , Context_is_suspended ,  0);
-  rb_define_method(cContext, "thnum"        , Context_thnum        ,  0);
-  rb_define_method(cContext, "thread"       , Context_thread       ,  0);
-  rb_define_method(cContext, "tracing"      , Context_tracing      ,  0);
-  rb_define_method(cContext, "tracing="     , Context_set_tracing  ,  1);
+  rb_define_method(cContext, "dead?"            , Context_dead             ,  0);
+  rb_define_method(cContext, "frame_binding"    , Context_frame_binding    , -1);
+  rb_define_method(cContext, "frame_class"      , Context_frame_class      , -1);
+  rb_define_method(cContext, "frame_file"       , Context_frame_file       , -1);
+  rb_define_method(cContext, "frame_line"       , Context_frame_line       , -1);
+  rb_define_method(cContext, "frame_method"     , Context_frame_method     , -1);
+  rb_define_method(cContext, "frame_self"       , Context_frame_self       , -1);
+  rb_define_method(cContext, "ignored?"         , Context_ignored          ,  0);
+  rb_define_method(cContext, "resume"           , Context_resume           ,  0);
+  rb_define_method(cContext, "calced_stack_size", Context_calced_stack_size,  0);
+  rb_define_method(cContext, "step_into"        , Context_step_into        , -1);
+  rb_define_method(cContext, "step_out"         , Context_step_out         ,  1);
+  rb_define_method(cContext, "step_over"        , Context_step_over        , -1);
+  rb_define_method(cContext, "stop_return"      , Context_stop_return      ,  1);
+  rb_define_method(cContext, "stop_reason"      , Context_stop_reason      ,  0);
+  rb_define_method(cContext, "suspend"          , Context_suspend          ,  0);
+  rb_define_method(cContext, "suspended?"       , Context_is_suspended     ,  0);
+  rb_define_method(cContext, "thnum"            , Context_thnum            ,  0);
+  rb_define_method(cContext, "thread"           , Context_thread           ,  0);
+  rb_define_method(cContext, "tracing"          , Context_tracing          ,  0);
+  rb_define_method(cContext, "tracing="         , Context_set_tracing      ,  1);
 
   cDebugThread  = rb_define_class_under(mByebug, "DebugThread", rb_cThread);
   rb_define_singleton_method(cDebugThread, "inherited", DebugThread_inherited, 1);

data/ext/byebug/extconf.rb

@@ -9,7 +9,7 @@ end
 
 if RbConfig::MAKEFILE_CONFIG['CC'] =~ /gcc/
   $CFLAGS ||= ''
-  $CFLAGS += ' -Wall -Werror'
+  $CFLAGS += ' -Wall -Werror -Wno-unused-parameter'
   $CFLAGS += ' -gdwarf-2 -g3' if ENV['debug']
 end
 

data/lib/byebug.rb

@@ -65,8 +65,13 @@ module Byebug
       breakpoint
     end
 
+    #
+    # Remove a breakpoint
+    #
+    # @param [integer] breakpoint number
+    #
     def remove_breakpoint(id)
-      Breakpoint.remove breakpoints, id
+      breakpoints.delete_at(id)
     end
 
     def interface=(value)
@@ -190,7 +195,7 @@ module Byebug
     end
 
     def handle_post_mortem(exp)
-      return if !exp || !exp.__bb_context || exp.__bb_context.stack_size == 0
+      return if !exp || !exp.__bb_context || !exp.__bb_context.calced_stack_size
       orig_tracing = Byebug.tracing?
       Byebug.tracing = false
       Byebug.last_exception = exp
@@ -214,7 +219,7 @@ module Kernel
   def byebug(steps_into = 1, steps_out = 2)
     Byebug.start
     Byebug.run_init_script(StringIO.new)
-    if Byebug.current_context.stack_size > 2
+    if Byebug.current_context.calced_stack_size > 2
       Byebug.current_context.stop_return steps_out if steps_out >= 1
     end
     Byebug.current_context.step_into steps_into if steps_into >= 0

data/lib/byebug/command.rb

@@ -168,7 +168,7 @@ module Byebug
     register_setting_var(:forcestep, false)
     register_setting_var(:fullpath, true)
     register_setting_var(:listsize, 10)
-    register_setting_var(:stack_trace_on_error, false)
+    register_setting_var(:stack_on_error, false)
     register_setting_var(:linetrace_plus, false)
     cols = terminal_width || 160
     register_setting_var(:width, cols > 10 ? cols : 160)
@@ -196,7 +196,7 @@ module Byebug
         begin
           eval(str, b)
         rescue StandardError, ScriptError => e
-          if Command.settings[:stack_trace_on_error]
+          if Command.settings[:stack_on_error]
             at = eval("Thread.current.backtrace_locations", b)
             print "#{at.shift}: #{e.class} Exception(#{e.message})\n"
             for i in at
@@ -241,18 +241,17 @@ module Byebug
   # Use Byebug.settings[] and Byebug.settings[]= methods to query and set
   # byebug settings. These settings are available:
   #
-  #  :autoeval             - evaluates input in the current binding if it's not
-  #                          recognized as a byebug command
-  #  :autoirb              - automatically calls 'irb' command on breakpoint
-  #  :autolist             - automatically calls 'list' command on breakpoint
-  #  :autoreload           - makes 'list' command always display up-to-date
-  #                          source code
-  #  :frame_class_names    - displays method's class name when showing frame
-  #                          stack
-  #  :forcestep            - stepping command always move to the new line
-  #  :fullpath             - displays full paths when showing frame stack
-  #  :stack_trace_on_error - shows full stack trace if eval command results in
-  #                          an exception
+  #  :autoeval          - evaluates input in the current binding if it's not
+  #                       recognized as a byebug command
+  #  :autoirb           - automatically calls 'irb' command on breakpoint
+  #  :autolist          - automatically calls 'list' command on breakpoint
+  #  :autoreload        - makes 'list' command always display up-to-date source
+  #                       code
+  #  :frame_class_names - displays method's class name when showing frame stack
+  #  :forcestep         - stepping command always move to the new line
+  #  :fullpath          - displays full paths when showing frame stack
+  #  :stack_on_error    - shows full stack trace if eval command results in an
+  #                       exception
   #
   def self.settings
     Command.settings

data/lib/byebug/commands/finish.rb

@@ -10,10 +10,10 @@ module Byebug
     end
 
     def execute
-      max_frame = @state.context.stack_size - @state.frame_pos
       if not @match[1]
         frame_pos = @state.frame_pos
       else
+        max_frame = Context.stack_size - @state.frame_pos
         frame_pos = get_int(@match[1], "finish", 0, max_frame-1, 0)
         return nil unless frame_pos
       end

data/lib/byebug/commands/frame.rb

@@ -8,7 +8,7 @@ module Byebug
 
     def switch_to_frame(frame_no)
       if frame_no < 0
-        abs_frame_no = @state.context.stack_size + frame_no
+        abs_frame_no = Context.stack_size + frame_no
       else
         abs_frame_no = frame_no
       end
@@ -20,7 +20,7 @@ module Byebug
       step = jump_no/total_jumps
       loop do
         new_pos += step
-        return new_pos if new_pos < 0 || new_pos >= @state.context.stack_size
+        return new_pos if new_pos < 0 || new_pos >= Context.stack_size
 
         next if c_frame?(new_pos)
 
@@ -39,7 +39,7 @@ module Byebug
       end
 
       return errmsg "Can't navigate beyond the oldest frame\n" if
-        abs_frame_pos >= @state.context.stack_size
+        abs_frame_pos >= Context.stack_size
       return errmsg "Can't navigate beyond the newest frame\n" if
         abs_frame_pos < 0
 
@@ -99,10 +99,10 @@ module Byebug
     end
 
     def print_backtrace
-      realsize = Context.real_stack_size
-      size = @state.context.stack_size
-      if size != realsize
-        errmsg "Byebug's stacksize (#{size}) should be #{realsize}. " \
+      realsize = Context.stack_size
+      calcedsize = @state.context.calced_stack_size
+      if calcedsize != realsize
+        errmsg "Byebug's stacksize (#{calcedsize}) should be #{realsize}. " \
                "This might be a bug in byebug or ruby's debugging API's\n"
       end
       (0...realsize).each do |idx|

data/lib/byebug/commands/set.rb

@@ -53,7 +53,7 @@ module Byebug
       when /^post_mortem$/
         Byebug.post_mortem = setting_value
       when /^autoeval|autoreload|basename|forcestep|fullpath|linetrace_plus|
-             testing|stack_trace_on_error$/x
+             testing|stack_on_error$/x
         Command.settings[setting_name.to_sym] = setting_value
       else
         return print "Unknown setting #{@match[1]}.\n"
@@ -61,7 +61,6 @@ module Byebug
     end
   end
 
-
   # Implements byebug "set" command.
   class SetCommand < Command
     SubcmdStruct2 = Struct.new(:name,
@@ -91,7 +90,7 @@ module Byebug
         'Set line execution tracing to show different lines'],
        ['listsize', 3, false, 'Set number of source lines to list by default'],
        ['post_mortem', 2, true, 'Enable post-mortem mode'],
-       ['stack_trace_on_error', 1, true,
+       ['stack_on_error', 1, true,
         'Display stack trace when "eval" raises exception'],
        ['verbose', 1, true,
         'Enable verbose output of TracePoint API events is enabled'],

data/lib/byebug/commands/show.rb

@@ -128,8 +128,8 @@ module Byebug
       when /^post_mortem$/
         on_off = Byebug.post_mortem?
         return "post-mortem mode is #{show_onoff(on_off)}"
-      when /^stack_trace_on_error$/
-        on_off = Command.settings[:stack_trace_on_error]
+      when /^stack_on_error$/
+        on_off = Command.settings[:stack_on_error]
         return "Displaying stack trace is #{show_onoff(on_off)}."
       when /^verbose$/
         on_off = Byebug.verbose
@@ -176,7 +176,7 @@ module Byebug
        ['listsize', 3, 'Show number of source lines to list by default'],
        ['post-mortem', 3, 'Show whether we should go into post-mortem ' \
                           'debugging on an uncaught exception'],
-       ['stack_trace_on_error', 1, 'Show whether a stack trace is displayed ' \
+       ['stack_on_error', 1, 'Show whether a stack trace is displayed ' \
                                    'when "eval" raises an exception'],
        ['verbose', 4, true,
         'Show whether verbose output for debugging byebug itself is enabled'],

data/lib/byebug/context.rb

@@ -3,7 +3,7 @@ module Byebug
   class Context
 
     class << self
-      def real_stack_size
+      def stack_size
         if backtrace = Thread.current.backtrace_locations
           backtrace.drop_while { |l| ignored(l.path) || l.path == '(eval)' }
                    .take_while { |l| !ignored(l.path) }
@@ -11,6 +11,12 @@ module Byebug
         end
       end
 
+      def real_stack_size
+        if backtrace = Thread.current.backtrace_locations
+          backtrace.size
+        end
+      end
+
       def ignored(path)
         IGNORED_FILES.include?(path)
       end

data/lib/byebug/processor.rb

@@ -87,13 +87,7 @@ module Byebug
       file = CommandProcessor.canonic_file(context.frame_file(0))
       line = context.frame_line(0)
       print "Catchpoint at %s:%d: `%s' (%s)\n", file, line, excpt, excpt.class
-      fs = context.stack_size
-      tb = caller(0)[-fs..-1]
-      if tb
-        for i in tb
-          print "\tfrom %s\n", i
-        end
-      end
+      print_backtrace
     end
     protect :at_catchpoint
 

data/lib/byebug/version.rb

@@ -1,3 +1,3 @@
 module Byebug
-  VERSION = '2.2.0'
+  VERSION = '2.2.1'
 end

data/old_doc/byebug.texi

@@ -2882,12 +2882,10 @@ Return the filename of the location of the indicated frame position.
 @vindex @code{Byebug.context.frame_method}
 Symbol of the method name of the indicated frame position.
 
-@item Byebug.context.stack_size
-@vindex @code{Byebug.context.stack_size}
-Return the number the size of the frame stack. Note this may be less
-that the actual frame stack size if byebug recording
-(@code{Byebug.start}) was turned on at after some blocks were added
-and not finished when the @code{Byebug.start} was issued.
+@item Byebug.context.calced_stack_size
+@vindex @code{Byebug.context.calced_stack_size}
+Returns the stack size calculated by byebug. This is initialized when byebug is
+started and after that is kept up-to-date using the TracePoint API events.
 @end table
 
 @node Byebug.settings
@@ -2926,7 +2924,7 @@ Boolean. @xref{Fullpath}.
 Fixnum. Number of lines to show in a @code{list} command. @xref{Listsize}.
 @item :autoreload
 Boolean. True if we should reread the source every time it changes. @xref{Autoreload}.
-@item :stack_trace_on_error
+@item :stack_on_error
 Boolean. True if we should produce a stack trace on eval errors. @xref{Trace}.
 @item :width
 Fixnum. Number of characters byebug thinks are in a line. @xref{Width}.

data/test/eval_test.rb

@@ -53,7 +53,7 @@ class TestEval < TestDsl::TestCase
 
   describe 'stack trace on error' do
     describe 'when enabled' do
-      temporary_change_hash Byebug.settings, :stack_trace_on_error, true
+      temporary_change_hash Byebug.settings, :stack_on_error, true
 
       it 'must show a stack trace' do
         enter 'eval 2 / 0'
@@ -64,7 +64,7 @@ class TestEval < TestDsl::TestCase
     end
 
     describe 'when disabled' do
-      temporary_change_hash Byebug.settings, :stack_trace_on_error, false
+      temporary_change_hash Byebug.settings, :stack_on_error, false
 
       it 'must only show exception' do
         enter 'eval 2 / 0'

data/test/show_test.rb

@@ -115,9 +115,9 @@ class TestShow < TestDsl::TestCase
     end
   end
 
-  describe 'stack_trace_on_error' do
-    it 'must show stack_trace_on_error' do
-      enter 'show stack_trace_on_error'
+  describe 'stack_on_error' do
+    it 'must show stack_on_error' do
+      enter 'show stack_on_error'
       debug_file 'show'
       check_output_includes 'Displaying stack trace is off.'
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: byebug
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - David Rodriguez
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-22 00:00:00.000000000 Z
+date: 2013-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: columnize