debase 0.2.2.beta9 → 0.2.2.beta10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72f6bca149dbf44230032e0bc5232ed4dfbf1790
-  data.tar.gz: 1e1d31d2b83bcbd464ea32d0ad46b1f0f5c276d3
+  metadata.gz: 79fde9e93badfd98fb0fbe1f7f625d154dc9b4f4
+  data.tar.gz: 956c8b8bf4d1d2355440bbb98f76cd3df5ba256e
 SHA512:
-  metadata.gz: ef7fbb2819851e3fc04bda8532eb07a2da3c8be2c206dfdd0d8c056f4e19e376a48842b3f35ad350b2ffedc0e9aec4ec7b621bebd0a612cd830eedda45cb2f48
-  data.tar.gz: 7ca7fe17d565d711e67b6754fc04b04174bf8bad8a86fd4a0ed9d20905c42d4655eee94d8a1893674ac8713c4f6e3deebe381e8d135be6113c6d3f3978f46d74
+  metadata.gz: be07ccaac91b1707899b07424dbf0a633c3c5ca4695d1cd424cbe17e4b65cbb826a12aee67e7a82d8d08f450a8a93d6b6c85c5a3502dd1b95932af9c76fc33e9
+  data.tar.gz: 91a164dee212080ebe56f434579a49ff07951a41633eb80cd3e83ba2d6144d83a0b117f6dcf76926a70e6825ce63c0cfab8cef689330f421e44c29eb09aa0395

data/.gitignore

