byebug 11.1.3 → 13.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 756ca67151133e7afeea4be781e49bb948a7b8dc7b2ece045a29e6c549409abc
-  data.tar.gz: a301313d736ee29e15ec53d4e903359be8e4aa0b1bc1f6155d784937c636a0d6
+  metadata.gz: f8c848a8629ef3fc193536f1a7461445f0add1cfc2143ed53f5f93c2589241fb
+  data.tar.gz: f33dc257897c04065cf9208293ba4c8a7ae1ec809fcbfb259cbcfa3efe93388f
 SHA512:
-  metadata.gz: 03f857ddb22761e243a99660869b5c1bc4863c6c860e2827e2c6a2569009a7bba7ada3a79804ff6fadd5d556f1974feeee215c49696415733425f542fa78b52e
-  data.tar.gz: 585b54db0201a0ba6e1e23bceed21b7361064c56a1fa08d997e714d088a05e0ba74c1ffd4ed4fbcb763ad7719afb5a39118eacfad7e81c8e14fda850bc4b8265
+  metadata.gz: 9a83b9c70d31cd4b7e0647f408df9f33fedd566f00dcddc7b3943c73c10f7005292755de38daebf52348e1a0994d035ecb00b56c05f940b30e82fee7b9ab1051
+  data.tar.gz: 41356dc3dd9e2f9c3b08bcc3c56b5531de1c4b07416a71ed1d9599f78b3a5e3ab1ce8549583fbd165da72ee983eddd7ee8b5a8935eabaab4c874aa322e6e4556

data/CHANGELOG.md

@@ -2,6 +2,44 @@
 
 ## [Unreleased]
 
