rubynode 0.1.4 → 0.1.5

data/Changelog

@@ -1,5 +1,10 @@
 Changelog
 
+-- 0.1.5
+
+* Implement more flexible version detection based on the SHA1 digest of node.h
+* Fix a possible segfault with OP_ASGN2 nodes (reported by Kirill A. Shutemov)
+
 -- 0.1.4
 
 * Out of the box 1.8.5-p114 and 1.8.6-p111 support

data/README

@@ -17,7 +17,7 @@ Requirements
 RubyNode is tested with Ruby 1.8.4, 1.8.5 and 1.8.6, but it should also work
 with other 1.8 versions. RubyNode worked (and still does work) with older Ruby
 1.9 snapshots (possibly some node types are not fully supported), but it
-currently does not work with the latest 1.9 snapshots.
+currently does not work with the latest 1.9 snapshots and releases.
 
 
 Installation
@@ -26,8 +26,7 @@ Installation
 RubyNode generates some of its C source code from Ruby's source code, because
 the node types and other details differ between Ruby versions.
 
-For the official releases of Ruby 1.8.4, 1.8.5 (including patchlevels 2, 12,
-35, 52 and 114) and 1.8.6 (including patchlevel 36 and 111) the needed source
+For the official releases of Ruby 1.8.4, 1.8.5 and 1.8.6 the needed source
 files are included in the package. To compile RubyNode for any other Ruby
 version, you will need that version's source tar ball extracted somewhere.
 

data/doc/index.html

@@ -27,7 +27,7 @@ s-expressions), which are easy to manipulate and work with.</p>
 	<p>RubyNode is tested with Ruby 1.8.4, 1.8.5 and 1.8.6, but it should also work
 with other 1.8 versions. RubyNode worked (and still does work) with older Ruby
 1.9 snapshots (possibly some node types are not fully supported), but it
-currently does not work with the latest 1.9 snapshots.</p>
+currently does not work with the latest 1.9 snapshots and releases.</p>
 
 
 	<h2 id="section2">Download</h2>
@@ -46,8 +46,7 @@ currently does not work with the latest 1.9 snapshots.</p>
 the node types and other details differ between Ruby versions.</p>
 
 
-	<p>For the official releases of Ruby 1.8.4, 1.8.5 (including patchlevels 2, 12,
-35, 52 and 114) and 1.8.6 (including patchlevel 36 and 111) the needed source
+	<p>For the official releases of Ruby 1.8.4, 1.8.5 and 1.8.6 the needed source
 files are included in the package. To compile RubyNode for any other Ruby
 version, you will need that version&#8217;s source tar ball extracted somewhere.</p>
 

data/ext/rubynode_ext/extconf.rb

@@ -1,4 +1,5 @@
 require "mkmf"
+require "digest/sha1"
 
 def ruby_source_dir_error(extra = nil)
 	warn "==================== ERROR ====================="
@@ -12,19 +13,27 @@ def ruby_source_dir_error(extra = nil)
 end
 
 begin
-	$rbsrcdir = ENV["RUBY_SOURCE_DIR"] || File.join(File.dirname(__FILE__), "ruby_src/#{RUBY_VERSION}_#{RUBY_RELEASE_DATE}")
+	# read node.h from installed ruby
+	node_h = IO.read(File.join($hdrdir, "node.h"))
+	# digest it
+	node_h_digest = Digest::SHA1.hexdigest(node_h)
+
+	$rbsrcdir = ENV["RUBY_SOURCE_DIR"] || File.join(File.dirname(__FILE__), "ruby_src/#{node_h_digest}")
 
 	unless File.directory? $rbsrcdir
 		ruby_source_dir_error
 	end
 
-	node_h = IO.read(File.join($rbsrcdir, "node.h"))
+	# read gc.c and eval.c from $rbsrcdir
 	gc_c = IO.read(File.join($rbsrcdir, "gc.c"))
 	eval_c = IO.read(File.join($rbsrcdir, "eval.c"))