@@ -2,12 +2,12 @@
 .bundle
 Gemfile.lock
 pkg/*
-ext/*.o
-ext/*.bundle
-ext/Makefile
-ext/*.log
+ext/**/*.o
+ext/**/*.bundle
+ext/**/Makefile
+ext/**/*.log
+ext/**/*.so
+ext/**/*.def
 .ruby-gemset
 .ruby-version
 .idea/*
-
-

data/ext/breakpoint.c

@@ -13,6 +13,14 @@
 static VALUE cBreakpoint;
 static int breakpoint_max;
 
+static ID idEval;
+
+static VALUE
+eval_expression(VALUE args)
+{
+  return rb_funcall2(rb_mKernel, idEval, 2, RARRAY_PTR(args));
+}
+
 extern VALUE
 catchpoint_hit_count(VALUE catchpoints, VALUE exception, VALUE *exception_name) {
   VALUE ancestors;
@@ -191,14 +199,37 @@ check_breakpoint_by_pos(VALUE breakpoint_object, char *file, int line)
     return 0;
 }
 
+static int
+check_breakpoint_expr(VALUE breakpoint_object, VALUE trace_point)
+{
+  breakpoint_t *breakpoint;
+  VALUE binding, args, result;
+  int error;
+
+  if(breakpoint_object == Qnil) return 0;
+  Data_Get_Struct(breakpoint_object, breakpoint_t, breakpoint);
+  if (Qtrue != breakpoint->enabled) return 0;
+  if (NIL_P(breakpoint->expr)) return 1;
+
+  if (NIL_P(trace_point)) {
+    binding = rb_const_get(rb_cObject, rb_intern("TOPLEVEL_BINDING"));
+  } else {
+    binding = rb_tracearg_binding(rb_tracearg_from_tracepoint(trace_point));
+  }
+
+  args = rb_ary_new3(2, breakpoint->expr, binding);
+  result = rb_protect(eval_expression, args, &error);
+  return !error && RTEST(result);
+}
+
 static VALUE
-Breakpoint_find(VALUE self, VALUE breakpoints, VALUE source, VALUE pos)
+Breakpoint_find(VALUE self, VALUE breakpoints, VALUE source, VALUE pos, VALUE trace_point)
 {
-  return breakpoint_find(breakpoints, source, pos);
+  return breakpoint_find(breakpoints, source, pos, trace_point);
 }
 
 extern VALUE
-breakpoint_find(VALUE breakpoints, VALUE source, VALUE pos)
+breakpoint_find(VALUE breakpoints, VALUE source, VALUE pos, VALUE trace_point)
 {
   VALUE breakpoint_object;
   char *file;
@@ -210,7 +241,8 @@ breakpoint_find(VALUE breakpoints, VALUE source, VALUE 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))
+    if (check_breakpoint_by_pos(breakpoint_object, file, line) &&
+      check_breakpoint_expr(breakpoint_object, trace_point))
     {
       return breakpoint_object;
     }
@@ -229,11 +261,13 @@ Init_breakpoint(VALUE mDebase)
 {
   breakpoint_init_variables();
   cBreakpoint = rb_define_class_under(mDebase, "Breakpoint", rb_cObject);
-  rb_define_singleton_method(cBreakpoint, "find", Breakpoint_find, 3);
+  rb_define_singleton_method(cBreakpoint, "find", Breakpoint_find, 4);
   rb_define_singleton_method(cBreakpoint, "remove", Breakpoint_remove, 2);
   rb_define_method(cBreakpoint, "initialize", Breakpoint_initialize, 3);
   rb_define_method(cBreakpoint, "id", Breakpoint_id, 0);
   rb_define_method(cBreakpoint, "source", Breakpoint_source, 0);
   rb_define_method(cBreakpoint, "pos", Breakpoint_pos, 0);
   rb_define_alloc_func(cBreakpoint, Breakpoint_create);
+
+  idEval = rb_intern("eval");
 }

data/ext/debase_internals.c

@@ -371,7 +371,7 @@ process_line_event(VALUE trace_point, void *data)
       context->stop_frame = -1;
     }
 
-    breakpoint = breakpoint_find(breakpoints, path, lineno);
+    breakpoint = breakpoint_find(breakpoints, path, lineno, trace_point);
     if (context->stop_next == 0 || context->stop_line == 0 || breakpoint != Qnil) {
       rb_ensure(start_inspector, context_object, stop_inspector, Qnil);
       context->stop_reason = CTX_STOP_STEP;

data/ext/debase_internals.h

@@ -103,7 +103,7 @@ typedef struct
 } breakpoint_t;
 
 extern VALUE catchpoint_hit_count(VALUE catchpoints, VALUE exception, VALUE *exception_name);
-extern VALUE breakpoint_find(VALUE breakpoints, VALUE source, VALUE pos);
+extern VALUE breakpoint_find(VALUE breakpoints, VALUE source, VALUE pos, VALUE trace_point);
 extern void Init_breakpoint(VALUE mDebase);
 
 extern void breakpoint_init_variables();

data/lib/debase/version.rb

@@ -1,3 +1,3 @@
 module Debase
-  VERSION = "0.2.2.beta9" unless defined? VERSION
+  VERSION = "0.2.2.beta10" unless defined? VERSION
 end

data/test/test_breakpoints.rb

@@ -6,9 +6,29 @@ class TestBreakpoints < Test::Unit::TestCase
   def test_find
     Debugger.start
     Debugger.add_breakpoint("foo.rb", 11, nil)
-    assert_not_nil(Debugger::Breakpoint.find(Debugger.breakpoints, "foo.rb", 11))
-    assert_nil(Debugger::Breakpoint.find(Debugger.breakpoints, "bar.rb", 11))
-    assert_nil(Debugger::Breakpoint.find(Debugger.breakpoints, "foo.rb", 10))
+    assert_not_nil(Debugger::Breakpoint.find(Debugger.breakpoints, "foo.rb", 11, nil))
+    assert_nil(Debugger::Breakpoint.find(Debugger.breakpoints, "bar.rb", 11, nil))
+    assert_nil(Debugger::Breakpoint.find(Debugger.breakpoints, "foo.rb", 10, nil))
+  end
+
+  def test_conditional_true_expression
+    Debugger.start
+    Debugger.add_breakpoint("foo.rb", 11, "[1, 2, 3].length == 3")
+    assert_not_nil(Debugger::Breakpoint.find(Debugger.breakpoints, "foo.rb", 11, nil))
+    Debugger.stop
+  end
+
+  def test_conditional_false_expression
+    Debugger.start
+    Debugger.add_breakpoint("foo.rb", 11, "(2 + 2) == 5")
+    assert_nil(Debugger::Breakpoint.find(Debugger.breakpoints, "foo.rb", 11, nil))
+    Debugger.stop
+  end
+
+  def test_conditional_undefined_variable
+    Debugger.start
+    Debugger.add_breakpoint("foo.rb", 11, "this_variable_does_not_exist")
+    assert_nil(Debugger::Breakpoint.find(Debugger.breakpoints, "foo.rb", 11, nil))
     Debugger.stop
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: debase
 version: !ruby/object:Gem::Version
-  version: 0.2.2.beta9
+  version: 0.2.2.beta10
 platform: ruby
 authors:
 - Dennis Ushakov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-10 00:00:00.000000000 Z
+date: 2017-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase-ruby_core_source
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: debase
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: debase is a fast implementation of the standard Ruby debugger debug.rb for
@@ -165,4 +165,3 @@ test_files:
 - test/test_catchpoint.rb
 - test/test_load.rb
 - test/test_reload_bug.rb
-has_rdoc: