byebug 10.0.0 → 11.1.0

data/ext/byebug/byebug.h

@@ -30,7 +30,8 @@
   } while (0)
 
 /* types */
-typedef enum {
+typedef enum
+{
   CTX_STOP_NONE,
   CTX_STOP_STEP,
   CTX_STOP_BREAKPOINT,
@@ -54,7 +55,8 @@ typedef struct
   VALUE backtrace; /* [[loc, self, klass, binding], ...] */
 } debug_context_t;
 
-typedef enum {
+typedef enum
+{
   LOCATION,
   SELF,
   CLASS,
@@ -107,9 +109,9 @@ typedef struct
 } breakpoint_t;
 
 /* functions from locker.c */
-extern void add_to_locked(VALUE thread);
-extern VALUE pop_from_locked();
-extern void remove_from_locked(VALUE thread);
+extern void byebug_add_to_locked(VALUE thread);
+extern VALUE byebug_pop_from_locked();
+extern void byebug_remove_from_locked(VALUE thread);
 
 /* functions from threads.c */
 extern void Init_threads_table(VALUE mByebug);
@@ -124,16 +126,16 @@ extern VALUE threads;
 extern VALUE next_thread;
 
 /* functions from context.c */
-extern void Init_context(VALUE mByebug);
-extern VALUE context_create(VALUE thread);
+extern void Init_byebug_context(VALUE mByebug);
+extern VALUE byebug_context_create(VALUE thread);
 extern VALUE context_dup(debug_context_t *context);
-extern void reset_stepping_stop_points(debug_context_t *context);
+extern void byebug_reset_stepping_stop_points(debug_context_t *context);
 extern VALUE call_with_debug_inspector(struct call_with_inspection_data *data);
 extern VALUE context_backtrace_set(const rb_debug_inspector_t *inspector,
                                    void *data);
 
 /* functions from breakpoint.c */
-extern void Init_breakpoint(VALUE mByebug);
+extern void Init_byebug_breakpoint(VALUE mByebug);
 extern VALUE find_breakpoint_by_pos(VALUE breakpoints, VALUE source, VALUE pos,
                                     VALUE bind);
 

data/ext/byebug/context.c

@@ -5,9 +5,9 @@ static VALUE cDebugThread;
 static int thnum_max = 0;
 
 /* "Step", "Next" and "Finish" do their work by saving information about where
- * to stop next. reset_stepping_stop_points removes/resets this information. */
+ * to stop next. byebug_reset_stepping_stop_points removes/resets this information. */
 extern void
-reset_stepping_stop_points(debug_context_t *context)
+byebug_reset_stepping_stop_points(debug_context_t *context)
 {
   context->dest_frame = -1;
   context->lines = -1;
@@ -56,14 +56,14 @@ dc_stack_size(debug_context_t *context)
 }
 
 extern VALUE
-context_create(VALUE thread)
+byebug_context_create(VALUE thread)
 {
   debug_context_t *context = ALLOC(debug_context_t);
 
   context->flags = 0;
   context->thnum = ++thnum_max;
   context->thread = thread;
-  reset_stepping_stop_points(context);
+  byebug_reset_stepping_stop_points(context);
   context->stop_reason = CTX_STOP_NONE;
 
   rb_debug_inspector_open(context_backtrace_set, (void *)context);
@@ -81,7 +81,7 @@ context_dup(debug_context_t *context)
   debug_context_t *new_context = ALLOC(debug_context_t);
 
   memcpy(new_context, context, sizeof(debug_context_t));
-  reset_stepping_stop_points(new_context);
+  byebug_reset_stepping_stop_points(new_context);
   new_context->backtrace = context->backtrace;
   CTX_FL_SET(new_context, CTX_FL_DEAD);
 
@@ -177,6 +177,13 @@ open_debug_inspector(struct call_with_inspection_data *cwi)
   return rb_debug_inspector_open(open_debug_inspector_i, cwi);
 }
 
+static VALUE
+open_debug_inspector_ensure(VALUE v)
+{
+  return open_debug_inspector((struct call_with_inspection_data *)v);
+}
+
+
 static VALUE
 close_debug_inspector(struct call_with_inspection_data *cwi)
 {
@@ -184,10 +191,16 @@ close_debug_inspector(struct call_with_inspection_data *cwi)
   return Qnil;
 }
 
+static VALUE
+close_debug_inspector_ensure(VALUE v)
+{
+  return close_debug_inspector((struct call_with_inspection_data *)v);
+}
+
 extern VALUE
 call_with_debug_inspector(struct call_with_inspection_data *data)
 {
-  return rb_ensure(open_debug_inspector, (VALUE)data, close_debug_inspector,
+  return rb_ensure(open_debug_inspector_ensure, (VALUE)data, close_debug_inspector_ensure,
                    (VALUE)data);
 }
 
@@ -642,7 +655,7 @@ dt_inherited(VALUE klass)
  *   Byebug keeps a single instance of this class per thread.
  */
 void
-Init_context(VALUE mByebug)
+Init_byebug_context(VALUE mByebug)
 {
   cContext = rb_define_class_under(mByebug, "Context", rb_cObject);
 
@@ -669,5 +682,5 @@ Init_context(VALUE mByebug)
   rb_define_method(cContext, "tracing=", Context_set_tracing, 1);
 
   cDebugThread = rb_define_class_under(mByebug, "DebugThread", rb_cThread);
-  rb_define_singleton_method(cDebugThread, "inherited", dt_inherited, 1);
+  rb_define_singleton_method(cDebugThread, "inherited", dt_inherited, 0);
 }

data/ext/byebug/locker.c

@@ -29,7 +29,7 @@ is_in_locked(VALUE thread)
 }
 
 extern void
-add_to_locked(VALUE thread)
+byebug_add_to_locked(VALUE thread)
 {
   locked_thread_t *node;
 
@@ -50,7 +50,7 @@ add_to_locked(VALUE thread)
 }
 
 extern VALUE
-pop_from_locked()
+byebug_pop_from_locked()
 {
   VALUE thread;
   locked_thread_t *node;
@@ -71,7 +71,7 @@ pop_from_locked()
 }
 
 extern void
-remove_from_locked(VALUE thread)
+byebug_remove_from_locked(VALUE thread)
 {
   locked_thread_t *node;
   locked_thread_t *next_node;
@@ -81,7 +81,7 @@ remove_from_locked(VALUE thread)
 
   if (locked_head->thread == thread)
   {
-    pop_from_locked();
+    byebug_pop_from_locked();
     return;
   }
 

data/ext/byebug/threads.c

@@ -118,7 +118,7 @@ thread_context_lookup(VALUE thread, VALUE *context)
 
   if (!st_lookup(t_tbl->tbl, thread, context) || !*context)
   {
-    *context = context_create(thread);
+    *context = byebug_context_create(thread);
     st_insert(t_tbl->tbl, thread, *context);
   }
 }
@@ -134,7 +134,7 @@ acquire_lock(debug_context_t *dc)
   while ((!NIL_P(locker) && locker != rb_thread_current())
          || CTX_FL_TEST(dc, CTX_FL_SUSPEND))
   {
-    add_to_locked(rb_thread_current());
+    byebug_add_to_locked(rb_thread_current());
     rb_thread_stop();
 
     if (CTX_FL_TEST(dc, CTX_FL_SUSPEND))
@@ -159,10 +159,10 @@ release_lock(void)
   locker = Qnil;
 
   if (NIL_P(next_thread))
-    thread = pop_from_locked();
+    thread = byebug_pop_from_locked();
   else
   {
-    remove_from_locked(next_thread);
+    byebug_remove_from_locked(next_thread);
     thread = next_thread;
     next_thread = Qnil;
   }

data/lib/byebug.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-require "byebug/attacher"
+require_relative "byebug/attacher"

data/lib/byebug/attacher.rb

@@ -8,8 +8,6 @@ module Byebug
   # Starts byebug, and stops at the first line of user's code.
   #
   def self.attach
-    require "byebug/core"
-
     unless started?
       self.mode = :attached
 
@@ -21,7 +19,7 @@ module Byebug
   end
 
   def self.spawn(host = "localhost", port = nil)
-    require "byebug/core"
+    require_relative "core"
 
     self.wait_connection = true
     start_server(host, port || PORT)
@@ -35,7 +33,9 @@ end
 #
 module Kernel
   def byebug
-    Byebug.attach
+    require_relative "core"
+
+    Byebug.attach unless Byebug.mode == :off
   end
 
   def remote_byebug(host = "localhost", port = nil)

data/lib/byebug/command.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "forwardable"
-require "byebug/helpers/string"
+require_relative "helpers/string"
 
 module Byebug
   #
@@ -80,7 +80,7 @@ module Byebug
       def to_s
         name
           .split("::")
-          .map { |n| n.gsub(/Command$/, "").downcase if n =~ /Command$/ }
+          .map { |n| n.gsub(/Command$/, "").downcase if /Command$/.match?(n) }
           .compact
           .join(" ")
       end

data/lib/byebug/command_list.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "byebug/errors"
+require_relative "errors"
 
 module Byebug
   #

data/lib/byebug/commands.rb

@@ -1,39 +1,40 @@
 # frozen_string_literal: true
 
-require "byebug/commands/break"
-require "byebug/commands/catch"
-require "byebug/commands/condition"
-require "byebug/commands/continue"
-require "byebug/commands/debug"
-require "byebug/commands/delete"
-require "byebug/commands/disable"
-require "byebug/commands/display"
-require "byebug/commands/down"
-require "byebug/commands/edit"
-require "byebug/commands/enable"
-require "byebug/commands/finish"
-require "byebug/commands/frame"
-require "byebug/commands/help"
-require "byebug/commands/history"
-require "byebug/commands/info"
-require "byebug/commands/interrupt"
-require "byebug/commands/irb"
-require "byebug/commands/kill"
-require "byebug/commands/list"
-require "byebug/commands/method"
-require "byebug/commands/next"
-require "byebug/commands/pry"
-require "byebug/commands/quit"
-require "byebug/commands/restart"
-require "byebug/commands/save"
-require "byebug/commands/set"
-require "byebug/commands/show"
-require "byebug/commands/source"
-require "byebug/commands/step"
-require "byebug/commands/thread"
-require "byebug/commands/tracevar"
-require "byebug/commands/undisplay"
-require "byebug/commands/untracevar"
-require "byebug/commands/up"
-require "byebug/commands/var"
-require "byebug/commands/where"
+require_relative "commands/break"
+require_relative "commands/catch"
+require_relative "commands/condition"
+require_relative "commands/continue"
+require_relative "commands/debug"
+require_relative "commands/delete"
+require_relative "commands/disable"
+require_relative "commands/display"
+require_relative "commands/down"
+require_relative "commands/edit"
+require_relative "commands/enable"
+require_relative "commands/finish"
+require_relative "commands/frame"
+require_relative "commands/help"
+require_relative "commands/history"
+require_relative "commands/info"
+require_relative "commands/interrupt"
+require_relative "commands/irb"
+require_relative "commands/kill"
+require_relative "commands/list"
+require_relative "commands/method"
+require_relative "commands/next"
+require_relative "commands/pry"
+require_relative "commands/quit"
+require_relative "commands/restart"
+require_relative "commands/save"
+require_relative "commands/set"
+require_relative "commands/show"
+require_relative "commands/skip"
+require_relative "commands/source"
+require_relative "commands/step"
+require_relative "commands/thread"
+require_relative "commands/tracevar"
+require_relative "commands/undisplay"
+require_relative "commands/untracevar"
+require_relative "commands/up"
+require_relative "commands/var"
+require_relative "commands/where"

data/lib/byebug/commands/break.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require "byebug/command"
-require "byebug/helpers/eval"
-require "byebug/helpers/file"
-require "byebug/helpers/parse"
-require "byebug/source_file_formatter"
+require_relative "../command"
+require_relative "../helpers/eval"
+require_relative "../helpers/file"
+require_relative "../helpers/parse"
+require_relative "../source_file_formatter"
 
 module Byebug
   #
@@ -23,8 +23,8 @@ module Byebug
 
     def self.description
       <<-DESCRIPTION
-        b[reak] [file:]line [if expr]
-        b[reak] [module::...]class(.|#)method [if expr]
+        b[reak] [<file>:]<line> [if <expr>]
+        b[reak] [<module>::...]<class>(.|#)<method> [if <expr>]
 
         They can be specified by line or method and an expression can be added
         for conditionally enabled breakpoints.
@@ -43,9 +43,7 @@ module Byebug
       b = line_breakpoint(@match[1]) || method_breakpoint(@match[1])
       return errmsg(pr("break.errors.location")) unless b
 
-      if syntax_valid?(@match[2])
-        return puts(pr("break.created", id: b.id, file: b.source, line: b.pos))
-      end
+      return puts(pr("break.created", id: b.id, file: b.source, line: b.pos)) if syntax_valid?(@match[2])
 
       errmsg(pr("break.errors.expression", expr: @match[2]))
       b.enabled = false
@@ -76,7 +74,7 @@ module Byebug
     def target_object(str)
       k = error_eval(str)
 
-      k && k.is_a?(Module) ? k.name : str
+      k&.is_a?(Module) ? k.name : str
     rescue StandardError
       errmsg("Warning: breakpoint source is not yet defined")
       str
@@ -87,9 +85,7 @@ module Byebug
 
       fullpath = File.realpath(file)
 
-      if line > n_lines(file)
-        raise(pr("break.errors.far_line", lines: n_lines(file), file: fullpath))
-      end
+      raise(pr("break.errors.far_line", lines: n_lines(file), file: fullpath)) if line > n_lines(file)
 
       unless Breakpoint.potential_line?(fullpath, line)
         msg = pr(

data/lib/byebug/commands/catch.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require "byebug/command"
-require "byebug/helpers/eval"
+require_relative "../command"
+require_relative "../helpers/eval"
 
 module Byebug
   #
@@ -48,18 +48,14 @@ module Byebug
     private
 
     def remove(exception)
-      unless Byebug.catchpoints.member?(exception)
-        return errmsg pr("catch.errors.not_found", exception: exception)
-      end
+      return errmsg pr("catch.errors.not_found", exception: exception) unless Byebug.catchpoints.member?(exception)
 
       puts pr("catch.removed", exception: exception)
       Byebug.catchpoints.delete(exception)
     end
 
     def add(exception)
-      if warning_eval(exception.is_a?(Class).to_s)
-        errmsg pr("catch.errors.not_class", class: exception)
-      end
+      errmsg pr("catch.errors.not_class", class: exception) if warning_eval(exception.is_a?(Class).to_s)
 
       puts pr("catch.added", exception: exception)
       Byebug.add_catchpoint(exception)

data/lib/byebug/commands/condition.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require "byebug/command"
-require "byebug/helpers/parse"
+require_relative "../command"
+require_relative "../helpers/parse"
 
 module Byebug
   #
@@ -47,9 +47,7 @@ module Byebug
       breakpoint = breakpoints.find { |b| b.id == pos }
       return errmsg(pr("break.errors.no_breakpoint")) unless breakpoint
 
-      unless syntax_valid?(@match[2])
-        return errmsg(pr("break.errors.not_changed", expr: @match[2]))
-      end
+      return errmsg(pr("break.errors.not_changed", expr: @match[2])) unless syntax_valid?(@match[2])
 
       breakpoint.expr = @match[2]
     end