-	# check if $hdrdir is "compatible" with $rbsrcdir
-	unless node_h == IO.read(File.join($hdrdir, "node.h"))
-		ruby_source_dir_error(File.join($hdrdir, "node.h") +
-			"\nis different from\n" + File.join($rbsrcdir, "node.h"))
+
+	if ENV["RUBY_SOURCE_DIR"]
+		# if RUBY_SOURCE_DIR was set, check if it is actually "compatible" with $hdrdir
+		unless node_h == IO.read(File.join($rbsrcdir, "node.h"))
+			ruby_source_dir_error(File.join($hdrdir, "node.h") +
+				"\nis different from\n" + File.join($rbsrcdir, "node.h"))
+		end
 	end
 
 	raise "node.h does not contain 'enum node_type'" unless node_h =~ /enum node_type \{(.*?)\};/m

data/ext/rubynode_ext/rubynode_ext.c

@@ -101,10 +101,10 @@ static VALUE value_or_node_to_value(VALUE val, enum node_type nd_type, int union
 				if (union_idx == 1) break;
 				else return Qnil;
 			case NODE_OP_ASGN2:
-				/* either 3 ids: nd_vid, nd_mid, nd_aid
+				/* either 3 ids: nd_vid, nd_mid, nd_aid (actually nd_mid might be 0 or 1 instead of an id)
 				 * or 3 values: nd_recv, nd_value, nd_next
 				 */
-				if (rb_id2name(node->nd_vid) && rb_id2name(node->nd_mid) && rb_id2name(node->nd_aid))
+				if (rb_id2name(node->nd_vid) && id_to_value(node->nd_mid) != Qnil && rb_id2name(node->nd_aid))
 					return Qnil;
 				else break;
 #ifdef HAVE_NODE_PRELUDE

data/lib/rubynode.rb

@@ -3,7 +3,7 @@ require "rubynode_ext"
 
 class RubyNode
 
-	VERSION = "0.1.4"
+	VERSION = "0.1.5"
 
 	NODE_ATTRIBS = {
 		:alias        =>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubynode
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Dominik Bathon
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2007-12-05 00:00:00 +01:00
+date: 2008-02-14 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -24,46 +24,18 @@ extra_rdoc_files: []
 files: 
 - ext/rubynode_ext
 - ext/rubynode_ext/ruby_src
-- ext/rubynode_ext/ruby_src/1.8.4_2005-12-24
-- ext/rubynode_ext/ruby_src/1.8.4_2005-12-24/gc.c
-- ext/rubynode_ext/ruby_src/1.8.4_2005-12-24/eval.c
-- ext/rubynode_ext/ruby_src/1.8.4_2005-12-24/node.h
-- ext/rubynode_ext/ruby_src/1.8.5_2006-08-25
-- ext/rubynode_ext/ruby_src/1.8.5_2006-08-25/gc.c
-- ext/rubynode_ext/ruby_src/1.8.5_2006-08-25/eval.c
-- ext/rubynode_ext/ruby_src/1.8.5_2006-08-25/node.h
-- ext/rubynode_ext/ruby_src/1.8.5_2006-12-04
-- ext/rubynode_ext/ruby_src/1.8.5_2006-12-04/gc.c
-- ext/rubynode_ext/ruby_src/1.8.5_2006-12-04/eval.c
-- ext/rubynode_ext/ruby_src/1.8.5_2006-12-04/node.h
-- ext/rubynode_ext/ruby_src/1.8.5_2006-12-25
-- ext/rubynode_ext/ruby_src/1.8.5_2006-12-25/gc.c
-- ext/rubynode_ext/ruby_src/1.8.5_2006-12-25/eval.c
-- ext/rubynode_ext/ruby_src/1.8.5_2006-12-25/node.h
-- ext/rubynode_ext/ruby_src/1.8.5_2007-03-13
-- ext/rubynode_ext/ruby_src/1.8.5_2007-03-13/gc.c
-- ext/rubynode_ext/ruby_src/1.8.5_2007-03-13/eval.c
-- ext/rubynode_ext/ruby_src/1.8.5_2007-03-13/node.h
-- ext/rubynode_ext/ruby_src/1.8.5_2007-06-07
-- ext/rubynode_ext/ruby_src/1.8.5_2007-06-07/gc.c
-- ext/rubynode_ext/ruby_src/1.8.5_2007-06-07/eval.c
-- ext/rubynode_ext/ruby_src/1.8.5_2007-06-07/node.h
-- ext/rubynode_ext/ruby_src/1.8.5_2007-09-24
-- ext/rubynode_ext/ruby_src/1.8.5_2007-09-24/gc.c
-- ext/rubynode_ext/ruby_src/1.8.5_2007-09-24/eval.c
-- ext/rubynode_ext/ruby_src/1.8.5_2007-09-24/node.h
-- ext/rubynode_ext/ruby_src/1.8.6_2007-03-13
-- ext/rubynode_ext/ruby_src/1.8.6_2007-03-13/gc.c
-- ext/rubynode_ext/ruby_src/1.8.6_2007-03-13/eval.c
-- ext/rubynode_ext/ruby_src/1.8.6_2007-03-13/node.h
-- ext/rubynode_ext/ruby_src/1.8.6_2007-06-07
-- ext/rubynode_ext/ruby_src/1.8.6_2007-06-07/gc.c
-- ext/rubynode_ext/ruby_src/1.8.6_2007-06-07/eval.c
-- ext/rubynode_ext/ruby_src/1.8.6_2007-06-07/node.h
-- ext/rubynode_ext/ruby_src/1.8.6_2007-09-24
-- ext/rubynode_ext/ruby_src/1.8.6_2007-09-24/gc.c
-- ext/rubynode_ext/ruby_src/1.8.6_2007-09-24/eval.c
-- ext/rubynode_ext/ruby_src/1.8.6_2007-09-24/node.h
+- ext/rubynode_ext/ruby_src/d0efe17fed21c8d9954851abd9dab16fac1e35b8
+- ext/rubynode_ext/ruby_src/d0efe17fed21c8d9954851abd9dab16fac1e35b8/gc.c
+- ext/rubynode_ext/ruby_src/d0efe17fed21c8d9954851abd9dab16fac1e35b8/eval.c
+- ext/rubynode_ext/ruby_src/4bfe0d24de6089aca6af9bf4d690df7a7f481276
+- ext/rubynode_ext/ruby_src/4bfe0d24de6089aca6af9bf4d690df7a7f481276/gc.c
+- ext/rubynode_ext/ruby_src/4bfe0d24de6089aca6af9bf4d690df7a7f481276/eval.c
+- ext/rubynode_ext/ruby_src/061ef3a38d01ac9917e7aaff0bc5ff6be60becf3
+- ext/rubynode_ext/ruby_src/061ef3a38d01ac9917e7aaff0bc5ff6be60becf3/gc.c
+- ext/rubynode_ext/ruby_src/061ef3a38d01ac9917e7aaff0bc5ff6be60becf3/eval.c
+- ext/rubynode_ext/ruby_src/d03d2652e0a6a8ae8bd0575d58f0c093d97d694d
+- ext/rubynode_ext/ruby_src/d03d2652e0a6a8ae8bd0575d58f0c093d97d694d/gc.c
+- ext/rubynode_ext/ruby_src/d03d2652e0a6a8ae8bd0575d58f0c093d97d694d/eval.c
 - ext/rubynode_ext/extconf.rb
 - ext/rubynode_ext/rubynode_ext.c
 - lib/rubynode.rb

data/ext/rubynode_ext/ruby_src/1.8.4_2005-12-24/node.h

@@ -1,381 +0,0 @@
-/**********************************************************************
-
-  node.h -
-
-  $Author: nobu $
-  $Date: 2005/10/08 09:57:12 $
-  created at: Fri May 28 15:14:02 JST 1993
-
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
-
-**********************************************************************/
-
-#ifndef NODE_H
-#define NODE_H
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-enum node_type {
-    NODE_METHOD,
-    NODE_FBODY,
-    NODE_CFUNC,
-    NODE_SCOPE,
-    NODE_BLOCK,
-    NODE_IF,
-    NODE_CASE,
-    NODE_WHEN,
-    NODE_OPT_N,
-    NODE_WHILE,
-    NODE_UNTIL,
-    NODE_ITER,
-    NODE_FOR,
-    NODE_BREAK,
-    NODE_NEXT,
-    NODE_REDO,
-    NODE_RETRY,
-    NODE_BEGIN,
-    NODE_RESCUE,
-    NODE_RESBODY,
-    NODE_ENSURE,
-    NODE_AND,
-    NODE_OR,
-    NODE_NOT,
-    NODE_MASGN,
-    NODE_LASGN,
-    NODE_DASGN,
-    NODE_DASGN_CURR,
-    NODE_GASGN,
-    NODE_IASGN,
-    NODE_CDECL,
-    NODE_CVASGN,
-    NODE_CVDECL,
-    NODE_OP_ASGN1,
-    NODE_OP_ASGN2,
-    NODE_OP_ASGN_AND,
-    NODE_OP_ASGN_OR,
-    NODE_CALL,
-    NODE_FCALL,
-    NODE_VCALL,
-    NODE_SUPER,
-    NODE_ZSUPER,
-    NODE_ARRAY,
-    NODE_ZARRAY,
-    NODE_HASH,
-    NODE_RETURN,
-    NODE_YIELD,
-    NODE_LVAR,
-    NODE_DVAR,
-    NODE_GVAR,
-    NODE_IVAR,
-    NODE_CONST,
-    NODE_CVAR,
-    NODE_NTH_REF,
-    NODE_BACK_REF,
-    NODE_MATCH,
-    NODE_MATCH2,
-    NODE_MATCH3,
-    NODE_LIT,
-    NODE_STR,
-    NODE_DSTR,
-    NODE_XSTR,
-    NODE_DXSTR,
-    NODE_EVSTR,
-    NODE_DREGX,
-    NODE_DREGX_ONCE,
-    NODE_ARGS,
-    NODE_ARGSCAT,
-    NODE_ARGSPUSH,
-    NODE_SPLAT,
-    NODE_TO_ARY,
-    NODE_SVALUE,
-    NODE_BLOCK_ARG,
-    NODE_BLOCK_PASS,
-    NODE_DEFN,
-    NODE_DEFS,
-    NODE_ALIAS,
-    NODE_VALIAS,
-    NODE_UNDEF,
-    NODE_CLASS,
-    NODE_MODULE,
-    NODE_SCLASS,
-    NODE_COLON2,
-    NODE_COLON3,
-    NODE_CREF,
-    NODE_DOT2,
-    NODE_DOT3,
-    NODE_FLIP2,
-    NODE_FLIP3,
-    NODE_ATTRSET,
-    NODE_SELF,
-    NODE_NIL,
-    NODE_TRUE,
-    NODE_FALSE,
-    NODE_DEFINED,
-    NODE_NEWLINE,
-    NODE_POSTEXE,
-    NODE_ALLOCA,
-    NODE_DMETHOD,
-    NODE_BMETHOD,
-    NODE_MEMO,
-    NODE_IFUNC,
-    NODE_DSYM,
-    NODE_ATTRASGN,
-    NODE_LAST
-};
-
-typedef struct RNode {
-    unsigned long flags;
-    char *nd_file;
-    union {
-	struct RNode *node;
-	ID id;
-	VALUE value;
-	VALUE (*cfunc)(ANYARGS);
-	ID *tbl;
-    } u1;
-    union {
-	struct RNode *node;
-	ID id;
-	long argc;
-	VALUE value;
-    } u2;
-    union {
-	struct RNode *node;
-	ID id;
-	long state;
-	struct global_entry *entry;
-	long cnt;
-	VALUE value;
-    } u3;
-} NODE;
-
-#define RNODE(obj)  (R_CAST(RNode)(obj))
-
-#define nd_type(n) ((int)(((RNODE(n))->flags>>FL_USHIFT)&0xff))
-#define nd_set_type(n,t) \
-    RNODE(n)->flags=((RNODE(n)->flags&~FL_UMASK)|(((t)<<FL_USHIFT)&FL_UMASK))
-
-#define NODE_LSHIFT (FL_USHIFT+8)
-#define NODE_LMASK  (((long)1<<(sizeof(NODE*)*CHAR_BIT-NODE_LSHIFT))-1)
-#define nd_line(n) ((unsigned int)(((RNODE(n))->flags>>NODE_LSHIFT)&NODE_LMASK))
-#define nd_set_line(n,l) \
-    RNODE(n)->flags=((RNODE(n)->flags&~(-1<<NODE_LSHIFT))|(((l)&NODE_LMASK)<<NODE_LSHIFT))
-
-#define nd_head  u1.node
-#define nd_alen  u2.argc
-#define nd_next  u3.node
-
-#define nd_cond  u1.node
-#define nd_body  u2.node
-#define nd_else  u3.node
-
-#define nd_orig  u3.value
-
-#define nd_resq  u2.node
-#define nd_ensr  u3.node
-
-#define nd_1st   u1.node
-#define nd_2nd   u2.node
-
-#define nd_stts  u1.node
-
-#define nd_entry u3.entry
-#define nd_vid   u1.id
-#define nd_cflag u2.id
-#define nd_cval  u3.value
-
-#define nd_cnt   u3.cnt
-#define nd_tbl   u1.tbl
-
-#define nd_var   u1.node
-#define nd_ibdy  u2.node
-#define nd_iter  u3.node
-
-#define nd_value u2.node
-#define nd_aid   u3.id
-
-#define nd_lit   u1.value
-
-#define nd_frml  u1.node
-#define nd_rest  u2.argc
-#define nd_opt   u1.node
-
-#define nd_recv  u1.node
-#define nd_mid   u2.id
-#define nd_args  u3.node
-
-#define nd_noex  u1.id
-#define nd_defn  u3.node
-
-#define nd_old   u1.id
-#define nd_new   u2.id
-
-#define nd_cfnc  u1.cfunc
-#define nd_argc  u2.argc
-
-#define nd_cpath u1.node
-#define nd_super u3.node
-
-#define nd_modl  u1.id
-#define nd_clss  u1.value
-
-#define nd_beg   u1.node
-#define nd_end   u2.node
-#define nd_state u3.state
-#define nd_rval  u2.value
-
-#define nd_nth   u2.argc
-
-#define nd_tag   u1.id
-#define nd_tval  u2.value
-
-#define NEW_NODE(t,a0,a1,a2) rb_node_newnode((t),(VALUE)(a0),(VALUE)(a1),(VALUE)(a2))
-
-#define NEW_METHOD(n,x) NEW_NODE(NODE_METHOD,x,n,0)
-#define NEW_FBODY(n,i,o) NEW_NODE(NODE_FBODY,n,i,o)
-#define NEW_DEFN(i,a,d,p) NEW_NODE(NODE_DEFN,p,i,NEW_RFUNC(a,d))
-#define NEW_DEFS(r,i,a,d) NEW_NODE(NODE_DEFS,r,i,NEW_RFUNC(a,d))
-#define NEW_CFUNC(f,c) NEW_NODE(NODE_CFUNC,f,c,0)
-#define NEW_IFUNC(f,c) NEW_NODE(NODE_IFUNC,f,c,0)
-#define NEW_RFUNC(b1,b2) NEW_SCOPE(block_append(b1,b2))
-#define NEW_SCOPE(b) NEW_NODE(NODE_SCOPE,local_tbl(),0,(b))
-#define NEW_BLOCK(a) NEW_NODE(NODE_BLOCK,a,0,0)
-#define NEW_IF(c,t,e) NEW_NODE(NODE_IF,c,t,e)
-#define NEW_UNLESS(c,t,e) NEW_IF(c,e,t)
-#define NEW_CASE(h,b) NEW_NODE(NODE_CASE,h,b,0)
-#define NEW_WHEN(c,t,e) NEW_NODE(NODE_WHEN,c,t,e)
-#define NEW_OPT_N(b) NEW_NODE(NODE_OPT_N,0,b,0)
-#define NEW_WHILE(c,b,n) NEW_NODE(NODE_WHILE,c,b,n)
-#define NEW_UNTIL(c,b,n) NEW_NODE(NODE_UNTIL,c,b,n)
-#define NEW_FOR(v,i,b) NEW_NODE(NODE_FOR,v,b,i)
-#define NEW_ITER(v,i,b) NEW_NODE(NODE_ITER,v,b,i)
-#define NEW_BREAK(s) NEW_NODE(NODE_BREAK,s,0,0)
-#define NEW_NEXT(s) NEW_NODE(NODE_NEXT,s,0,0)
-#define NEW_REDO() NEW_NODE(NODE_REDO,0,0,0)
-#define NEW_RETRY() NEW_NODE(NODE_RETRY,0,0,0)
-#define NEW_BEGIN(b) NEW_NODE(NODE_BEGIN,0,b,0)
-#define NEW_RESCUE(b,res,e) NEW_NODE(NODE_RESCUE,b,res,e)
-#define NEW_RESBODY(a,ex,n) NEW_NODE(NODE_RESBODY,n,ex,a)
-#define NEW_ENSURE(b,en) NEW_NODE(NODE_ENSURE,b,0,en)
-#define NEW_RETURN(s) NEW_NODE(NODE_RETURN,s,0,0)
-#define NEW_YIELD(a,s) NEW_NODE(NODE_YIELD,a,0,s)
-#define NEW_LIST(a)  NEW_ARRAY(a)
-#define NEW_ARRAY(a) NEW_NODE(NODE_ARRAY,a,1,0)
-#define NEW_ZARRAY() NEW_NODE(NODE_ZARRAY,0,0,0)
-#define NEW_HASH(a)  NEW_NODE(NODE_HASH,a,0,0)
-#define NEW_NOT(a)   NEW_NODE(NODE_NOT,0,a,0)
-#define NEW_MASGN(l,r)   NEW_NODE(NODE_MASGN,l,0,r)
-#define NEW_GASGN(v,val) NEW_NODE(NODE_GASGN,v,val,rb_global_entry(v))
-#define NEW_LASGN(v,val) NEW_NODE(NODE_LASGN,v,val,local_cnt(v))
-#define NEW_DASGN(v,val) NEW_NODE(NODE_DASGN,v,val,0)
-#define NEW_DASGN_CURR(v,val) NEW_NODE(NODE_DASGN_CURR,v,val,0)
-#define NEW_IASGN(v,val) NEW_NODE(NODE_IASGN,v,val,0)
-#define NEW_CDECL(v,val,path) NEW_NODE(NODE_CDECL,v,val,path)
-#define NEW_CVASGN(v,val) NEW_NODE(NODE_CVASGN,v,val,0)
-#define NEW_CVDECL(v,val) NEW_NODE(NODE_CVDECL,v,val,0)
-#define NEW_OP_ASGN1(p,id,a) NEW_NODE(NODE_OP_ASGN1,p,id,a)
-#define NEW_OP_ASGN2(r,i,o,val) NEW_NODE(NODE_OP_ASGN2,r,val,NEW_OP_ASGN22(i,o))
-#define NEW_OP_ASGN22(i,o) NEW_NODE(NODE_OP_ASGN2,i,o,rb_id_attrset(i))
-#define NEW_OP_ASGN_OR(i,val) NEW_NODE(NODE_OP_ASGN_OR,i,val,0)
-#define NEW_OP_ASGN_AND(i,val) NEW_NODE(NODE_OP_ASGN_AND,i,val,0)
-#define NEW_GVAR(v) NEW_NODE(NODE_GVAR,v,0,rb_global_entry(v))
-#define NEW_LVAR(v) NEW_NODE(NODE_LVAR,v,0,local_cnt(v))
-#define NEW_DVAR(v) NEW_NODE(NODE_DVAR,v,0,0)
-#define NEW_IVAR(v) NEW_NODE(NODE_IVAR,v,0,0)
-#define NEW_CONST(v) NEW_NODE(NODE_CONST,v,0,0)
-#define NEW_CVAR(v) NEW_NODE(NODE_CVAR,v,0,0)
-#define NEW_NTH_REF(n)  NEW_NODE(NODE_NTH_REF,0,n,local_cnt('~'))
-#define NEW_BACK_REF(n) NEW_NODE(NODE_BACK_REF,0,n,local_cnt('~'))
-#define NEW_MATCH(c) NEW_NODE(NODE_MATCH,c,0,0)
-#define NEW_MATCH2(n1,n2) NEW_NODE(NODE_MATCH2,n1,n2,0)
-#define NEW_MATCH3(r,n2) NEW_NODE(NODE_MATCH3,r,n2,0)
-#define NEW_LIT(l) NEW_NODE(NODE_LIT,l,0,0)
-#define NEW_STR(s) NEW_NODE(NODE_STR,s,0,0)
-#define NEW_DSTR(s) NEW_NODE(NODE_DSTR,s,1,0)
-#define NEW_XSTR(s) NEW_NODE(NODE_XSTR,s,0,0)
-#define NEW_DXSTR(s) NEW_NODE(NODE_DXSTR,s,0,0)
-#define NEW_DSYM(s) NEW_NODE(NODE_DSYM,s,0,0)
-#define NEW_EVSTR(n) NEW_NODE(NODE_EVSTR,0,(n),0)
-#define NEW_CALL(r,m,a) NEW_NODE(NODE_CALL,r,m,a)
-#define NEW_FCALL(m,a) NEW_NODE(NODE_FCALL,0,m,a)
-#define NEW_VCALL(m) NEW_NODE(NODE_VCALL,0,m,0)
-#define NEW_SUPER(a) NEW_NODE(NODE_SUPER,0,0,a)
-#define NEW_ZSUPER() NEW_NODE(NODE_ZSUPER,0,0,0)
-#define NEW_ARGS(f,o,r) NEW_NODE(NODE_ARGS,o,r,f)
-#define NEW_ARGSCAT(a,b) NEW_NODE(NODE_ARGSCAT,a,b,0)
-#define NEW_ARGSPUSH(a,b) NEW_NODE(NODE_ARGSPUSH,a,b,0)
-#define NEW_SPLAT(a) NEW_NODE(NODE_SPLAT,a,0,0)
-#define NEW_TO_ARY(a) NEW_NODE(NODE_TO_ARY,a,0,0)
-#define NEW_SVALUE(a) NEW_NODE(NODE_SVALUE,a,0,0)
-#define NEW_BLOCK_ARG(v) NEW_NODE(NODE_BLOCK_ARG,v,0,local_cnt(v))
-#define NEW_BLOCK_PASS(b) NEW_NODE(NODE_BLOCK_PASS,0,b,0)
-#define NEW_ALIAS(n,o) NEW_NODE(NODE_ALIAS,o,n,0)
-#define NEW_VALIAS(n,o) NEW_NODE(NODE_VALIAS,o,n,0)
-#define NEW_UNDEF(i) NEW_NODE(NODE_UNDEF,0,i,0)
-#define NEW_CLASS(n,b,s) NEW_NODE(NODE_CLASS,n,NEW_SCOPE(b),(s))
-#define NEW_SCLASS(r,b) NEW_NODE(NODE_SCLASS,r,NEW_SCOPE(b),0)
-#define NEW_MODULE(n,b) NEW_NODE(NODE_MODULE,n,NEW_SCOPE(b),0)
-#define NEW_COLON2(c,i) NEW_NODE(NODE_COLON2,c,i,0)
-#define NEW_COLON3(i) NEW_NODE(NODE_COLON3,0,i,0)
-#define NEW_CREF(c) (NEW_NODE(NODE_CREF,0,0,c))
-#define NEW_DOT2(b,e) NEW_NODE(NODE_DOT2,b,e,0)
-#define NEW_DOT3(b,e) NEW_NODE(NODE_DOT3,b,e,0)
-#define NEW_ATTRSET(a) NEW_NODE(NODE_ATTRSET,a,0,0)
-#define NEW_SELF() NEW_NODE(NODE_SELF,0,0,0)
-#define NEW_NIL() NEW_NODE(NODE_NIL,0,0,0)
-#define NEW_TRUE() NEW_NODE(NODE_TRUE,0,0,0)
-#define NEW_FALSE() NEW_NODE(NODE_FALSE,0,0,0)
-#define NEW_DEFINED(e) NEW_NODE(NODE_DEFINED,e,0,0)
-#define NEW_NEWLINE(n) NEW_NODE(NODE_NEWLINE,0,0,n)
-#define NEW_PREEXE(b) NEW_SCOPE(b)
-#define NEW_POSTEXE() NEW_NODE(NODE_POSTEXE,0,0,0)
-#define NEW_DMETHOD(b) NEW_NODE(NODE_DMETHOD,0,0,b)
-#define NEW_BMETHOD(b) NEW_NODE(NODE_BMETHOD,0,0,b)
-#define NEW_ATTRASGN(r,m,a) NEW_NODE(NODE_ATTRASGN,r,m,a)
-
-#define NOEX_PUBLIC    0
-#define NOEX_NOSUPER   1
-#define NOEX_PRIVATE   2
-#define NOEX_PROTECTED 4 
-#define NOEX_MASK      6 
-
-#define NOEX_UNDEF     NOEX_NOSUPER
-
-NODE *rb_compile_cstr _((const char*, const char*, int, int));
-NODE *rb_compile_string _((const char*, VALUE, int));
-NODE *rb_compile_file _((const char*, VALUE, int));
-
-void rb_add_method _((VALUE, ID, NODE *, int));
-NODE *rb_node_newnode _((enum node_type,VALUE,VALUE,VALUE));
-
-NODE* rb_method_node _((VALUE klass, ID id));
-
-struct global_entry *rb_global_entry _((ID));
-VALUE rb_gvar_get _((struct global_entry *));
-VALUE rb_gvar_set _((struct global_entry *, VALUE));
-VALUE rb_gvar_defined _((struct global_entry *));
-
-typedef unsigned int rb_event_t;
-
-#define RUBY_EVENT_NONE     0x00
-#define RUBY_EVENT_LINE     0x01
-#define RUBY_EVENT_CLASS    0x02
-#define RUBY_EVENT_END      0x04
-#define RUBY_EVENT_CALL     0x08
-#define RUBY_EVENT_RETURN   0x10
-#define RUBY_EVENT_C_CALL   0x20
-#define RUBY_EVENT_C_RETURN 0x40
-#define RUBY_EVENT_RAISE    0x80
-#define RUBY_EVENT_ALL      0xff
-
-typedef void (*rb_event_hook_func_t) _((rb_event_t,NODE*,VALUE,ID,VALUE));
-void rb_add_event_hook _((rb_event_hook_func_t,rb_event_t));
-int rb_remove_event_hook _((rb_event_hook_func_t));
-
-#if defined(__cplusplus)
-}  /* extern "C" { */
-#endif
-
-#endif