byebug 2.1.1 → 2.2.0

data/Rakefile

@@ -10,6 +10,7 @@ desc "Run MiniTest suite"
 task :test do
   Rake::TestTask.new(:test) do |t|
     t.test_files = FileList["test/*_test.rb"]
+    t.warning = true
     t.verbose = true
   end
 end

data/bin/byebug

@@ -62,9 +62,8 @@ require File.dirname(__FILE__) + "/../lib/byebug"
 
 def debug_program(options)
   # Make sure Ruby script syntax checks okay.
-  # Otherwise we get a load message that looks like byebug has a problem.
   output = `ruby -c "#{Byebug::PROG_SCRIPT}" 2>&1`
-  if $?.exitstatus != 0 and RUBY_PLATFORM !~ /mswin/
+  if $?.exitstatus != 0
     puts output
     exit $?.exitstatus
   end
@@ -96,7 +95,6 @@ options = OpenStruct.new(
   'script'             => nil,
   'stop'               => true,
   'tracing'            => false,
-  'verbose_long'       => false
 )
 
 def process_options(options)
@@ -158,10 +156,6 @@ EOB
       puts "byebug #{Byebug::VERSION}"
       exit
     end
-    opts.on('--verbose', 'Turn on verbose mode') do
-      $VERBOSE = true
-      options.verbose_long = true
-    end
     opts.on_tail('-v', 'Print version number, then turn on verbose mode') do
       puts "byebug #{Byebug::VERSION}"
       $VERBOSE = true
@@ -198,7 +192,6 @@ rescue StandardError => e
 end
 
 if ARGV.empty?
-  exit if $VERBOSE and not options.verbose_long
   puts opts
   puts
   puts 'Must specify a script to run'

data/ext/byebug/byebug.c

@@ -4,7 +4,7 @@ static VALUE mByebug; /* Ruby Byebug Module object */
 
 static VALUE tracing     = Qfalse;
 static VALUE post_mortem = Qfalse;
-static VALUE debug       = Qfalse;
+static VALUE verbose     = Qfalse;
 
 static VALUE catchpoints = Qnil;
 static VALUE breakpoints = Qnil;
@@ -69,7 +69,7 @@ cleanup(debug_context_t *dc)
   VALUE context;                                                        \
   thread_context_lookup(rb_thread_current(), &context);                 \
   Data_Get_Struct(context, debug_context_t, dc);                        \
-  if (debug == Qtrue) trace_print(trace_arg, dc);                       \
+  if (verbose == Qtrue) trace_print(trace_arg, dc);                     \
 
 #define EVENT_COMMON if (!trace_common(trace_arg, dc)) { return; }
 
