is_a 0.1.1 → 0.1.2

data/ext/is_a/extconf.rb

@@ -19,6 +19,8 @@ hdrs = ->{
   res = %w{
     vm_core.h
   }.all?{|hdr| have_header(hdr)}
+  have_struct_member("rb_iseq_t", "location", "vm_core.h")
+  have_func("rb_vm_get_sourceline", "vm_core.h")
   res
 }
 

data/ext/is_a/is_a.c

@@ -24,6 +24,27 @@ rb_object_id_of(VALUE self, VALUE obj)
 #include "ruby/encoding.h"
 #include "vm_core.h"
 
+#ifndef ID_ALLOCATOR
+#define ID_ALLOCATOR 0
+#endif
+
+#ifndef HAVE_RB_VM_GET_SOURCELINE
+inline static int
+calc_lineno(const rb_iseq_t *iseq, const VALUE *pc)
+{
+    return rb_iseq_line_no(iseq, pc - iseq->iseq_encoded);
+}
+int rb_vm_get_sourceline(const rb_control_frame_t * cfp){
+  int lineno = 0;
+  const rb_iseq_t *iseq = cfp->iseq;
+
+  if (RUBY_VM_NORMAL_ISEQ_P(iseq)) {
+  lineno = calc_lineno(cfp->iseq, cfp->pc);
+  }
+  return lineno;
+}
+#endif
+
 #define HAVE_CALLER_AT
 static VALUE caller_line(int offset)
 {
@@ -42,10 +63,22 @@ static VALUE caller_line(int offset)
       if (cfp->pc != 0) {
         rb_iseq_t *iseq = cfp->iseq;
         int line_no = rb_vm_get_sourceline(cfp);
+
+        #ifndef HAVE_RB_ISEQ_T_LOCATION
         VALUE file = iseq->filename;
+        #else
+        VALUE file = iseq->location.path;
+        #endif
+
         //name may be passed from previous iteration
         if(!name)
-          name = iseq->name;
+          name =
+          #ifdef HAVE_RB_ISEQ_T_LOCATION
+            iseq->location.label;
+          #else
+            iseq->name;
+          #endif
+
         if (line_no) {
           return rb_enc_sprintf(
                 rb_enc_compatible(file, name),

data/lib/is_a/version.rb

@@ -1,3 +1,3 @@
 module IsA
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: is_a
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-03 00:00:00.000000000 Z
+date: 2013-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debugger-ruby_core_source
@@ -92,7 +92,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2510194417071522637
+      hash: 4587415308896797553
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2510194417071522637
+      hash: 4587415308896797553
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24