byebug 3.5.1 → 4.0.0

data/Gemfile

@@ -2,16 +2,14 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'rake', '~> 10.3'
+gem 'rake', '~> 10.4'
 
-group :development do
-  gem 'rake-compiler', '~> 0.9'
-  gem 'rubocop', '~> 0.25'
-end
-
-group :test do
+group :development, :test do
+  gem 'rake-compiler', '0.9.5'
+  gem 'rubocop', '0.29.1'
   gem 'mocha', '~> 1.1'
-  gem 'minitest', '~> 5.4'
-  gem 'simplecov', '~> 0.9', require: false
-  gem 'codeclimate-test-reporter', '~> 0.4', require: false
+  gem 'minitest', '~> 5.5'
+  gem 'simplecov', '0.9.2', require: false
+  gem 'codeclimate-test-reporter', '0.4.7', require: false
+  gem 'pry', '0.10.1', require: false
 end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) David Rodríguez <deivid.rodriguez@gmail.com>
+Copyright (c) David Rodríguez <deivid.rodriguez@gmail.com>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/README.md

@@ -1,10 +1,22 @@
 # Byebug
-[![Version][VersionBadge]][VersionURL]
-[![Build][TravisBadge]][TravisURL]
-[![Climate][CodeClimateBadge]][CodeClimateURL]
-[![Dependencies][GemnasiumBadge]][GemnasiumURL]
-[![Coverage][CoverageBadge]][CoverageURL]
-[![Gittip][GittipBadge]][GittipURL]
+
+[![Ver][gem]][gem_url]
+[![Gpa][gpa]][gpa_url]
+[![Dep][dep]][dep_url]
+[![Cov][cov]][cov_url]
+[![Git][tip]][tip_url]
+
+[gem]: https://img.shields.io/gem/v/byebug.svg
+[gpa]: https://img.shields.io/codeclimate/github/deivid-rodriguez/byebug.svg
+[dep]: https://img.shields.io/gemnasium/deivid-rodriguez/byebug.svg
+[cov]: https://img.shields.io/codeclimate/coverage/github/deivid-rodriguez/byebug.svg
+[tip]: https://img.shields.io/gittip/deivid-rodriguez.svg
+
+[gem_url]: https://rubygems.org/gems/byebug
+[gpa_url]: https://codeclimate.com/github/deivid-rodriguez/byebug
+[dep_url]: https://gemnasium.com/deivid-rodriguez/byebug
+[cov_url]: https://codeclimate.com/github/deivid-rodriguez/byebug
+[tip_url]: https://www.gittip.com/deivid-rodriguez
 
 _Debugging in Ruby 2_
 
@@ -25,19 +37,28 @@ that.
 different lines executed by your program.
 
 
-## Ruby Version Support
+## Build Status
+
+Linux & OSX [![Tra][tra]][tra_url]
+
+Windows [![Vey][vey]][vey_url]
+
+[tra]: https://img.shields.io/travis/deivid-rodriguez/byebug.svg?branch=master
+[vey]: https://ci.appveyor.com/api/projects/status/github/deivid-rodriguez/byebug?svg=true
 
-Byebug works only for Ruby 2.0.0 or newer. For debugging ruby 1.9.3 or older,
-use [debugger][].
+[tra_url]: https://travis-ci.org/deivid-rodriguez/byebug
+[vey_url]: https://ci.appveyor.com/project/deivid-rodriguez/byebug
 
-Furthermore, Byebug uses the TracePoint API which was just first developed for
-Ruby 2.0.0. Since it was released, a lot of bugs directly impacting Byebug have
-been corrected, so for the best debugging experience, the following Ruby
-versions are recommended:
 
-* Ruby 2.0.0-p576 or higher.
-* Ruby 2.1.3 or higher.
-* Ruby 2.2.0-preview1 or higher.
+## Requirements
+
+* Required: MRI 2.0.0 or higher. For debugging ruby 1.9.3 or older, use
+[debugger][].
+
+* Recommended:
+  - MRI 2.0.0-p576 or higher.
+  - MRI 2.1.3 or higher.
+  - MRI 2.2.1 or higher.
 
 
 ## Install
