debase 0.2.2.beta1 → 0.2.2.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a204eeb87e5c5825daab8bd4c2227232bdd3ecf
-  data.tar.gz: b1388e1f9c6e8742f77f4f2f1846fda3ead02e2a
+  metadata.gz: fa9243251fe06c4d8edb12a8d66ef5a156846577
+  data.tar.gz: 590470f369f6f81a1740bf9e99e8aa4667227696
 SHA512:
-  metadata.gz: 1bbfedb73da5c7bc16e49731ccabade30e09a2713e09708ba7aab85d982c06e3661f08c68712b76c779068253047ded44c31b518900bea9653ede6111dc18169
-  data.tar.gz: 08f470b94fc465b657eefc74af3a7a0cc4b647fe017cf85d5b52f8f451dda5effa9ede5e92284d3c8a6e0dddc4c03342f4157f3eb6e9f9ebfef02a47fd1cafe9
+  metadata.gz: 933431d52c9e29ed084926f2c48fd6a7be6b44f3f801f3e73c0c3a9558743fc3e4ed7d9552b07d84591a1f045d26baf4aeeade4a81fd95b2733987c61a0a9c70
+  data.tar.gz: 52e8bd5c6bd39553feb8e3f9fcb720a6f3b4743cf80333311c7ad660ec44c9b3152a08155ac9bbe75e9fa675720d8b852a34feeed6f185a2e50be4e05bf45203

data/ext/breakpoint.c

@@ -26,7 +26,7 @@ catchpoint_hit_count(VALUE catchpoints, VALUE exception, VALUE *exception_name)
     return Qnil;
   expn_class = rb_obj_class(exception);
   ancestors = rb_mod_ancestors(expn_class);
-  for(i = 0; i < RARRAY_LEN(ancestors); i++)
+  for(i = 0; i < RARRAY_LENINT(ancestors); i++)
   {
     aclass    = rb_ary_entry(ancestors, i);
     mod_name  = rb_mod_name(aclass);
@@ -83,7 +83,7 @@ Breakpoint_remove(VALUE self, VALUE breakpoints, VALUE id_value)
 
   id = FIX2INT(id_value);
 
-  for(i = 0; i < RARRAY_LEN(breakpoints); i++)
+  for(i = 0; i < RARRAY_LENINT(breakpoints); i++)
   {
     breakpoint_object = rb_ary_entry(breakpoints, i);
     Data_Get_Struct(breakpoint_object, breakpoint_t, breakpoint);
@@ -207,7 +207,7 @@ breakpoint_find(VALUE breakpoints, VALUE source, VALUE pos)
 
   file = RSTRING_PTR(source);
   line = FIX2INT(pos);
-  for(i = 0; i < RARRAY_LEN(breakpoints); i++)
+  for(i = 0; i < RARRAY_LENINT(breakpoints); i++)
   {
     breakpoint_object = rb_ary_entry(breakpoints, i);
     if (check_breakpoint_by_pos(breakpoint_object, file, line))

data/ext/context.c

@@ -29,7 +29,7 @@ fill_frame(debug_frame_t *frame, const char* file, int line, VALUE binding, VALU
   frame->file = file;
   frame->line = line;
   frame->binding = binding;
-  frame->self = self;  
+  frame->self = self;
 }
 
 extern void 
@@ -45,7 +45,7 @@ fill_stack(debug_context_t *context, const rb_debug_inspector_t *inspector) {
   int i;
 
   locations = rb_debug_inspector_backtrace_locations(inspector);
-  stack_size = locations == Qnil ? 0 : (int)RARRAY_LEN(locations);
+  stack_size = locations == Qnil ? 0 : RARRAY_LENINT(locations);
   context->stack_size = stack_size;
 
   for (i = 0; i < stack_size; i++) {
@@ -138,7 +138,7 @@ context_create(VALUE thread, VALUE cDebugThread) {
   context = ALLOC(debug_context_t);
   context->stack_size = 0;
   locations = rb_funcall(thread, rb_intern("backtrace_locations"), 1, INT2FIX(1));
-  context->calced_stack_size = locations != Qnil ? (int)RARRAY_LEN(locations) : 0;
+  context->calced_stack_size = locations != Qnil ? RARRAY_LENINT(locations) : 0;
   context->stack = NULL;
   context->thnum = ++thnum_current;
   context->thread = thread;

data/ext/debase_internals.c

@@ -162,7 +162,7 @@ print_event(rb_trace_point_t *tp, debug_context_t *context)
     locations = rb_funcall(context->thread, rb_intern("backtrace_locations"), 1, INT2FIX(1));
     fprintf(stderr, "    calced_stack_size=%d, stack_size=%d, real_stack_size=%d\n",
             context->calced_stack_size, context->stack_size,
-            locations != Qnil ? (int)RARRAY_LEN(locations) : 0);
+            locations != Qnil ? RARRAY_LENINT(locations) : 0);
   }
 }
 

data/lib/debase/context.rb

@@ -1,17 +1,9 @@
 module Debase
   class Context
     def frame_locals(frame_no=0)
-      result = {}
-      binding = frame_binding(frame_no)
-      locals = eval("local_variables", binding)
-      if locals.respond_to?(:each)
-        locals.each do |local|
-          result[local.to_s] = safe_eval(local.to_s, binding)
-        end
-      else
-        result[locals.to_s] = safe_eval(locals.to_s, binding)
-      end
-      result
+      frame_binding(frame_no).eval('local_variables.inject({}){|h, v| h[v.to_s] = eval(v.to_s); h}')
+    rescue => e
+      {'debase-debug' => "*Evaluation error: '#{e}'" }
     end
 
     def frame_class(frame_no=0)
@@ -46,16 +38,5 @@ module Debase
     def at_return(file, line)
       handler.at_return(self, file, line)
     end
-
-    private
-
-    def safe_eval(expr, binding)
-      begin
-        eval(expr, binding)
-      rescue => e
-        "*Evaluation error: '#{e}'"
-      end
-    end
-
   end
 end

data/lib/debase/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: debase
 version: !ruby/object:Gem::Version
-  version: 0.2.2.beta1
+  version: 0.2.2.beta2
 platform: ruby
 authors:
 - Dennis Ushakov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-04 00:00:00.000000000 Z
+date: 2015-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase-ruby_core_source