+## [13.0.0] - 2026-01-15
+
+### Fixed
+
+* [#924](https://github.com/deivid-rodriguez/byebug/pull/924): Use typed data APIs to fix Ruby 4.0 deprecation ([@nobu]).
+* [#876](https://github.com/deivid-rodriguez/byebug/pull/876): Add explicit require of `stringio` ([@pabloh]).
+* [#909](https://github.com/deivid-rodriguez/byebug/pull/909): Avoid loading readline at all to play nice with Ruby 4.0.
+* [#905](https://github.com/deivid-rodriguez/byebug/pull/905): Make reline an explicit dependency to fix Ruby 3.4 warnings.
+* [#824](https://github.com/deivid-rodriguez/byebug/pull/824): Improve startup by loading IRB lazily ([@pocke]).
+* [#848](https://github.com/deivid-rodriguez/byebug/pull/848): Grammar fixes in GUIDE.md ([@alexymik]).
+* [#804](https://github.com/deivid-rodriguez/byebug/pull/804): Fix typo in context.rb documentation ([@ono-max]).
+
+### Removed
+
+* Support for MRI 3.1. Byebug no longer installs on this platform.
+
+## [12.0.0] - 2025-03-25
+
+### Changed
+
+* [#690](https://github.com/deivid-rodriguez/byebug/pull/690): `break` without any arguments now sets a breakpoint on the current line, just like `gdb` ([@sergioro9]).
+
+### Fixed
+
+* [#741](https://github.com/deivid-rodriguez/byebug/pull/741): Small consistency issues in help messages.
+* [#743](https://github.com/deivid-rodriguez/byebug/pull/743): `untracevar` command crashing when giving a non existent global variable.
+* [#744](https://github.com/deivid-rodriguez/byebug/pull/744): Another punctuation tweak in `enable breakpoints` help message.
+* [#736](https://github.com/deivid-rodriguez/byebug/pull/736): Skip warning about `$SAFE` global variable on ruby 2.7 when listing global variables.
+
+### Added
+
+* [#847](https://github.com/deivid-rodriguez/byebug/pull/847) and [#850](https://github.com/deivid-rodriguez/byebug/pull/850): Support for MRI 3.1, 3.2, and 3.3 ([@marshall-lee]).
+* [#688](https://github.com/deivid-rodriguez/byebug/pull/688): `where` command now receives an optional numeric argument `<n>` to print the nth first frames ([@sergioro9].
+
+### Removed
+
+* Support for MRI 2.4, 2.5, 2.6, 2.7, and 3.0. Byebug no longer installs on this platform.
+
 ## [11.1.3] - 2020-04-23
 
 ### Fixed
@@ -821,6 +859,8 @@
 * Initial release.
 
 [Unreleased]: https://github.com/deivid-rodriguez/byebug/compare/v11.1.3...HEAD
+[13.0.0]: https://github.com/deivid-rodriguez/byebug/compare/v12.0.0...v13.0.0
+[12.0.0]: https://github.com/deivid-rodriguez/byebug/compare/v11.1.3...v12.0.0
 [11.1.3]: https://github.com/deivid-rodriguez/byebug/compare/v11.1.2...v11.1.3
 [11.1.2]: https://github.com/deivid-rodriguez/byebug/compare/v11.1.1...v11.1.2
 [11.1.1]: https://github.com/deivid-rodriguez/byebug/compare/v11.1.0...v11.1.1
@@ -903,6 +943,7 @@
 [1.0.0]: https://github.com/deivid-rodriguez/byebug/compare/v0.0.1...v1.0.0
 
 [@akaneko3]: https://github.com/akaneko3
+[@alexymik]: https://github.com/alexymik
 [@andreychernih]: https://github.com/andreychernih
 [@ark6]: https://github.com/ark6
 [@astashov]: https://github.com/astashov
@@ -919,10 +960,15 @@
 [@k0kubun]: https://github.com/k0kubun
 [@ko1]: https://github.com/ko1
 [@luislavena]: https://github.com/luislavena
+[@marshall-lee]: https://github.com/marshall-lee
 [@mrkn]: https://github.com/mrkn
 [@nobu]: https://github.com/nobu
 [@Olgagr]: https://github.com/Olgagr
+[@ono-max]: https://github.com/ono-max
+[@pabloh]: https://github.com/pabloh
+[@pocke]: https://github.com/pocke
 [@sethk]: https://github.com/sethk
+[@sergioro9]: https://github.com/sergioro9
 [@shuky19]: https://github.com/shuky19
 [@tacnoman]: https://github.com/tacnoman
 [@terceiro]: https://github.com/terceiro

data/CONTRIBUTING.md

@@ -31,15 +31,15 @@ abide by its terms.
 * Run the test suite using the default rake task (`bin/rake`). This task is
   composed of 3 subtasks: `bin/rake compile`, `bin/rake test` & `bin/rake lint`.
 * If you want to run specific tests, use the provided test runner, like so:
-  * Specific test files. For example, `bin/minitest test/commands/break_test.rb`
-  * Specific test classes. For example, `bin/minitest BreakAtLinesTest`
-  * Specific tests. For example,
-    `bin/minitest test_catch_removes_specific_catchpoint`
-  * Specific fully qualified tests. For example,
-    `bin/minitest BreakAtLinesTest#test_setting_breakpoint_sets_correct_fields`
-  * You can combine any of them and you will get the union of all filters. For
-    example: `bin/minitest BreakAtLinesTest
-    test_catch_removes_specific_catchpoint`
+   * Specific test files. For example, `bin/minitest test/commands/break_test.rb`
+   * Specific test classes. For example, `bin/minitest BreakAtLinesTest`
+   * Specific tests. For example,
+     `bin/minitest test_catch_removes_specific_catchpoint`
+   * Specific fully qualified tests. For example,
+     `bin/minitest BreakAtLinesTest#test_setting_breakpoint_sets_correct_fields`
+   * You can combine any of them and you will get the union of all filters. For
+     example: `bin/minitest BreakAtLinesTest
+     test_catch_removes_specific_catchpoint`
 
 ## Code style
 

data/GUIDE.md

@@ -26,7 +26,7 @@ puts t
 
 Let's debug it.
 
-```bash
+```console
 $ byebug /path/to/triangle.rb
 
 [1, 10] in /path/to/triangle.rb
@@ -62,7 +62,7 @@ accordingly so that only actual real lines of code are displayed.
 
 Now let us step through the program.
 
-```bash
+```console
 (byebug) step
 
 [5, 14] in /path/to/triangle.rb
@@ -118,7 +118,7 @@ previously. However after issuing another `step` command we see that the value
 is 0 as expected. If every time we stop we want to see the value of `tri` to see
 how things are going, there is a better way by setting a display expression:
 
-```bash
+```console
 (byebug) display tri
 1: tri = 0
 ```
@@ -127,7 +127,7 @@ Now let us run the program until right before we return from the function. We'll
 want to see which lines get run, so we turn on _line tracing_. If we don't want
 whole paths to be displayed when tracing, we can turn on _basename_.
 
-```bash
+```console
 (byebug) set linetrace
 linetrace is on
 (byebug) set basename
@@ -207,7 +207,7 @@ Recall in the first section it was stated that before the `def` is run, the
 method it names is undefined. Let's check that out. First let's see what
 private methods we can call before running `def hanoi`.
 
-```bash
+```console
 $ byebug path/to/hanoi.rb
 
     1: #
@@ -317,7 +317,7 @@ is stopped.
 
 Now let's see what happens after stepping:
 
-```bash
+```console
 (byebug) step
 
 [5, 14] in /path/to/hanoi.rb
@@ -338,7 +338,7 @@ true
 
 Okay, lets go on and talk about program arguments.
 
-```bash
+```console
 (byebug) $ARGV
 []
 ```
@@ -346,7 +346,7 @@ Okay, lets go on and talk about program arguments.
 Oops. We forgot to specify any parameters to this program. Let's try again. We
 can use the `restart` command here.
 
-```bash
+```console
 (byebug) restart 3
 Re exec'ing:
   /path/to/exe/byebug /path/to/hanoi.rb 3
@@ -445,7 +445,7 @@ trace (see [callstyle]()).
 
 Now let's move around the callstack.
 
-```bash
+```console
 (byebug) undisplay
 Clear all expressions? (y/n) y
 (byebug) n_args
@@ -554,7 +554,7 @@ def test_basic
 
 Now we run the program, requiring `byebug`
 
-```bash
+```console
 $ ruby -rbyebug test_triangle.rb
 Run options: --seed 31679
 
@@ -579,7 +579,7 @@ list `solutions`.
 
 Now let's see where we are...
 
-```bash
+```console
 (byebug) set nofullpath
 Displaying frame's full file names is off.
 (byebug) bt
@@ -671,7 +671,7 @@ SievePrime.new.next_prime do |prime|
 end
 ```
 
-```bash
+```console
 $ byebug primes.rb
 [1, 10] in /path/to/primes.rb
     1: #
@@ -874,7 +874,7 @@ We instantiate a new company with an initial task and after running that
 company we expect the result to be printed in the screen, but it is not.  Lets
 debug our sample program:
 
-```bash
+```console
 [1, 10] in /path/to/company.rb
 =>  1: class Company
     2:   def initialize(task)
@@ -926,7 +926,7 @@ can then check that the threads are there using the `thread list` command. Now
 we want to debug both of this threads to check what's happening and look for the
 bug.
 
-```bash
+```console
 (byebug) th switch 3
 
 [5, 14] in /path/to/company.rb
@@ -961,7 +961,7 @@ and don't want the program to finish while we are debugging. Notice that stopped
 threads are marked with the "$" symbol whereas the current thread is marked with
 the "+" symbol.
 
-```bash
+```console
 (byebug) s
 
 [17, 26] in /path/to/company.rb
@@ -1061,7 +1061,7 @@ Everything seems fine in this thread. The first iteration the employee will do
 his job, and after that it will just check for new tasks and sleep. Let's debug
 the manager task now:
 
-```bash
+```console
 (byebug) th resume 2
   2 #<Thread:0x000000019892d8@/path/to/company.rb:12 run> /path/to/company.rb:12
 (byebug) th switch 2
@@ -1088,7 +1088,7 @@ run a sleeping thread.
 
 Now we can investigate the problem in the employer's side:
 
-```bash
+```console
 (byebug) s
 [30, 39] in /path/to/company.rb
    30:
@@ -1173,7 +1173,7 @@ If you don't need to pass dash options to your program, which might be confused
 with byebug options, then you don't need to add the `--`. To get a brief list of
 options and descriptions, use the `--help` option.
 
-```bash
+```console
 $ byebug --help
 
   byebug 3.5.1
@@ -1181,7 +1181,7 @@ $ byebug --help
   Usage: byebug [options] <script.rb> -- <script.rb parameters>
 
     -d, --debug               Set $DEBUG=true
-    -I, --include list        Add to paths to $LOAD_PATH
+    -I, --include list        Add paths to $LOAD_PATH
     -m, --[no-]post-mortem    Use post-mortem mode
     -q, --[no-]quit           Quit when script finishes
     -x, --[no-]rc             Run byebug initialization file
@@ -1241,7 +1241,7 @@ Turns on line tracing. Running `byebug --trace <rubyscript>.rb` is pretty much
 like running `ruby -rtracer <rubyscript>.rb`. If all you want to do however is
 get a line trace, `tracer` is most likely faster than `byebug`.
 
-```bash
+```console
 $ time byebug --trace --no-stop hanoi.rb > /dev/null
 
 real 0m0.743s
@@ -1354,9 +1354,9 @@ program that you want to debug (In Rails, the
 `config/environments/development.rb` could be a good candidate).
 
 ```ruby
-  require "byebug/core"
-  Byebug.wait_connection = true
-  Byebug.start_server("localhost", <port>)
+require "byebug/core"
+Byebug.wait_connection = true
+Byebug.start_server("localhost", <port>)
 ```
 
 Once this piece gets executed, you can connect to the remote debugger from your
@@ -1366,9 +1366,9 @@ Next, at a place of program execution which gets run just before the code you
 want to debug, add a call to `byebug` as was done without remote execution:
 
 ```ruby
-   # work, work, work...
-   byebug
-   some ruby code  # byebug will stop before this line is run
+# work, work, work...
+byebug
+some ruby code  # byebug will stop before this line is run
 ```
 
 ## Byebug Command Reference
@@ -1388,7 +1388,7 @@ with a backslash.
 For example, you might want to enter the following code to compute the 5th
 Fibonacci number.
 
-```bash
+```console
 (byebug) fib1=0; fib2=1; 5.times {|temp| temp=fib1; fib1=fib2; fib2 += temp }
 0
 1
@@ -1438,7 +1438,7 @@ Once inside `byebug` you can always ask it for information on its commands using
 the `help` command. You can use `help` (abbreviated `h`) with no arguments to
 display a short list of named classes of commands
 
-```bash
+```console
 (byebug) help
 
   break      -- Sets breakpoints in the source code
@@ -1455,7 +1455,7 @@ display a short list of named classes of commands
   frame      -- Moves to a frame in the call stack
   help       -- Helps you using byebug
   history    -- Shows byebug's history of commands
-  info       -- Shows several informations about the program being debugged
+  info       -- Shows information about the program being debugged
   interrupt  -- Interrupts the program
   irb        -- Starts an IRB session
   kill       -- Sends a signal to the current process
@@ -1483,7 +1483,7 @@ display a short list of named classes of commands
 
 With a command name, `help` displays information on how to use the command.
 
-```bash
+```console
 (byebug) help list
 
   l[ist][[-=]][ nn-mm]
@@ -1511,7 +1511,7 @@ as `help info breakpoints`.
 
 Some examples follow.
 
-```bash
+```console
 (byebug) help info
 info[ subcommand]
 
@@ -1530,14 +1530,14 @@ info line        -- Line number and filename of current position in source file
 info program     -- Execution status of the program
 ```
 
-```bash
+```console
 (byebug) help info breakpoints
 Status of user-settable breakpoints.
 Without argument, list info about all breakpoints.
 With an integer argument, list info on that breakpoint.
 ```
 
-```bash
+```console
 (byebug) help info b
 Status of user-settable breakpoints.
 Without argument, list info about all breakpoints.
@@ -1582,7 +1582,7 @@ printed if line tracing is enabled. Each expression added to the list is given a
 number to identify it; to remove an expression from the list, you specify that
 number. The automatic display looks like this:
 
-```bash
+```console
 (byebug) display n
 1: n = 3
 ```
@@ -1591,7 +1591,7 @@ This display shows item numbers, expressions and their current values. If the
 expression is undefined or illegal the expression will be printed but no value
 will appear.
 
-```bash
+```console
 (byebug) display undefined_variable
 2: undefined_variable =
 (byebug) display 1/0
@@ -1631,7 +1631,7 @@ program. If you issue a `list` without location information, the default
 location used is the current line rather than the current position that may have
 got updated via a prior `list` command.
 
-```
+```console
 $ byebug triangle.rb
 [1, 10] in /path/to/triangle.rb
     1: # Compute the n'th triangle number, the hard way: triangle(n) == (n*(n+1))/2
@@ -1712,7 +1712,7 @@ You can customize `byebug` to use any editor you want by using the `EDITOR`
 environment variable. The only restriction is that your editor (say `ex`) recognizes
 the following command-line syntax:
 
-```
+```bash
 ex +nnn file
 ```
 
@@ -1784,7 +1784,7 @@ One such method is `each`. They are marked differently in the call stack to
 indicate that we cannot switch to those frames. This is because they have no
 source code in Ruby, so we can not debug them using Byebug.
 
-```bash
+```console
 (byebug) where
 --> #0 Object.gcd(a#Fixnum, b#Fixnum) at line gcd.rb:6
     #1 at line gcd.rb:19

data/README.md

@@ -41,9 +41,7 @@ more][Tidelift for enterprise].
 
 ## Requirements
 
-* _Required_: MRI 2.4.0 or higher.
-* _Recommended_: MRI 2.6.4 or higher (MRI 2.6.0 to 2.6.3 contain a regression
-  causing unbalanced call/return events in some cases, breaking the `next` command).
+* _Required_: MRI 3.2.0 or higher.
 
 ## Install
 
@@ -143,7 +141,7 @@ relying on `byebug`.
 ## Getting Started
 
 Read [byebug's markdown
-guide](https://github.com/deivid-rodriguez/byebug/blob/master/GUIDE.md) to get
+guide](https://github.com/deivid-rodriguez/byebug/blob/main/GUIDE.md) to get
 started. Proper documentation will be eventually written.
 
 ## Related projects

data/ext/byebug/breakpoint.c

@@ -21,6 +21,29 @@ eval_expression(VALUE args)
   return rb_funcall2(rb_mKernel, idEval, 2, RARRAY_PTR(args));
 }
 
+static void
+mark_breakpoint(void *data)
+{
+  breakpoint_t *breakpoint = data;
+
+  rb_gc_mark(breakpoint->source);
+  rb_gc_mark(breakpoint->expr);
+}
+
+static const rb_data_type_t breakpoint_type = {
+  "Byebug::Breakpoint",
+  {mark_breakpoint, RUBY_TYPED_DEFAULT_FREE},
+};
+
+static breakpoint_t *
+brkpt_ptr(VALUE self)
+{
+  breakpoint_t *breakpoint;
+
+  TypedData_Get_Struct(self, breakpoint_t, &breakpoint_type, breakpoint);
+  return breakpoint;
+}
+
 /*
  *  call-seq:
  *    breakpoint.enabled? -> bool
@@ -30,9 +53,8 @@ eval_expression(VALUE args)
 static VALUE
 brkpt_enabled(VALUE self)
 {
-  breakpoint_t *breakpoint;
+  breakpoint_t *breakpoint = brkpt_ptr(self);
 
-  Data_Get_Struct(self, breakpoint_t, breakpoint);
   return breakpoint->enabled;
 }
 
@@ -45,9 +67,8 @@ brkpt_enabled(VALUE self)
 static VALUE
 brkpt_set_enabled(VALUE self, VALUE enabled)
 {
-  breakpoint_t *breakpoint;
+  breakpoint_t *breakpoint = brkpt_ptr(self);
 
-  Data_Get_Struct(self, breakpoint_t, breakpoint);
   return breakpoint->enabled = enabled;
 }
 
@@ -61,9 +82,8 @@ brkpt_set_enabled(VALUE self, VALUE enabled)
 static VALUE
 brkpt_expr(VALUE self)
 {
-  breakpoint_t *breakpoint;
+  breakpoint_t *breakpoint = brkpt_ptr(self);
 
-  Data_Get_Struct(self, breakpoint_t, breakpoint);
   return breakpoint->expr;
 }
 
@@ -77,9 +97,8 @@ brkpt_expr(VALUE self)
 static VALUE
 brkpt_set_expr(VALUE self, VALUE expr)
 {
-  breakpoint_t *breakpoint;
+  breakpoint_t *breakpoint = brkpt_ptr(self);
 
-  Data_Get_Struct(self, breakpoint_t, breakpoint);
   breakpoint->expr = NIL_P(expr) ? expr : StringValue(expr);
   return expr;
 }
@@ -94,9 +113,8 @@ brkpt_set_expr(VALUE self, VALUE expr)
 static VALUE
 brkpt_hit_condition(VALUE self)
 {
-  breakpoint_t *breakpoint;
+  breakpoint_t *breakpoint = brkpt_ptr(self);
 
-  Data_Get_Struct(self, breakpoint_t, breakpoint);
   switch (breakpoint->hit_condition)
   {
     case HIT_COND_GE:
@@ -124,10 +142,15 @@ brkpt_hit_condition(VALUE self)
 static VALUE
 brkpt_set_hit_condition(VALUE self, VALUE value)
 {
-  breakpoint_t *breakpoint;
+  breakpoint_t *breakpoint = brkpt_ptr(self);
   ID id_value;
 
-  Data_Get_Struct(self, breakpoint_t, breakpoint);
+  if (NIL_P(value))
+  {
+    breakpoint->hit_condition = HIT_COND_NONE;
+    return value;
+  }
+
   id_value = rb_to_id(value);
 
   if (rb_intern("greater_or_equal") == id_value || rb_intern("ge") == id_value)
@@ -150,9 +173,8 @@ brkpt_set_hit_condition(VALUE self, VALUE value)
 static VALUE
 brkpt_hit_count(VALUE self)
 {
-  breakpoint_t *breakpoint;
+  breakpoint_t *breakpoint = brkpt_ptr(self);
 
-  Data_Get_Struct(self, breakpoint_t, breakpoint);
   return INT2FIX(breakpoint->hit_count);
 }
 
@@ -166,9 +188,8 @@ brkpt_hit_count(VALUE self)
 static VALUE
 brkpt_hit_value(VALUE self)
 {
-  breakpoint_t *breakpoint;
+  breakpoint_t *breakpoint = brkpt_ptr(self);
 
-  Data_Get_Struct(self, breakpoint_t, breakpoint);
   return INT2FIX(breakpoint->hit_value);
 }
 
@@ -182,9 +203,8 @@ brkpt_hit_value(VALUE self)
 static VALUE
 brkpt_set_hit_value(VALUE self, VALUE value)
 {
-  breakpoint_t *breakpoint;
+  breakpoint_t *breakpoint = brkpt_ptr(self);
 
-  Data_Get_Struct(self, breakpoint_t, breakpoint);
   breakpoint->hit_value = FIX2INT(value);
   return value;
 }
@@ -198,9 +218,8 @@ brkpt_set_hit_value(VALUE self, VALUE value)
 static VALUE
 brkpt_id(VALUE self)
 {
-  breakpoint_t *breakpoint;
+  breakpoint_t *breakpoint = brkpt_ptr(self);
 
-  Data_Get_Struct(self, breakpoint_t, breakpoint);
   return INT2FIX(breakpoint->id);
 }
 
@@ -214,9 +233,8 @@ brkpt_id(VALUE self)
 static VALUE
 brkpt_pos(VALUE self)
 {
-  breakpoint_t *breakpoint;
+  breakpoint_t *breakpoint = brkpt_ptr(self);
 
-  Data_Get_Struct(self, breakpoint_t, breakpoint);
   if (breakpoint->type == BP_METHOD_TYPE)
     return rb_str_new2(rb_id2name(breakpoint->pos.mid));
   else
@@ -232,33 +250,23 @@ brkpt_pos(VALUE self)
 static VALUE
 brkpt_source(VALUE self)
 {
-  breakpoint_t *breakpoint;
+  breakpoint_t *breakpoint = brkpt_ptr(self);
 
-  Data_Get_Struct(self, breakpoint_t, breakpoint);
   return breakpoint->source;
 }
 
-static void
-mark_breakpoint(breakpoint_t *breakpoint)
-{
-  rb_gc_mark(breakpoint->source);
-  rb_gc_mark(breakpoint->expr);
-}
-
 static VALUE
 brkpt_create(VALUE klass)
 {
-  breakpoint_t *breakpoint = ALLOC(breakpoint_t);
+  breakpoint_t *breakpoint;
 
-  return Data_Wrap_Struct(klass, mark_breakpoint, xfree, breakpoint);
+  return TypedData_Make_Struct(klass, breakpoint_t, &breakpoint_type, breakpoint);
 }
 
 static VALUE
 brkpt_initialize(VALUE self, VALUE source, VALUE pos, VALUE expr)
 {
-  breakpoint_t *breakpoint;
-
-  Data_Get_Struct(self, breakpoint_t, breakpoint);
+  breakpoint_t *breakpoint = brkpt_ptr(self);
 
   breakpoint->type = FIXNUM_P(pos) ? BP_POS_TYPE : BP_METHOD_TYPE;
   if (breakpoint->type == BP_POS_TYPE)
@@ -353,7 +361,7 @@ check_breakpoint_by_hit_condition(VALUE rb_breakpoint)
   if (NIL_P(rb_breakpoint))
     return 0;
 
-  Data_Get_Struct(rb_breakpoint, breakpoint_t, breakpoint);
+  breakpoint = brkpt_ptr(rb_breakpoint);
   breakpoint->hit_count++;
 
   if (Qtrue != breakpoint->enabled)
@@ -363,20 +371,17 @@ check_breakpoint_by_hit_condition(VALUE rb_breakpoint)
   {
     case HIT_COND_NONE:
       return 1;
-    case HIT_COND_GE:
-    {
+    case HIT_COND_GE: {
       if (breakpoint->hit_count >= breakpoint->hit_value)
         return 1;
       break;
     }
-    case HIT_COND_EQ:
-    {
+    case HIT_COND_EQ: {
       if (breakpoint->hit_count == breakpoint->hit_value)
         return 1;
       break;
     }
-    case HIT_COND_MOD:
-    {
+    case HIT_COND_MOD: {
       if (breakpoint->hit_count % breakpoint->hit_value == 0)
         return 1;
       break;
@@ -393,7 +398,7 @@ check_breakpoint_by_pos(VALUE rb_breakpoint, char *file, int line)
   if (NIL_P(rb_breakpoint))
     return 0;
 
-  Data_Get_Struct(rb_breakpoint, breakpoint_t, breakpoint);
+  breakpoint = brkpt_ptr(rb_breakpoint);
 
   if (Qfalse == breakpoint->enabled || breakpoint->type != BP_POS_TYPE
       || breakpoint->pos.line != line)
@@ -410,7 +415,7 @@ check_breakpoint_by_method(VALUE rb_breakpoint, VALUE klass, ID mid, VALUE self)
   if (NIL_P(rb_breakpoint))
     return 0;
 
-  Data_Get_Struct(rb_breakpoint, breakpoint_t, breakpoint);
+  breakpoint = brkpt_ptr(rb_breakpoint);
 
   if (Qfalse == breakpoint->enabled || breakpoint->type != BP_METHOD_TYPE
       || breakpoint->pos.mid != mid)
@@ -433,7 +438,7 @@ check_breakpoint_by_expr(VALUE rb_breakpoint, VALUE bind)
   if (NIL_P(rb_breakpoint))
     return 0;
 
-  Data_Get_Struct(rb_breakpoint, breakpoint_t, breakpoint);
+  breakpoint = brkpt_ptr(rb_breakpoint);
 
   if (Qfalse == breakpoint->enabled)
     return 0;