@@ -55,15 +76,6 @@ wherever you want to start debugging and the execution will stop there. If you
 are debugging rails, start the server and once the execution gets to your
 `byebug` command you will get a debugging prompt.
 
-Former [debugger][] or [ruby-debug][] users, notice:
-
-* Some gems (rails, rspec) implement debugging flags (-d, --debugger) that early
-require and start the debugger. These flags are a performance penalty and byebug
-doesn't need them anymore so my recommendation is not to use them. In any case,
-both rails and rspec have deprecated these flags in their latest versions.  
-* The startup configuration file is now called `.byebugrc` instead of
-`.rdebugrc`.
-
 
 ## Byebug's commands
 
@@ -80,6 +92,7 @@ both rails and rspec have deprecated these flags in their latest versions.
     `down`      |              |
     `edit`      |              |
     `enable`    |              | `breakpoints` `display`
+    `eval`      |              |
     `finish`    |              |
     `frame`     |              |
     `help`      |              |
@@ -90,25 +103,22 @@ both rails and rspec have deprecated these flags in their latest versions.
     `list`      |              |
     `method`    |              | `instance`
     `next`      |              |
-    `p`         | `eval`       |
     `pp`        |              |
     `pry`       |              |
     `ps`        |              |
     `putl`      |              |
     `quit`      | `exit`       |
-    `reload`    |              |
     `restart`   |              |
     `save`      |              |
-    `set`       |              | `autoeval` `autoirb` `autolist` `autoreload` `autosave` `basename` `callstyle` `forcestep` `fullpath` `histfile` `histsize` `linetrace` `tracing_plus` `listsize` `post_mortem` `stack_on_error` `testing` `verbose` `width`
-    `show`      |              | `autoeval` `autoirb` `autolist` `autoreload` `autosave` `basename` `callstyle` `forcestep` `fullpath` `histfile` `histsize` `linetrace` `tracing_plus` `listsize` `post_mortem` `stack_on_error` `testing` `verbose` `width`
-    `skip`      |              |
+    `set`       |              | `autoeval` `autoirb` `autolist` `autosave` `basename` `callstyle` `fullpath` `histfile` `histsize` `linetrace` `listsize` `post_mortem` `stack_on_error` `verbose` `width`
+    `show`      |              | `autoeval` `autoirb` `autolist` `autosave` `basename` `callstyle` `fullpath` `histfile` `histsize` `linetrace` `listsize` `post_mortem` `stack_on_error` `verbose` `width`
     `source`    |              |
     `step`      |              |
     `thread`    |              | `current` `list` `resume` `stop` `switch`
     `tracevar`  |              |
     `undisplay` |              |
     `up`        |              |
-    `var`       |              | `all` `class` `constant` `global` `instance` `local`
+    `var`       |              | `all` `constant` `global` `instance` `local`
 
 
 ## Semantic Versioning
@@ -152,22 +162,8 @@ software, specially:
 * @kevjames3 for testing, bug reports and the interest in the project.
 * @FooBarWidget for working and helping with remote debugging.
 
-[VersionBadge]: https://badge.fury.io/rb/byebug.svg
-[VersionURL]: http://badge.fury.io/rb/byebug
-[TravisBadge]: https://travis-ci.org/deivid-rodriguez/byebug.svg
-[TravisURL]: http://travis-ci.org/deivid-rodriguez/byebug
-[CodeClimateBadge]: https://img.shields.io/codeclimate/github/deivid-rodriguez/byebug.svg
-[CodeClimateURL]: https://codeclimate.com/github/deivid-rodriguez/byebug
-[GemnasiumBadge]: https://gemnasium.com/deivid-rodriguez/byebug.svg
-[GemnasiumURL]: https://gemnasium.com/deivid-rodriguez/byebug
-[CoverageBadge]: https://codeclimate.com/github/deivid-rodriguez/byebug/badges/coverage.svg
-[CoverageURL]: https://codeclimate.com/github/deivid-rodriguez/byebug
-[GittipBadge]: http://img.shields.io/gittip/deivid-rodriguez.svg
-[GittipURL]: https://www.gittip.com/deivid-rodriguez
-
 [debugger]: https://github.com/cldwalker/debugger
 [pry]: https://github.com/pry/pry