@@ -182,13 +182,15 @@ call_at_line_check(VALUE context_obj, debug_context_t *dc,
 static void
 line_event(VALUE trace_point, void *data)
 {
+  VALUE breakpoint, file, line, binding;
+  int moved = 0;
+
   EVENT_SETUP
 
-  VALUE breakpoint = Qnil;
-  VALUE file    = rb_tracearg_path(trace_arg);
-  VALUE line    = rb_tracearg_lineno(trace_arg);
-  VALUE binding = rb_tracearg_binding(trace_arg);
-  int moved = 0;
+  breakpoint = Qnil;
+  file    = rb_tracearg_path(trace_arg);
+  line    = rb_tracearg_lineno(trace_arg);
+  binding = rb_tracearg_binding(trace_arg);
 
   EVENT_COMMON
 
@@ -209,7 +211,12 @@ line_event(VALUE trace_point, void *data)
     if (dc->stack_size <= dc->dest_frame)
     {
       dc->lines = dc->lines <= 0 ? -1 : dc->lines - 1;
-      dc->dest_frame = dc->stack_size;
+      if (dc->stack_size < dc->dest_frame)
+      {
+        dc->dest_frame = dc->stack_size;
+        rb_funcall(mByebug, rb_intern("print"), 1,
+          rb_str_new2("Next went up a frame because previous frame finished\n"));
+      }
     }
   }
 
@@ -227,19 +234,21 @@ line_event(VALUE trace_point, void *data)
 static void
 call_event(VALUE trace_point, void *data)
 {
+  VALUE breakpoint, klass, mid, binding, self, file, line;
+
   EVENT_SETUP
 
   dc->stack_size++;
 
   EVENT_COMMON
 
-  VALUE breakpoint = Qnil;
-  VALUE klass   = rb_tracearg_defined_class(trace_arg);
-  VALUE mid     = SYM2ID(rb_tracearg_method_id(trace_arg));
-  VALUE binding = rb_tracearg_binding(trace_arg);
-  VALUE self    = rb_tracearg_self(trace_arg);
-  VALUE file    = rb_tracearg_path(trace_arg);
-  VALUE line    = rb_tracearg_lineno(trace_arg);
+  breakpoint = Qnil;
+  klass   = rb_tracearg_defined_class(trace_arg);
+  mid     = SYM2ID(rb_tracearg_method_id(trace_arg));
+  binding = rb_tracearg_binding(trace_arg);
+  self    = rb_tracearg_self(trace_arg);
+  file    = rb_tracearg_path(trace_arg);
+  line    = rb_tracearg_lineno(trace_arg);
 
   breakpoint = find_breakpoint_by_method(breakpoints, klass, mid, binding, self);
   if (breakpoint != Qnil)
@@ -262,9 +271,11 @@ return_event(VALUE trace_point, void *data)
 
   if (dc->stack_size + 1 == dc->before_frame)
   {
+    VALUE file, line;
+
     reset_stepping_stop_points(dc);
-    VALUE file = rb_tracearg_path(trace_arg);
-    VALUE line = rb_tracearg_lineno(trace_arg);
+    file = rb_tracearg_path(trace_arg);
+    line = rb_tracearg_lineno(trace_arg);
     call_at_return(context, dc, file, line);
   }
 
@@ -304,19 +315,22 @@ c_return_event(VALUE trace_point, void *data)
 static void
 raise_event(VALUE trace_point, void *data)
 {
-  EVENT_SETUP
-
   VALUE expn_class, aclass;
-  VALUE err = rb_errinfo();
+  VALUE err;
   VALUE ancestors;
   int i;
   debug_context_t *new_dc;
+  VALUE binding, path, lineno;
+
+  EVENT_SETUP
+
+  err = rb_errinfo();
 
   EVENT_COMMON
 
-  VALUE binding = rb_tracearg_binding(trace_arg);
-  VALUE path    = rb_tracearg_path(trace_arg);
-  VALUE lineno  = rb_tracearg_lineno(trace_arg);
+  binding = rb_tracearg_binding(trace_arg);
+  path    = rb_tracearg_path(trace_arg);
+  lineno  = rb_tracearg_lineno(trace_arg);
 
   if (post_mortem == Qtrue)
   {
@@ -374,8 +388,6 @@ register_tracepoints(VALUE self)
 
   if (NIL_P(traces))
   {
-    traces = rb_ary_new();
-
     int line_msk     = RUBY_EVENT_LINE;
     int call_msk     = RUBY_EVENT_CALL | RUBY_EVENT_B_CALL | RUBY_EVENT_CLASS;
     int return_msk   = RUBY_EVENT_RETURN | RUBY_EVENT_B_RETURN | RUBY_EVENT_END;
@@ -390,6 +402,7 @@ register_tracepoints(VALUE self)
     VALUE tpCReturn  = rb_tracepoint_new(Qnil, c_return_msk, c_return_event, 0);
     VALUE tpRaise    = rb_tracepoint_new(Qnil, raise_msk   , raise_event   , 0);
 
+    traces = rb_ary_new();
     rb_ary_push(traces, tpLine);
     rb_ary_push(traces, tpCall);
     rb_ary_push(traces, tpReturn);
@@ -613,6 +626,32 @@ bb_load(int argc, VALUE *argv, VALUE self)
   return status;
 }
 
+/*
+ *  call-seq:
+ *    Byebug.verbose -> bool
+ *
+ *  Returns +true+ if verbose output of TracePoint API events is enabled.
+ */
+static VALUE
+bb_verbose(VALUE self)
+{
+  return verbose;
+}
+
+/*
+ *  call-seq:
+ *    Byebug.verbose = bool
+ *
+ *  Enable verbose output of every TracePoint API events, useful for debugging
+ *  byebug.
+ */
+static VALUE
+bb_set_verbose(VALUE self, VALUE value)
+{
+  verbose = RTEST(value) ? Qtrue : Qfalse;
+  return value;
+}
+
 static VALUE
 set_current_skipped_status(VALUE status)
 {
@@ -784,6 +823,8 @@ Init_byebug()
   rb_define_module_function(mByebug, "thread_context" , bb_thread_context ,  1);
   rb_define_module_function(mByebug, "tracing?"       , bb_tracing        ,  0);
   rb_define_module_function(mByebug, "tracing="       , bb_set_tracing    ,  1);
+  rb_define_module_function(mByebug, "verbose"        , bb_verbose        ,  0);
+  rb_define_module_function(mByebug, "verbose="       , bb_set_verbose    ,  1);
 
   cThreadsTable = rb_define_class_under(mByebug, "ThreadsTable", rb_cObject);
 

data/ext/byebug/context.c

@@ -45,13 +45,9 @@ context_free(void *data)
 }
 
 static int
-real_stack_size(VALUE thread)
+real_stack_size()
 {
-  VALUE locs = rb_funcall(thread, rb_intern("backtrace_locations"), 1, INT2FIX(1));
-  if (locs == Qnil)
-    return 0;
-
-  return (int)RARRAY_LEN(locs);
+  return FIX2INT(rb_funcall(cContext, rb_intern("real_stack_size"), 0));
 }
 
 extern VALUE
@@ -62,7 +58,7 @@ context_create(VALUE thread)
   context->last_file   = Qnil;
   context->last_line   = Qnil;
   context->flags       = 0;
-  context->stack_size  = real_stack_size(thread);
+  context->stack_size  = real_stack_size();
   context->thnum       = ++thnum_max;
   context->thread      = thread;
   reset_stepping_stop_points(context);
@@ -97,13 +93,15 @@ static VALUE
 dc_frame_get(const debug_context_t *context, int frame_index,
                                              enum frame_component type)
 {
+  VALUE frame;
+
   if (NIL_P(dc_backtrace(context)))
     rb_raise(rb_eRuntimeError, "Backtrace information is not available");
 
   if (frame_index >= RARRAY_LEN(dc_backtrace(context)))
     rb_raise(rb_eRuntimeError, "That frame doesn't exist!");
 
-  VALUE frame = rb_ary_entry(dc_backtrace(context), frame_index);
+  frame = rb_ary_entry(dc_backtrace(context), frame_index);
   return rb_ary_entry(frame, type);
 }
 
@@ -243,9 +241,11 @@ Context_frame_class(int argc, VALUE *argv, VALUE self)
 static VALUE
 Context_frame_file(int argc, VALUE *argv, VALUE self)
 {
+  VALUE loc;
+
   FRAME_SETUP
 
-  VALUE loc = dc_frame_location(context, frame_n);
+  loc = dc_frame_location(context, frame_n);
 
   return rb_funcall(loc, rb_intern("path"), 0);
 }
@@ -259,9 +259,11 @@ Context_frame_file(int argc, VALUE *argv, VALUE self)
 static VALUE
 Context_frame_line(int argc, VALUE *argv, VALUE self)
 {
+  VALUE loc;
+
   FRAME_SETUP
 
-  VALUE loc = dc_frame_location(context, frame_n);
+  loc = dc_frame_location(context, frame_n);
 
   return rb_funcall(loc, rb_intern("lineno"), 0);
 }
@@ -275,9 +277,11 @@ Context_frame_line(int argc, VALUE *argv, VALUE self)
 static VALUE
 Context_frame_method(int argc, VALUE *argv, VALUE self)
 {
+  VALUE loc;
+
   FRAME_SETUP
 
-  VALUE loc = dc_frame_location(context, frame_n);
+  loc = dc_frame_location(context, frame_n);
 
   return rb_str_intern(rb_funcall(loc, rb_intern("label"), 0));
 }
@@ -354,16 +358,8 @@ Context_stack_size(VALUE self)
 {
   debug_context_t *context;
   Data_Get_Struct(self, debug_context_t, context);
-  VALUE backtrace = dc_backtrace(context);
-
-  if (NIL_P(backtrace))
-    return INT2FIX(context->stack_size);
-
-  if (context->stack_size != RARRAY_LEN(backtrace))
-    rb_warn("Calculated stack size is %d but there are actually %ld frames",
-            context->stack_size, RARRAY_LEN(backtrace));
 
-  return INT2FIX(RARRAY_LEN(backtrace));
+  return INT2FIX(context->stack_size);
 }
 
 static VALUE

data/ext/byebug/extconf.rb

@@ -8,7 +8,8 @@ if RUBY_VERSION < "2.0"
 end
 
 if RbConfig::MAKEFILE_CONFIG['CC'] =~ /gcc/
-  $CFLAGS = '-Wall -Werror'
+  $CFLAGS ||= ''
+  $CFLAGS += ' -Wall -Werror'
   $CFLAGS += ' -gdwarf-2 -g3' if ENV['debug']
 end
 

data/lib/byebug.rb

@@ -4,12 +4,11 @@ require_relative 'byebug/context'
 require_relative 'byebug/processor'
 require_relative 'byebug/remote'
 require 'stringio'
+require 'tracer'
 require 'linecache19'
 
 module Byebug
 
-  self.handler = CommandProcessor.new
-
   # List of files byebug will ignore while debugging
   IGNORED_FILES = Dir[Pathname.new(__FILE__) + "../**/*.rb"].map {
     |f| File.expand_path(f) }
@@ -26,14 +25,17 @@ module Byebug
 
   class << self
 
+    # processor modules provide +handler+ object
+    attr_accessor :handler
+    Byebug.handler = CommandProcessor.new
+
     attr_accessor :last_exception
     Byebug.last_exception = nil
 
     def source_reload
-      Object.send(:remove_const, "SCRIPT_LINES__") if
-        Object.const_defined?("SCRIPT_LINES__")
-      Object.const_set("SCRIPT_LINES__", {})
-      LineCache::clear_file_cache
+      Object.send(:remove_const, 'SCRIPT_LINES__') if
+        Object.const_defined?('SCRIPT_LINES__')
+      Object.const_set('SCRIPT_LINES__', {})
     end
 
     #
@@ -42,9 +44,11 @@ module Byebug
     # @return "\n" if there was a problem. Leaking blanks are stripped off.
     #
     def line_at(filename, line_number)
-      @@autoreload = nil unless defined?(@@autoreload)
-      line = LineCache::getline filename, line_number, @@autoreload
-      return "\n" unless line
+      source_reload
+
+      return "\n" unless File.exist?(filename)
+      line = Tracer::Single.get_line(filename, line_number)
+
       return "#{line.gsub(/^\s+/, '').chomp}"
     end
 
@@ -69,6 +73,9 @@ module Byebug
       handler.interface = value
     end
 
+    extend Forwardable
+    def_delegators :"handler.interface", :print
+
     #
     # Byebug.start(options) -> bool
     # Byebug.start(options) { ... } -> obj

data/lib/byebug/command.rb

@@ -31,7 +31,7 @@ module Byebug
                       need_context:         false } unless defined?(DEF_OPTIONS)
 
       def help(args)
-        output = description.gsub(/^ +/, '')
+        output = description.gsub(/^ +/, '') + "\n"
 
         if defined? self::Subcommands
           return output += format_subcmds unless args and args[1]
@@ -176,7 +176,7 @@ module Byebug
     register_setting_var(:argv, Byebug::ARGV)
 
     def initialize(state)
-      @state = state
+      @match, @state = nil, state
     end
 
     def match(input)
@@ -197,7 +197,7 @@ module Byebug
           eval(str, b)
         rescue StandardError, ScriptError => e
           if Command.settings[:stack_trace_on_error]
-            at = eval("Thread.current.backtrace_locations(1)", b)
+            at = eval("Thread.current.backtrace_locations", b)
             print "#{at.shift}: #{e.class} Exception(#{e.message})\n"
             for i in at
               print "\tfrom #{i}\n"

data/lib/byebug/commands/condition.rb

@@ -17,8 +17,8 @@ module Byebug
       return print "No breakpoints have been set.\n" if 0 == largest
       return unless pos = get_int(@match[1], "Condition", 1, largest)
 
-      b = breakpoints.select{ |b| b.id == pos }.first
-      b.expr = @match[2] if b
+      breakpoint = breakpoints.select{ |b| b.id == pos }.first
+      breakpoint.expr = @match[2] if breakpoint
     end
 
     class << self

data/lib/byebug/commands/edit.rb

@@ -9,21 +9,24 @@ module Byebug
 
     def execute
       if not @match[1]
-        unless @state.context
-          errmsg "We are not in a state that has an associated file.\n"
-          return
+        unless @state.file
+          return errmsg "We are not in a state that has an associated file.\n"
         end
         file = @state.file
-        line_number = @state.line
+        line = @state.line if @state.line
       elsif @pos_match = /([^:]+)[:]([0-9]+)/.match(@match[1])
-        file, line_number = @pos_match.captures
+        file, line = @pos_match.captures
+      elsif File.exist?(@match[1])
+        file = @match[1]
       else
-        errmsg "Invalid file/line number specification: #{@match[1]}\n"
-        return
+        return errmsg "Invalid file[:line] number specification: #{@match[1]}\n"
       end
-      editor = ENV['EDITOR'] || 'ex'
+
+      editor = ENV['EDITOR'] || 'vim'
+
       if File.readable?(file)
-        system("#{editor} +#{line_number} #{file}")
+        system("#{editor} +#{line} #{file}") if line
+        system("#{editor} #{file}") unless line
       else
         errmsg "File \"#{file}\" is not readable.\n"
       end