getsource 0.1.0 → 0.2.0

data/CHANGELOG

@@ -1 +1,3 @@
+0.2.0:	Implemented getsource methods in pure ruby for ruby 1.9 using source_location
+
 0.1.0:	implemented getsource with code extracted from rallhook

data/Rakefile

@@ -6,7 +6,7 @@ require 'rake/gempackagetask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'getsource'
-  s.version = '0.1.0'
+  s.version = '0.2.0'
   s.author = 'Dario Seminara'
   s.email = 'robertodarioseminara@gmail.com'
   s.platform = Gem::Platform::RUBY

data/ext/getsource_base/getsource_base.c

@@ -20,28 +20,10 @@ along with getsource.  if not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <ruby.h>
-
 #ifdef RUBY1_8
-#include <node.h>
-#endif
-
-#ifdef RUBY1_9
-#include <node_defs.h>
-#endif
-
-#ifndef __USE_GNU
-#define __USE_GNU
-#endif
-#include <dlfcn.h>
 
+#include <node.h>
 
-VALUE rb_cNode;
-ID intern_owner;
-ID intern_name;
-ID intern_sym;
-
-///  from eval.c
-#ifdef RUBY1_8
 struct METHOD {
     VALUE klass, rklass;
 
@@ -53,33 +35,17 @@ struct METHOD {
 unsigned char* base__;
 
 #define nd_file(n) n->nd_file
+#include <dlfcn.h>
 
-#endif
-
-#ifdef RUBY1_9
-
-// from proc.c
-struct METHOD {
-    VALUE oclass;		/* class that holds the method */
-    VALUE rclass;		/* class of the receiver */
-    VALUE recv;
-    ID id, oid;
-    NODE *body;
-};
-
-typedef struct rb_iseq_struct__ {
-    VALUE type;          // instruction sequence type
-    VALUE name;	         // String: iseq name
-    VALUE filename;      // file information where this sequence from
-} rb_iseq_t__;
-
+VALUE rb_cNode;
+ID intern_owner;
+ID intern_name;
+ID intern_sym;
 
 typedef VALUE (*MNEW)(VALUE klass, VALUE obj, ID id, VALUE mclass, int scope);
 MNEW mnew_;
 unsigned char* base__;
 
-#endif
-
 /*
 	The node that acts as body of the method
 */
@@ -95,12 +61,10 @@ VALUE rb_method_body(VALUE self) {
 
 	if (method->body == 0) return Qnil;
 
-#ifdef RUBY1_8
 	// nd_defn is only present in ruby_1.8
 	if (method->body->nd_defn != 0) {
 		return Data_Wrap_Struct(rb_cNode, 0, 0, method->body->nd_defn);
 	}
-#endif
 
 	return Data_Wrap_Struct(rb_cNode, 0, 0, method->body);
 }
@@ -112,15 +76,11 @@ VALUE rb_node_line(VALUE self) {
     NODE* _node;
     Data_Get_Struct(self,NODE,_node);
 
-    #ifdef RUBY1_8
     return INT2FIX(nd_line(_node));
-    #endif
 
-    #ifdef RUBY1_9
-    return INT2FIX(0);
-    #endif
 }
 
+
 /*
 The name of the ruby source file where the code associated with the node are defined
 */
@@ -128,46 +88,20 @@ VALUE rb_node_file(VALUE self) {
     NODE* _node;
     Data_Get_Struct(self,NODE,_node);
 
-	#ifdef RUBY1_8
     if (nd_file(_node)  == NULL ) {
 	    return rb_str_new2("");
     }
     return rb_str_new2(nd_file(_node) );
-    #endif
-
-    #ifdef RUBY1_9
-
-	if (nd_type(_node) == RUBY_VM_METHOD_NODE) {
-		VALUE iseqval = (VALUE)(_node->nd_body);
-		rb_iseq_t__* ptr;
-		Data_Get_Struct(iseqval, rb_iseq_t__, ptr);
-
-		return ptr->filename;
-	}
-
-	return rb_str_new2("");
-
-	#endif
-
 }
 
 
 static void
 bm_mark(struct METHOD *data)
 {
-#ifdef RUBY1_8
     rb_gc_mark(data->klass);
     rb_gc_mark(data->rklass);
     rb_gc_mark(data->recv);
     rb_gc_mark((VALUE)data->body);
-#endif
-#ifdef RUBY1_9
-    rb_gc_mark(data->rclass);
-    rb_gc_mark(data->oclass);
-    rb_gc_mark(data->recv);
-    rb_gc_mark((VALUE)data->body);
-#endif
-
 }
 
 static VALUE
@@ -180,12 +114,7 @@ umethod_unchecked_bind(VALUE method, VALUE recv)
     method = Data_Make_Struct(rb_cMethod, struct METHOD, bm_mark, -1, bound);
     *bound = *data;
     bound->recv = recv;
-#ifdef RUBY1_8
     bound->rklass = CLASS_OF(recv);
-#endif
-#ifdef RUBY1_9
-    bound->rclass = CLASS_OF(recv);
-#endif
 
     return method;
 }
@@ -202,11 +131,18 @@ void  Init_getsource_base() {
 	the ruby source code and may be associated with a file and line where thats node are defined
 	*/
 	rb_cNode = rb_define_class("Node", rb_cObject);
-
 	rb_define_method(rb_cNode, "line", rb_node_line, 0);
 	rb_define_method(rb_cNode, "file", rb_node_file, 0);
 
+
 	intern_owner = rb_intern("owner");
 	intern_name = rb_intern("name");
 	intern_sym = rb_intern("to_sym");
 }
+#else
+
+void  Init_getsource_base() {
+}
+
+#endif
+

data/lib/getsource.rb

@@ -20,7 +20,41 @@ along with getsource.  if not, see <http://www.gnu.org/licenses/>.
 =end
 require "getsource_base"
 
+class Method
+
+  class Node
+
+    attr_reader :file
+    attr_reader :line
+
+    def initialize(file_,line_)
+      @file = file_
+      @line = line_
+    end
+  end
+
+  begin
+    instance_method("body")
+  rescue
+    def body
+      Method::Node.new(source_location[0], source_location[1])
+    end
+  end
+end
+
+class UnboundMethod
+  begin
+    instance_method("body")
+  rescue
+    def body
+      Method::Node.new(source_location[0], source_location[1])
+    end
+  end
+end
+
+
 class Object
+
   def specific_method(arg1, arg2=nil)
     if arg2
       method_name = arg2

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: getsource
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Dario Seminara
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-30 00:00:00 -03:00
+date: 2011-04-27 00:00:00 -03:00
 default_executable: 
 dependencies: []