-[ruby-debug]: https://github.com/mark-moseley/ruby-debug
 [debase]: https://github.com/denofevil/debase
 [pry-byebug]: https://github.com/deivid-rodriguez/pry-byebug
 [ruby-debug-passenger]: https://github.com/davejamesmiller/ruby-debug-passenger

data/Rakefile

@@ -1,41 +1,43 @@
-require 'rake/testtask'
-require 'rake/extensiontask'
+#
+# For the `rake release` task
+#
 require 'bundler/gem_tasks'
 
-Rake::ExtensionTask.new('byebug') do |ext|
-  ext.lib_dir = 'lib/byebug'
-end
+#
+# Prepend DevKit into compilation phase
+#
+task compile: :devkit if RUBY_PLATFORM =~ /mingw/
 
-module Rake
-  #
-  # Overrides default rake tests loader
-  #
-  class TestTask
-    def rake_loader
-      'test/test_helper.rb'
-    end
-  end
+require 'rake/extensiontask'
+
+spec = Gem::Specification.load('byebug.gemspec')
+Rake::ExtensionTask.new('byebug', spec) do |ext|
+  ext.lib_dir = 'lib/byebug'
 end
 
 desc 'Run the test suite'
 task :test do
-  Rake::TestTask.new do |t|
-    t.verbose = true
-    t.warning = true
-    t.pattern = 'test/**/*_test.rb'
+  files = Dir.glob('test/**/*_test.rb').join(' ')
+  system("ruby -w -Ilib test/test_helper.rb #{files}") || exit(false)
+end
+
+desc 'Activates DevKit'
+task :devkit do
+  begin
+    require 'devkit'
+  rescue LoadError
+    abort "Failed to activate RubyInstaller's DevKit required for compilation."
   end
 end
 
-task default: :test
+require 'rubocop/rake_task'
 
-desc 'Run a test in looped mode so that you can look for memory leaks'
-task 'test_loop' do
-  code = %(loop{ require '#{$ARGV[1]}' })
-  cmd = %(ruby -Itest -e "#{ code }")
-  system cmd
+desc 'Run RuboCop'
+task :rubocop do
+  RuboCop::RakeTask.new
 end
 
-desc 'Watch memory use of a looping test'
-task 'test_loop_mem' do
-  system "watch \"ps aux | grep -v 'sh -c r' | grep [I]test\""
-end
+require_relative 'tasks/ccop.rb'
+require_relative 'tasks/dev_utils.rb'
+
+task default: [:compile, :test, :rubocop, :ccop]

data/byebug.gemspec

@@ -1,13 +1,13 @@
 require File.dirname(__FILE__) + '/lib/byebug/version'
 
 Gem::Specification.new do |s|
-  s.name        = 'byebug'
-  s.version     = Byebug::VERSION
-  s.authors     = ['David Rodriguez', 'Kent Sibilev', 'Mark Moseley']
-  s.email       = 'deivid.rodriguez@mail.com'
-  s.license     = 'BSD'
-  s.homepage    = 'http://github.com/deivid-rodriguez/byebug'
-  s.summary     = 'Ruby 2.0 fast debugger - base + CLI'
+  s.name = 'byebug'
+  s.version = Byebug::VERSION
+  s.authors = ['David Rodriguez', 'Kent Sibilev', 'Mark Moseley']
+  s.email = 'deivid.rodriguez@mail.com'
+  s.license = 'BSD'
+  s.homepage = 'http://github.com/deivid-rodriguez/byebug'
+  s.summary = 'Ruby 2.0 fast debugger - base + CLI'
   s.description = "Byebug is a Ruby 2 debugger. It's implemented using the
     Ruby 2 TracePoint C API for execution control and the Debug Inspector C API
     for call stack navigation.  The core component provides support that
@@ -15,17 +15,17 @@ Gem::Specification.new do |s|
     stack frames among other things and it comes with an easy to use command
     line interface."
 
-  s.required_ruby_version     = '>= 2.0.0'
+  s.required_ruby_version = '>= 2.0.0'
 
-  s.files            = `git ls-files`.split("\n")
-  s.test_files       = `git ls-files -- test/*`.split("\n")
-  s.bindir           = 'bin'
-  s.executables      = ['byebug']
-  s.extra_rdoc_files = %w(README.md GUIDE.md)
-  s.extensions       = ['ext/byebug/extconf.rb']
-  s.require_path     = 'lib'
+  s.files = Dir['lib/**/*.rb', 'ext/**/*.[ch]', '.gitignore', 'LICENSE']
+  s.files += %w(.rubocop.yml .travis.yml byebug.gemspec Gemfile Rakefile)
+  s.bindir = 'bin'
+  s.executables = ['byebug']
+  s.extra_rdoc_files = %w(CHANGELOG.md CONTRIBUTING.md README.md GUIDE.md)
+  s.extensions = ['ext/byebug/extconf.rb']
+  s.require_path = 'lib'
 
-  s.add_dependency 'columnize', '~> 0.8'
-  s.add_dependency 'slop', '~> 3.6'
-  s.add_dependency 'debugger-linecache', '~> 1.2'
+  s.add_dependency 'columnize', '0.9.0'
+
+  s.add_development_dependency 'bundler', '~> 1.7'
 end

data/ext/byebug/breakpoint.c

@@ -45,10 +45,10 @@ brkpt_enabled(VALUE self)
 static VALUE
 brkpt_set_enabled(VALUE self, VALUE bool)
 {
-    breakpoint_t *breakpoint;
+  breakpoint_t *breakpoint;
 
-    Data_Get_Struct(self, breakpoint_t, breakpoint);
-    return breakpoint->enabled = bool;
+  Data_Get_Struct(self, breakpoint_t, breakpoint);
+  return breakpoint->enabled = bool;
 }
 
 /*
@@ -80,7 +80,7 @@ brkpt_set_expr(VALUE self, VALUE expr)
   breakpoint_t *breakpoint;
 
   Data_Get_Struct(self, breakpoint_t, breakpoint);
-  breakpoint->expr = NIL_P(expr) ? expr: StringValue(expr);
+  breakpoint->expr = NIL_P(expr) ? expr : StringValue(expr);
   return expr;
 }
 
@@ -97,7 +97,7 @@ brkpt_hit_condition(VALUE self)
   breakpoint_t *breakpoint;
 
   Data_Get_Struct(self, breakpoint_t, breakpoint);
-  switch(breakpoint->hit_condition)
+  switch (breakpoint->hit_condition)
   {
     case HIT_COND_GE:
       return ID2SYM(rb_intern("greater_or_equal"));
@@ -130,11 +130,11 @@ brkpt_set_hit_condition(VALUE self, VALUE value)
   Data_Get_Struct(self, breakpoint_t, breakpoint);
   id_value = rb_to_id(value);
 
-  if(rb_intern("greater_or_equal") == id_value || rb_intern("ge") == id_value)
+  if (rb_intern("greater_or_equal") == id_value || rb_intern("ge") == id_value)
     breakpoint->hit_condition = HIT_COND_GE;
-  else if(rb_intern("equal") == id_value || rb_intern("eq") == id_value)
+  else if (rb_intern("equal") == id_value || rb_intern("eq") == id_value)
     breakpoint->hit_condition = HIT_COND_EQ;
-  else if(rb_intern("modulo") == id_value || rb_intern("mod") == id_value)
+  else if (rb_intern("modulo") == id_value || rb_intern("mod") == id_value)
     breakpoint->hit_condition = HIT_COND_MOD;
   else
     rb_raise(rb_eArgError, "Invalid condition parameter");
@@ -166,10 +166,10 @@ brkpt_hit_count(VALUE self)
 static VALUE
 brkpt_hit_value(VALUE self)
 {
-    breakpoint_t *breakpoint;
+  breakpoint_t *breakpoint;
 
-    Data_Get_Struct(self, breakpoint_t, breakpoint);
-    return INT2FIX(breakpoint->hit_value);
+  Data_Get_Struct(self, breakpoint_t, breakpoint);
+  return INT2FIX(breakpoint->hit_value);
 }
 
 /*
@@ -182,11 +182,11 @@ brkpt_hit_value(VALUE self)
 static VALUE
 brkpt_set_hit_value(VALUE self, VALUE value)
 {
-    breakpoint_t *breakpoint;
+  breakpoint_t *breakpoint;
 
-    Data_Get_Struct(self, breakpoint_t, breakpoint);
-    breakpoint->hit_value = FIX2INT(value);
-    return value;
+  Data_Get_Struct(self, breakpoint_t, breakpoint);
+  breakpoint->hit_value = FIX2INT(value);
+  return value;
 }
 
 /*
@@ -239,7 +239,7 @@ brkpt_source(VALUE self)
 }
 
 static void
-mark_breakpoint(breakpoint_t *breakpoint)
+mark_breakpoint(breakpoint_t * breakpoint)
 {
   rb_gc_mark(breakpoint->source);
   rb_gc_mark(breakpoint->expr);
@@ -261,10 +261,10 @@ brkpt_initialize(VALUE self, VALUE source, VALUE pos, VALUE expr)
   Data_Get_Struct(self, breakpoint_t, breakpoint);
 
   breakpoint->type = FIXNUM_P(pos) ? BP_POS_TYPE : BP_METHOD_TYPE;
-  if(breakpoint->type == BP_POS_TYPE)
-      breakpoint->pos.line = FIX2INT(pos);
+  if (breakpoint->type == BP_POS_TYPE)
+    breakpoint->pos.line = FIX2INT(pos);
   else
-      breakpoint->pos.mid = SYM2ID(pos);
+    breakpoint->pos.mid = SYM2ID(pos);
 
   breakpoint->id = ++breakpoint_max;
   breakpoint->source = StringValue(source);
@@ -282,7 +282,7 @@ filename_cmp_impl(VALUE source, char *file)
 {
   char *source_ptr, *file_ptr;
   long s_len, f_len, min_len;
-  long s,f;
+  long s, f;
   int dirsep_flag = 0;
 
   s_len = RSTRING_LEN(source);
@@ -290,19 +290,20 @@ filename_cmp_impl(VALUE source, char *file)
   min_len = s_len < f_len ? s_len : f_len;
 
   source_ptr = RSTRING_PTR(source);
-  file_ptr   = file;
+  file_ptr = file;
 
-  for( s = s_len - 1, f = f_len - 1; s >= s_len - min_len && f >= f_len - min_len; s--, f-- )
+  for (s = s_len - 1, f = f_len - 1;
+       s >= s_len - min_len && f >= f_len - min_len; s--, f--)
   {
-    if((source_ptr[s] == '.' || file_ptr[f] == '.') && dirsep_flag)
+    if ((source_ptr[s] == '.' || file_ptr[f] == '.') && dirsep_flag)
       return 1;
-    if(isdirsep(source_ptr[s]) && isdirsep(file_ptr[f]))
+    if (isdirsep(source_ptr[s]) && isdirsep(file_ptr[f]))
       dirsep_flag = 1;
 #ifdef DOSISH_DRIVE_LETTER
     else if (s == 0)
-      return(toupper(source_ptr[s]) == toupper(file_ptr[f]));
+      return (toupper(source_ptr[s]) == toupper(file_ptr[f]));
 #endif
-    else if(source_ptr[s] != file_ptr[f])
+    else if (source_ptr[s] != file_ptr[f])
       return 0;
   }
   return 1;
@@ -316,11 +317,13 @@ filename_cmp(VALUE source, char *file)
 #else
 #ifdef PATH_MAX
   char path[PATH_MAX + 1];
+
   path[PATH_MAX] = 0;
   return filename_cmp_impl(source, realpath(file, path) != NULL ? path : file);
 #else
   char *path;
   int result;
+
   path = realpath(file, NULL);
   result = filename_cmp_impl(source, path == NULL ? file : path);
   free(path);
@@ -329,15 +332,28 @@ filename_cmp(VALUE source, char *file)
 #endif
 }
 
+int
+classname_cmp(VALUE name, VALUE klass)
+{
+  VALUE mod_name;
+  VALUE class_name = NIL_P(name) ? rb_str_new2("main") : name;
+
+  if (NIL_P(klass))
+    return 0;
+
+  mod_name = rb_mod_name(klass);
+  return (mod_name != Qnil && rb_str_cmp(class_name, mod_name) == 0);
+}
+
 static int
-check_breakpoint_by_hit_condition(VALUE breakpoint_object)
+check_breakpoint_by_hit_condition(VALUE rb_breakpoint)
 {
   breakpoint_t *breakpoint;
 
-  if (breakpoint_object == Qnil)
+  if (NIL_P(rb_breakpoint))
     return 0;
 
-  Data_Get_Struct(breakpoint_object, breakpoint_t, breakpoint);
+  Data_Get_Struct(rb_breakpoint, breakpoint_t, breakpoint);
   breakpoint->hit_count++;
 
   if (Qtrue != breakpoint->enabled)
@@ -370,74 +386,71 @@ check_breakpoint_by_hit_condition(VALUE breakpoint_object)
 }
 
 static int
-check_breakpoint_by_pos(VALUE breakpoint_object, char *file, int line)
+check_breakpoint_by_pos(VALUE rb_breakpoint, char *file, int line)
 {
   breakpoint_t *breakpoint;
 
-  if (breakpoint_object == Qnil)
+  if (NIL_P(rb_breakpoint))
     return 0;
 
-  Data_Get_Struct(breakpoint_object, breakpoint_t, breakpoint);
+  Data_Get_Struct(rb_breakpoint, breakpoint_t, breakpoint);
 
-  if ( (Qtrue != breakpoint->enabled)    ||
-       (breakpoint->type != BP_POS_TYPE) ||
-       (breakpoint->pos.line != line) )
+  if (Qfalse == breakpoint->enabled || breakpoint->type != BP_POS_TYPE
+      || breakpoint->pos.line != line)
     return 0;
 
   return filename_cmp(breakpoint->source, file);
 }
 
 static int
-check_breakpoint_by_method(VALUE breakpoint_object, VALUE klass, ID mid,
-                           VALUE self)
+check_breakpoint_by_method(VALUE rb_breakpoint, VALUE klass, ID mid, VALUE self)
 {
   breakpoint_t *breakpoint;
 
-  if (breakpoint_object == Qnil)
+  if (NIL_P(rb_breakpoint))
     return 0;
 
-  Data_Get_Struct(breakpoint_object, breakpoint_t, breakpoint);
+  Data_Get_Struct(rb_breakpoint, breakpoint_t, breakpoint);
 
-  if ( (Qfalse == breakpoint->enabled)      ||
-       (breakpoint->type != BP_METHOD_TYPE) ||
-       (breakpoint->pos.mid != mid) )
+  if (Qfalse == breakpoint->enabled || breakpoint->type != BP_METHOD_TYPE
+      || breakpoint->pos.mid != mid)
     return 0;
 
-  if ( (classname_cmp(breakpoint->source, klass)) ||
-       ((rb_type(self) == T_CLASS) && classname_cmp(breakpoint->source, self)) )
+  if (classname_cmp(breakpoint->source, klass)
+      || ((rb_type(self) == T_CLASS || rb_type(self) == T_MODULE)
+          && classname_cmp(breakpoint->source, self)))
     return 1;
 
   return 0;
 }
 
 static int
-check_breakpoint_by_expr(VALUE breakpoint_object, VALUE binding)
+check_breakpoint_by_expr(VALUE rb_breakpoint, VALUE bind)
 {
   breakpoint_t *breakpoint;
   VALUE args, expr_result;
 
-  if (NIL_P(breakpoint_object))
+  if (NIL_P(rb_breakpoint))
     return 0;
 
-  Data_Get_Struct(breakpoint_object, breakpoint_t, breakpoint);
+  Data_Get_Struct(rb_breakpoint, breakpoint_t, breakpoint);
 
-  if (Qtrue != breakpoint->enabled)
+  if (Qfalse == breakpoint->enabled)
     return 0;
 
   if (NIL_P(breakpoint->expr))
     return 1;
 
-  args = rb_ary_new3(2, breakpoint->expr, binding);
+  args = rb_ary_new3(2, breakpoint->expr, bind);
   expr_result = rb_protect(eval_expression, args, 0);
 
   return RTEST(expr_result);
 }
 
 extern VALUE
-find_breakpoint_by_pos(VALUE breakpoints, VALUE source, VALUE pos,
-                       VALUE binding)
+find_breakpoint_by_pos(VALUE breakpoints, VALUE source, VALUE pos, VALUE bind)
 {
-  VALUE breakpoint_object;
+  VALUE breakpoint;
   char *file;
   int line;
   int i;
@@ -446,32 +459,32 @@ find_breakpoint_by_pos(VALUE breakpoints, VALUE source, VALUE pos,
   line = FIX2INT(pos);
   for (i = 0; i < RARRAY_LENINT(breakpoints); i++)
   {
-    breakpoint_object = rb_ary_entry(breakpoints, i);
-    if (check_breakpoint_by_pos(breakpoint_object, file, line) &&
-        check_breakpoint_by_expr(breakpoint_object, binding)   &&
-        check_breakpoint_by_hit_condition(breakpoint_object))
+    breakpoint = rb_ary_entry(breakpoints, i);
+    if (check_breakpoint_by_pos(breakpoint, file, line)
+        && check_breakpoint_by_expr(breakpoint, bind)
+        && check_breakpoint_by_hit_condition(breakpoint))
     {
-      return breakpoint_object;
+      return breakpoint;
     }
   }
   return Qnil;
 }
 
 extern VALUE
-find_breakpoint_by_method(VALUE breakpoints, VALUE klass, ID mid, VALUE binding,
+find_breakpoint_by_method(VALUE breakpoints, VALUE klass, ID mid, VALUE bind,
                           VALUE self)
 {
-  VALUE breakpoint_object;
+  VALUE breakpoint;
   int i;
 
   for (i = 0; i < RARRAY_LENINT(breakpoints); i++)
   {
-    breakpoint_object = rb_ary_entry(breakpoints, i);
-    if (check_breakpoint_by_method(breakpoint_object, klass, mid, self) &&
-        check_breakpoint_by_expr(breakpoint_object, binding)            &&
-        check_breakpoint_by_hit_condition(breakpoint_object))
+    breakpoint = rb_ary_entry(breakpoints, i);
+    if (check_breakpoint_by_method(breakpoint, klass, mid, self)
+        && check_breakpoint_by_expr(breakpoint, bind)
+        && check_breakpoint_by_hit_condition(breakpoint))
     {
-      return breakpoint_object;
+      return breakpoint;
     }
   }
   return Qnil;
@@ -487,18 +500,18 @@ Init_breakpoint(VALUE mByebug)
   rb_define_alloc_func(cBreakpoint, brkpt_create);
   rb_define_method(cBreakpoint, "initialize", brkpt_initialize, 3);
 
-  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);
-  rb_define_method(cBreakpoint, "expr="         , brkpt_set_expr         , 1);
-  rb_define_method(cBreakpoint, "hit_count"     , brkpt_hit_count        , 0);
-  rb_define_method(cBreakpoint, "hit_condition" , brkpt_hit_condition    , 0);
+  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);
+  rb_define_method(cBreakpoint, "expr=", brkpt_set_expr, 1);
+  rb_define_method(cBreakpoint, "hit_count", brkpt_hit_count, 0);
+  rb_define_method(cBreakpoint, "hit_condition", brkpt_hit_condition, 0);
   rb_define_method(cBreakpoint, "hit_condition=", brkpt_set_hit_condition, 1);
-  rb_define_method(cBreakpoint, "hit_value"     , brkpt_hit_value        , 0);
-  rb_define_method(cBreakpoint, "hit_value="    , brkpt_set_hit_value    , 1);
-  rb_define_method(cBreakpoint, "id"            , brkpt_id               , 0);
-  rb_define_method(cBreakpoint, "pos"           , brkpt_pos              , 0);
-  rb_define_method(cBreakpoint, "source"        , brkpt_source           , 0);
+  rb_define_method(cBreakpoint, "hit_value", brkpt_hit_value, 0);
+  rb_define_method(cBreakpoint, "hit_value=", brkpt_set_hit_value, 1);
+  rb_define_method(cBreakpoint, "id", brkpt_id, 0);
+  rb_define_method(cBreakpoint, "pos", brkpt_pos, 0);
+  rb_define_method(cBreakpoint, "source", brkpt_source, 0);
 
   idEval = rb_intern("eval");
 }