ruby-changes:7977
From: ko1 <ko1@a...>
Date: Wed, 24 Sep 2008 04:52:54 +0900 (JST)
Subject: [ruby-changes:7977] Ruby:r19500 (trunk): * include/ruby/node.h, node.h: move node.h from include path.
ko1 2008-09-24 04:52:31 +0900 (Wed, 24 Sep 2008) New Revision: 19500 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=19500 Log: * include/ruby/node.h, node.h: move node.h from include path. This change stop to install node.h beacuase of saving ABI (node.h will be changed. Extensions should not depends on this file). * blockinlining.c, class.c, compile.c, debug.h, enum.c, gc.c, iseq.c, parse.y, ruby.c, signal.c, variable.c, vm.c, vm_core.h, vm_dump.c: ditto. * ext/ripper/depend: ditto. Added files: trunk/node.h Removed files: trunk/include/ruby/node.h Modified files: trunk/ChangeLog trunk/blockinlining.c trunk/class.c trunk/compile.c trunk/debug.h trunk/enum.c trunk/ext/ripper/depend trunk/gc.c trunk/iseq.c trunk/parse.y trunk/ruby.c trunk/signal.c trunk/variable.c trunk/vm.c trunk/vm_core.h trunk/vm_dump.c Index: debug.h =================================================================== --- debug.h (revision 19499) +++ debug.h (revision 19500) @@ -13,7 +13,7 @@ #define RUBY_DEBUG_H #include "ruby/ruby.h" -#include "ruby/node.h" +#include "node.h" #define dpv(h,v) ruby_debug_print_value(-1, 0, h, v) #define dp(v) ruby_debug_print_value(-1, 0, "", v) Index: include/ruby/node.h =================================================================== --- include/ruby/node.h (revision 19499) +++ include/ruby/node.h (revision 19500) @@ -1,516 +0,0 @@ -/********************************************************************** - - node.h - - - $Author$ - created at: Fri May 28 15:14:02 JST 1993 - - Copyright (C) 1993-2007 Yukihiro Matsumoto - -**********************************************************************/ - -#ifndef RUBY_NODE_H -#define RUBY_NODE_H 1 - -#if defined(__cplusplus) -extern "C" { -#if 0 -} /* satisfy cc-mode */ -#endif -#endif - -enum node_type { - NODE_METHOD, -#define NODE_METHOD NODE_METHOD - NODE_FBODY, -#define NODE_FBODY NODE_FBODY - NODE_CFUNC, -#define NODE_CFUNC NODE_CFUNC - NODE_SCOPE, -#define NODE_SCOPE NODE_SCOPE - NODE_BLOCK, -#define NODE_BLOCK NODE_BLOCK - NODE_IF, -#define NODE_IF NODE_IF - NODE_CASE, -#define NODE_CASE NODE_CASE - NODE_WHEN, -#define NODE_WHEN NODE_WHEN - NODE_OPT_N, -#define NODE_OPT_N NODE_OPT_N - NODE_WHILE, -#define NODE_WHILE NODE_WHILE - NODE_UNTIL, -#define NODE_UNTIL NODE_UNTIL - NODE_ITER, -#define NODE_ITER NODE_ITER - NODE_FOR, -#define NODE_FOR NODE_FOR - NODE_BREAK, -#define NODE_BREAK NODE_BREAK - NODE_NEXT, -#define NODE_NEXT NODE_NEXT - NODE_REDO, -#define NODE_REDO NODE_REDO - NODE_RETRY, -#define NODE_RETRY NODE_RETRY - NODE_BEGIN, -#define NODE_BEGIN NODE_BEGIN - NODE_RESCUE, -#define NODE_RESCUE NODE_RESCUE - NODE_RESBODY, -#define NODE_RESBODY NODE_RESBODY - NODE_ENSURE, -#define NODE_ENSURE NODE_ENSURE - NODE_AND, -#define NODE_AND NODE_AND - NODE_OR, -#define NODE_OR NODE_OR - NODE_MASGN, -#define NODE_MASGN NODE_MASGN - NODE_LASGN, -#define NODE_LASGN NODE_LASGN - NODE_DASGN, -#define NODE_DASGN NODE_DASGN - NODE_DASGN_CURR, -#define NODE_DASGN_CURR NODE_DASGN_CURR - NODE_GASGN, -#define NODE_GASGN NODE_GASGN - NODE_IASGN, -#define NODE_IASGN NODE_IASGN - NODE_IASGN2, -#define NODE_IASGN2 NODE_IASGN2 - NODE_CDECL, -#define NODE_CDECL NODE_CDECL - NODE_CVASGN, -#define NODE_CVASGN NODE_CVASGN - NODE_CVDECL, -#define NODE_CVDECL NODE_CVDECL - NODE_OP_ASGN1, -#define NODE_OP_ASGN1 NODE_OP_ASGN1 - NODE_OP_ASGN2, -#define NODE_OP_ASGN2 NODE_OP_ASGN2 - NODE_OP_ASGN_AND, -#define NODE_OP_ASGN_AND NODE_OP_ASGN_AND - NODE_OP_ASGN_OR, -#define NODE_OP_ASGN_OR NODE_OP_ASGN_OR - NODE_CALL, -#define NODE_CALL NODE_CALL - NODE_FCALL, -#define NODE_FCALL NODE_FCALL - NODE_VCALL, -#define NODE_VCALL NODE_VCALL - NODE_SUPER, -#define NODE_SUPER NODE_SUPER - NODE_ZSUPER, -#define NODE_ZSUPER NODE_ZSUPER - NODE_ARRAY, -#define NODE_ARRAY NODE_ARRAY - NODE_ZARRAY, -#define NODE_ZARRAY NODE_ZARRAY - NODE_VALUES, -#define NODE_VALUES NODE_VALUES - NODE_HASH, -#define NODE_HASH NODE_HASH - NODE_RETURN, -#define NODE_RETURN NODE_RETURN - NODE_YIELD, -#define NODE_YIELD NODE_YIELD - NODE_LVAR, -#define NODE_LVAR NODE_LVAR - NODE_DVAR, -#define NODE_DVAR NODE_DVAR - NODE_GVAR, -#define NODE_GVAR NODE_GVAR - NODE_IVAR, -#define NODE_IVAR NODE_IVAR - NODE_CONST, -#define NODE_CONST NODE_CONST - NODE_CVAR, -#define NODE_CVAR NODE_CVAR - NODE_NTH_REF, -#define NODE_NTH_REF NODE_NTH_REF - NODE_BACK_REF, -#define NODE_BACK_REF NODE_BACK_REF - NODE_MATCH, -#define NODE_MATCH NODE_MATCH - NODE_MATCH2, -#define NODE_MATCH2 NODE_MATCH2 - NODE_MATCH3, -#define NODE_MATCH3 NODE_MATCH3 - NODE_LIT, -#define NODE_LIT NODE_LIT - NODE_STR, -#define NODE_STR NODE_STR - NODE_DSTR, -#define NODE_DSTR NODE_DSTR - NODE_XSTR, -#define NODE_XSTR NODE_XSTR - NODE_DXSTR, -#define NODE_DXSTR NODE_DXSTR - NODE_EVSTR, -#define NODE_EVSTR NODE_EVSTR - NODE_DREGX, -#define NODE_DREGX NODE_DREGX - NODE_DREGX_ONCE, -#define NODE_DREGX_ONCE NODE_DREGX_ONCE - NODE_ARGS, -#define NODE_ARGS NODE_ARGS - NODE_ARGS_AUX, -#define NODE_ARGS_AUX NODE_ARGS_AUX - NODE_OPT_ARG, -#define NODE_OPT_ARG NODE_OPT_ARG - NODE_POSTARG, -#define NODE_POSTARG NODE_POSTARG - NODE_ARGSCAT, -#define NODE_ARGSCAT NODE_ARGSCAT - NODE_ARGSPUSH, -#define NODE_ARGSPUSH NODE_ARGSPUSH - NODE_SPLAT, -#define NODE_SPLAT NODE_SPLAT - NODE_TO_ARY, -#define NODE_TO_ARY NODE_TO_ARY - NODE_BLOCK_ARG, -#define NODE_BLOCK_ARG NODE_BLOCK_ARG - NODE_BLOCK_PASS, -#define NODE_BLOCK_PASS NODE_BLOCK_PASS - NODE_DEFN, -#define NODE_DEFN NODE_DEFN - NODE_DEFS, -#define NODE_DEFS NODE_DEFS - NODE_ALIAS, -#define NODE_ALIAS NODE_ALIAS - NODE_VALIAS, -#define NODE_VALIAS NODE_VALIAS - NODE_UNDEF, -#define NODE_UNDEF NODE_UNDEF - NODE_CLASS, -#define NODE_CLASS NODE_CLASS - NODE_MODULE, -#define NODE_MODULE NODE_MODULE - NODE_SCLASS, -#define NODE_SCLASS NODE_SCLASS - NODE_COLON2, -#define NODE_COLON2 NODE_COLON2 - NODE_COLON3, -#define NODE_COLON3 NODE_COLON3 - NODE_DOT2, -#define NODE_DOT2 NODE_DOT2 - NODE_DOT3, -#define NODE_DOT3 NODE_DOT3 - NODE_FLIP2, -#define NODE_FLIP2 NODE_FLIP2 - NODE_FLIP3, -#define NODE_FLIP3 NODE_FLIP3 - NODE_ATTRSET, -#define NODE_ATTRSET NODE_ATTRSET - NODE_SELF, -#define NODE_SELF NODE_SELF - NODE_NIL, -#define NODE_NIL NODE_NIL - NODE_TRUE, -#define NODE_TRUE NODE_TRUE - NODE_FALSE, -#define NODE_FALSE NODE_FALSE - NODE_ERRINFO, -#define NODE_ERRINFO NODE_ERRINFO - NODE_DEFINED, -#define NODE_DEFINED NODE_DEFINED - NODE_POSTEXE, -#define NODE_POSTEXE NODE_POSTEXE - NODE_ALLOCA, -#define NODE_ALLOCA NODE_ALLOCA - NODE_BMETHOD, -#define NODE_BMETHOD NODE_BMETHOD - NODE_MEMO, -#define NODE_MEMO NODE_MEMO - NODE_IFUNC, -#define NODE_IFUNC NODE_IFUNC - NODE_DSYM, -#define NODE_DSYM NODE_DSYM - NODE_ATTRASGN, -#define NODE_ATTRASGN NODE_ATTRASGN - NODE_PRELUDE, -#define NODE_PRELUDE NODE_PRELUDE - NODE_LAMBDA, -#define NODE_LAMBDA NODE_LAMBDA - NODE_OPTBLOCK, -#define NODE_OPTBLOCK NODE_OPTBLOCK - NODE_LAST -#define NODE_LAST 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)) - -/* 0..4:T_TYPES, 5:FL_MARK, 6:reserved, 7:NODE_FL_NEWLINE */ -#define NODE_FL_NEWLINE (((VALUE)1)<<7) - -#define NODE_TYPESHIFT 8 -#define NODE_TYPEMASK (((VALUE)0x7f)<<NODE_TYPESHIFT) - -#define nd_type(n) ((int) (((RNODE(n))->flags & NODE_TYPEMASK)>>NODE_TYPESHIFT)) -#define nd_set_type(n,t) \ - RNODE(n)->flags=((RNODE(n)->flags&~NODE_TYPEMASK)|(((t)<<NODE_TYPESHIFT)&NODE_TYPEMASK)) - -#define NODE_LSHIFT (NODE_TYPESHIFT+7) -#define NODE_LMASK (((SIGNED_VALUE)1<<(sizeof(VALUE)*CHAR_BIT-NODE_LSHIFT))-1) -#define nd_line(n) ((VALUE)(((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_oid u1.id -#define nd_cnt u3.cnt -#define nd_tbl u1.tbl - -#define nd_var u1.node -#define nd_iter u3.node - -#define nd_value u2.node -#define nd_aid u3.id - -#define nd_lit u1.value - -#define nd_frml u2.argc -#define nd_rest u1.id -#define nd_opt u1.node -#define nd_pid u1.id -#define nd_plen u2.argc - -#define nd_recv u1.node -#define nd_mid u2.id -#define nd_args u3.node - -#define nd_noex u3.id -#define nd_defn u3.node - -#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 nd_visi u2.argc - -#define NEW_NODE(t,a0,a1,a2) rb_node_newnode((t),(VALUE)(a0),(VALUE)(a1),(VALUE)(a2)) - -#define NEW_METHOD(n,x,v) NEW_NODE(NODE_METHOD,x,n,v) -#define NEW_FBODY(n,i) NEW_NODE(NODE_FBODY,i,n,0) -#define NEW_DEFN(i,a,d,p) NEW_NODE(NODE_DEFN,0,i,NEW_SCOPE(a,d)) -#define NEW_DEFS(r,i,a,d) NEW_NODE(NODE_DEFS,r,i,NEW_SCOPE(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_SCOPE(a,b) NEW_NODE(NODE_SCOPE,local_tbl(),b,a) -#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(a,b) NEW_NODE(NODE_ITER,0,NEW_SCOPE(a,b),0) -#define NEW_LAMBDA(a) NEW_NODE(NODE_LAMBDA,a,0,0) -#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_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,0) -#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_IASGN2(v,val) NEW_NODE(NODE_IASGN2,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,0) -#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,0) -#define NEW_BACK_REF(n) NEW_NODE(NODE_BACK_REF,0,n,0) -#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(m,o) NEW_NODE(NODE_ARGS,o,m,0) -#define NEW_ARGS_AUX(r,b) NEW_NODE(NODE_ARGS_AUX,r,b,0) -#define NEW_OPT_ARG(i,v) NEW_NODE(NODE_OPT_ARG,i,v,0) -#define NEW_POSTARG(i,v) NEW_NODE(NODE_POSTARG,i,v,0) -#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_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,n,o,0) -#define NEW_VALIAS(n,o) NEW_NODE(NODE_VALIAS,n,o,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(0,b),(s)) -#define NEW_SCLASS(r,b) NEW_NODE(NODE_SCLASS,r,NEW_SCOPE(0,b),0) -#define NEW_MODULE(n,b) NEW_NODE(NODE_MODULE,n,NEW_SCOPE(0,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_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_ERRINFO() NEW_NODE(NODE_ERRINFO,0,0,0) -#define NEW_DEFINED(e) NEW_NODE(NODE_DEFINED,e,0,0) -#define NEW_PREEXE(b) NEW_SCOPE(b) -#define NEW_POSTEXE(b) NEW_NODE(NODE_POSTEXE,0,b,0) -#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 NEW_PRELUDE(p,b) NEW_NODE(NODE_PRELUDE,p,b,0) -#define NEW_OPTBLOCK(a) NEW_NODE(NODE_OPTBLOCK,a,0,0) - -#define NOEX_PUBLIC 0x00 -#define NOEX_NOSUPER 0x01 -#define NOEX_PRIVATE 0x02 -#define NOEX_PROTECTED 0x04 -#define NOEX_MASK 0x06 /* 0110 */ -#define NOEX_BASIC 0x08 - -#define NOEX_UNDEF NOEX_NOSUPER - -#define NOEX_MODFUNC 0x10 -#define NOEX_SUPER 0x20 -#define NOEX_VCALL 0x40 - -#define NOEX_SAFE(n) (((n) >> 8) & 0x0F) -#define NOEX_WITH(n, s) ((s << 8) | (n) | (ruby_running ? 0 : NOEX_BASIC)) -#define NOEX_WITH_SAFE(n) NOEX_WITH(n, rb_safe_level()) - -#define CALL_PUBLIC 0 -#define CALL_FCALL 1 -#define CALL_VCALL 2 -#define CALL_SUPER 3 - -#define RUBY_VM_METHOD_NODE NODE_METHOD - -VALUE rb_parser_new(void); -VALUE rb_parser_end_seen_p(VALUE); -VALUE rb_parser_encoding(VALUE); - -NODE *rb_parser_compile_cstr(volatile VALUE, const char*, const char*, int, int); -NODE *rb_parser_compile_string(volatile VALUE, const char*, VALUE, int); -NODE *rb_parser_compile_file(volatile VALUE, const char*, VALUE, int); - -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); -int rb_node_arity(NODE* node); - -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 *); - -#if defined(__cplusplus) -#if 0 -{ /* satisfy cc-mode */ -#endif -} /* extern "C" { */ -#endif - -#endif /* RUBY_NODE_H */ Index: ChangeLog =================================================================== --- ChangeLog (revision 19499) +++ ChangeLog (revision 19500) @@ -1,3 +1,16 @@ +Wed Sep 24 04:45:35 2008 Koichi Sasada <ko1@a...> + + * include/ruby/node.h, node.h: move node.h from include path. + This change stop to install node.h beacuase of saving ABI + (node.h will be changed. Extensions should not depends on + this file). + + * blockinlining.c, class.c, compile.c, debug.h, enum.c, + gc.c, iseq.c, parse.y, ruby.c, signal.c, variable.c, + vm.c, vm_core.h, vm_dump.c: ditto. + + * ext/ripper/depend: ditto. + Wed Sep 24 04:09:13 2008 Koichi Sasada <ko1@a...> * vm_core.h: remove unused frame values. Index: variable.c =================================================================== --- variable.c (revision 19499) +++ variable.c (revision 19500) @@ -12,9 +12,9 @@ **********************************************************************/ #include "ruby/ruby.h" -#include "ruby/node.h" #include "ruby/st.h" #include "ruby/util.h" +#include "node.h" void rb_vm_change_state(void); st_table *rb_global_tbl; Index: vm_core.h =================================================================== --- vm_core.h (revision 19499) +++ vm_core.h (revision 19500) @@ -19,8 +19,8 @@ #include "ruby/ruby.h" #include "ruby/vm.h" #include "ruby/st.h" -#include "ruby/node.h" +#include "node.h" #include "debug.h" #include "vm_opts.h" #include "id.h" Index: iseq.c =================================================================== --- iseq.c (revision 19499) +++ iseq.c (revision 19500) @@ -10,7 +10,6 @@ **********************************************************************/ #include "ruby/ruby.h" -#include "ruby/node.h" /* #define MARK_FREE_DEBUG 1 */ #include "gc.h" Index: enum.c =================================================================== --- enum.c (revision 19499) +++ enum.c (revision 19500) @@ -10,8 +10,8 @@ **********************************************************************/ #include "ruby/ruby.h" -#include "ruby/node.h" #include "ruby/util.h" +#include "node.h" VALUE rb_mEnumerable; static ID id_each, id_eqq, id_cmp, id_next, id_size; Index: compile.c =================================================================== --- compile.c (revision 19499) +++ compile.c (revision 19500) @@ -10,7 +10,6 @@ **********************************************************************/ #include "ruby/ruby.h" -#include "ruby/node.h" #define USE_INSN_STACK_INCREASE 1 #include "vm_core.h" Index: gc.c =================================================================== --- gc.c (revision 19499) +++ gc.c (revision 19500) @@ -13,7 +13,6 @@ #include "ruby/ruby.h" #include "ruby/st.h" -#include "ruby/node.h" #include "ruby/re.h" #include "ruby/io.h" #include "ruby/util.h" Index: parse.y =================================================================== --- parse.y (revision 19499) +++ parse.y (revision 19500) @@ -16,9 +16,9 @@ #define YYSTACK_USE_ALLOCA 0 #include "ruby/ruby.h" -#include "ruby/node.h" #include "ruby/st.h" #include "ruby/encoding.h" +#include "node.h" #include "id.h" #include "regenc.h" #include <stdio.h> Index: class.c =================================================================== --- class.c (revision 19499) +++ class.c (revision 19500) @@ -10,8 +10,8 @@ **********************************************************************/ #include "ruby/ruby.h" -#include "ruby/node.h" #include "ruby/st.h" +#include "node.h" #include <ctype.h> extern st_table *rb_class_tbl; Index: ext/ripper/depend =================================================================== --- ext/ripper/depend (revision 19499) +++ ext/ripper/depend (revision 19500) @@ -9,7 +9,7 @@ $(hdrdir)/ruby/ruby.h $(arch_hdrdir)/ruby/config.h \ $(hdrdir)/ruby/defines.h $(hdrdir)/ruby/intern.h \ $(hdrdir)/ruby/encoding.h $(hdrdir)/missing.h \ - $(hdrdir)/node.h $(hdrdir)/oniguruma.h \ + $(hdrdir)/../node.h $(hdrdir)/oniguruma.h \ $(hdrdir)/regex.h $(hdrdir)/st.h $(hdrdir)/util.h .y.c: Index: blockinlining.c =================================================================== --- blockinlining.c (revision 19499) +++ blockinlining.c (revision 19500) @@ -9,7 +9,6 @@ **********************************************************************/ #include "ruby/ruby.h" -#include "ruby/node.h" #include "vm_core.h" static VALUE Index: vm.c =================================================================== --- vm.c (revision 19499) +++ vm.c (revision 19500) @@ -9,7 +9,6 @@ **********************************************************************/ #include "ruby/ruby.h" -#include "ruby/node.h" #include "ruby/st.h" #include "ruby/encoding.h" Index: vm_dump.c =================================================================== --- vm_dump.c (revision 19499) +++ vm_dump.c (revision 19500) @@ -10,7 +10,6 @@ #include "ruby/ruby.h" -#include "ruby/node.h" #include "vm_core.h" #define MAX_POSBUF 128 Index: ruby.c =================================================================== --- ruby.c (revision 19499) +++ ruby.c (revision 19500) @@ -20,7 +20,6 @@ #include "ruby/wince.h" #endif #include "ruby/ruby.h" -#include "ruby/node.h" #include "ruby/encoding.h" #include "eval_intern.h" #include "dln.h" Index: signal.c =================================================================== --- signal.c (revision 19499) +++ signal.c (revision 19500) @@ -12,7 +12,6 @@ **********************************************************************/ #include "ruby/ruby.h" -#include "ruby/node.h" #include "vm_core.h" #include <signal.h> #include <stdio.h> Index: node.h =================================================================== --- node.h (revision 0) +++ node.h (revision 19500) @@ -0,0 +1,516 @@ +/********************************************************************** + + node.h - + + $Author$ + created at: Fri May 28 15:14:02 JST 1993 + + Copyright (C) 1993-2007 Yukihiro Matsumoto + +**********************************************************************/ + +#ifndef RUBY_NODE_H +#define RUBY_NODE_H 1 + +#if defined(__cplusplus) +extern "C" { +#if 0 +} /* satisfy cc-mode */ +#endif +#endif + +enum node_type { + NODE_METHOD, +#define NODE_METHOD NODE_METHOD + NODE_FBODY, +#define NODE_FBODY NODE_FBODY + NODE_CFUNC, +#define NODE_CFUNC NODE_CFUNC + NODE_SCOPE, +#define NODE_SCOPE NODE_SCOPE + NODE_BLOCK, +#define NODE_BLOCK NODE_BLOCK + NODE_IF, +#define NODE_IF NODE_IF + NODE_CASE, +#define NODE_CASE NODE_CASE + NODE_WHEN, +#define NODE_WHEN NODE_WHEN + NODE_OPT_N, +#define NODE_OPT_N NODE_OPT_N + NODE_WHILE, +#define NODE_WHILE NODE_WHILE + NODE_UNTIL, +#define NODE_UNTIL NODE_UNTIL + NODE_ITER, +#define NODE_ITER NODE_ITER + NODE_FOR, +#define NODE_FOR NODE_FOR + NODE_BREAK, +#define NODE_BREAK NODE_BREAK + NODE_NEXT, +#define NODE_NEXT NODE_NEXT + NODE_REDO, +#define NODE_REDO NODE_REDO + NODE_RETRY, +#define NODE_RETRY NODE_RETRY + NODE_BEGIN, +#define NODE_BEGIN NODE_BEGIN + NODE_RESCUE, +#define NODE_RESCUE NODE_RESCUE + NODE_RESBODY, +#define NODE_RESBODY NODE_RESBODY + NODE_ENSURE, +#define NODE_ENSURE NODE_ENSURE + NODE_AND, +#define NODE_AND NODE_AND + NODE_OR, +#define NODE_OR NODE_OR + NODE_MASGN, +#define NODE_MASGN NODE_MASGN + NODE_LASGN, +#define NODE_LASGN NODE_LASGN + NODE_DASGN, +#define NODE_DASGN NODE_DASGN + NODE_DASGN_CURR, +#define NODE_DASGN_CURR NODE_DASGN_CURR + NODE_GASGN, +#define NODE_GASGN NODE_GASGN + NODE_IASGN, +#define NODE_IASGN NODE_IASGN + NODE_IASGN2, +#define NODE_IASGN2 NODE_IASGN2 + NODE_CDECL, +#define NODE_CDECL NODE_CDECL + NODE_CVASGN, +#define NODE_CVASGN NODE_CVASGN + NODE_CVDECL, +#define NODE_CVDECL NODE_CVDECL + NODE_OP_ASGN1, +#define NODE_OP_ASGN1 NODE_OP_ASGN1 + NODE_OP_ASGN2, +#define NODE_OP_ASGN2 NODE_OP_ASGN2 + NODE_OP_ASGN_AND, +#define NODE_OP_ASGN_AND NODE_OP_ASGN_AND + NODE_OP_ASGN_OR, +#define NODE_OP_ASGN_OR NODE_OP_ASGN_OR + NODE_CALL, +#define NODE_CALL NODE_CALL + NODE_FCALL, +#define NODE_FCALL NODE_FCALL + NODE_VCALL, +#define NODE_VCALL NODE_VCALL + NODE_SUPER, +#define NODE_SUPER NODE_SUPER + NODE_ZSUPER, +#define NODE_ZSUPER NODE_ZSUPER + NODE_ARRAY, +#define NODE_ARRAY NODE_ARRAY + NODE_ZARRAY, +#define NODE_ZARRAY NODE_ZARRAY + NODE_VALUES, +#define NODE_VALUES NODE_VALUES + NODE_HASH, +#define NODE_HASH NODE_HASH + NODE_RETURN, +#define NODE_RETURN NODE_RETURN + NODE_YIELD, +#define NODE_YIELD NODE_YIELD + NODE_LVAR, +#define NODE_LVAR NODE_LVAR + NODE_DVAR, +#define NODE_DVAR NODE_DVAR + NODE_GVAR, +#define NODE_GVAR NODE_GVAR + NODE_IVAR, +#define NODE_IVAR NODE_IVAR + NODE_CONST, +#define NODE_CONST NODE_CONST + NODE_CVAR, +#define NODE_CVAR NODE_CVAR + NODE_NTH_REF, +#define NODE_NTH_REF NODE_NTH_REF + NODE_BACK_REF, +#define NODE_BACK_REF NODE_BACK_REF + NODE_MATCH, +#define NODE_MATCH NODE_MATCH + NODE_MATCH2, +#define NODE_MATCH2 NODE_MATCH2 + NODE_MATCH3, +#define NODE_MATCH3 NODE_MATCH3 + NODE_LIT, +#define NODE_LIT NODE_LIT + NODE_STR, +#define NODE_STR NODE_STR + NODE_DSTR, +#define NODE_DSTR NODE_DSTR + NODE_XSTR, +#define NODE_XSTR NODE_XSTR + NODE_DXSTR, +#define NODE_DXSTR NODE_DXSTR + NODE_EVSTR, +#define NODE_EVSTR NODE_EVSTR + NODE_DREGX, +#define NODE_DREGX NODE_DREGX + NODE_DREGX_ONCE, +#define NODE_DREGX_ONCE NODE_DREGX_ONCE + NODE_ARGS, +#define NODE_ARGS NODE_ARGS + NODE_ARGS_AUX, +#define NODE_ARGS_AUX NODE_ARGS_AUX + NODE_OPT_ARG, +#define NODE_OPT_ARG NODE_OPT_ARG + NODE_POSTARG, +#define NODE_POSTARG NODE_POSTARG + NODE_ARGSCAT, +#define NODE_ARGSCAT NODE_ARGSCAT + NODE_ARGSPUSH, +#define NODE_ARGSPUSH NODE_ARGSPUSH + NODE_SPLAT, +#define NODE_SPLAT NODE_SPLAT + NODE_TO_ARY, +#define NODE_TO_ARY NODE_TO_ARY + NODE_BLOCK_ARG, +#define NODE_BLOCK_ARG NODE_BLOCK_ARG + NODE_BLOCK_PASS, +#define NODE_BLOCK_PASS NODE_BLOCK_PASS + NODE_DEFN, +#define NODE_DEFN NODE_DEFN + NODE_DEFS, +#define NODE_DEFS NODE_DEFS + NODE_ALIAS, +#define NODE_ALIAS NODE_ALIAS + NODE_VALIAS, +#define NODE_VALIAS NODE_VALIAS + NODE_UNDEF, +#define NODE_UNDEF NODE_UNDEF + NODE_CLASS, +#define NODE_CLASS NODE_CLASS + NODE_MODULE, +#define NODE_MODULE NODE_MODULE + NODE_SCLASS, +#define NODE_SCLASS NODE_SCLASS + NODE_COLON2, +#define NODE_COLON2 NODE_COLON2 + NODE_COLON3, +#define NODE_COLON3 NODE_COLON3 + NODE_DOT2, +#define NODE_DOT2 NODE_DOT2 + NODE_DOT3, +#define NODE_DOT3 NODE_DOT3 + NODE_FLIP2, +#define NODE_FLIP2 NODE_FLIP2 + NODE_FLIP3, +#define NODE_FLIP3 NODE_FLIP3 + NODE_ATTRSET, +#define NODE_ATTRSET NODE_ATTRSET + NODE_SELF, +#define NODE_SELF NODE_SELF + NODE_NIL, +#define NODE_NIL NODE_NIL + NODE_TRUE, +#define NODE_TRUE NODE_TRUE + NODE_FALSE, +#define NODE_FALSE NODE_FALSE + NODE_ERRINFO, +#define NODE_ERRINFO NODE_ERRINFO + NODE_DEFINED, +#define NODE_DEFINED NODE_DEFINED + NODE_POSTEXE, +#define NODE_POSTEXE NODE_POSTEXE + NODE_ALLOCA, +#define NODE_ALLOCA NODE_ALLOCA + NODE_BMETHOD, +#define NODE_BMETHOD NODE_BMETHOD + NODE_MEMO, +#define NODE_MEMO NODE_MEMO + NODE_IFUNC, +#define NODE_IFUNC NODE_IFUNC + NODE_DSYM, +#define NODE_DSYM NODE_DSYM + NODE_ATTRASGN, +#define NODE_ATTRASGN NODE_ATTRASGN + NODE_PRELUDE, +#define NODE_PRELUDE NODE_PRELUDE + NODE_LAMBDA, +#define NODE_LAMBDA NODE_LAMBDA + NODE_OPTBLOCK, +#define NODE_OPTBLOCK NODE_OPTBLOCK + NODE_LAST +#define NODE_LAST 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)) + +/* 0..4:T_TYPES, 5:FL_MARK, 6:reserved, 7:NODE_FL_NEWLINE */ +#define NODE_FL_NEWLINE (((VALUE)1)<<7) + +#define NODE_TYPESHIFT 8 +#define NODE_TYPEMASK (((VALUE)0x7f)<<NODE_TYPESHIFT) + +#define nd_type(n) ((int) (((RNODE(n))->flags & NODE_TYPEMASK)>>NODE_TYPESHIFT)) +#define nd_set_type(n,t) \ + RNODE(n)->flags=((RNODE(n)->flags&~NODE_TYPEMASK)|(((t)<<NODE_TYPESHIFT)&NODE_TYPEMASK)) + +#define NODE_LSHIFT (NODE_TYPESHIFT+7) +#define NODE_LMASK (((SIGNED_VALUE)1<<(sizeof(VALUE)*CHAR_BIT-NODE_LSHIFT))-1) +#define nd_line(n) ((VALUE)(((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_oid u1.id +#define nd_cnt u3.cnt +#define nd_tbl u1.tbl + +#define nd_var u1.node +#define nd_iter u3.node + +#define nd_value u2.node +#define nd_aid u3.id + +#define nd_lit u1.value + +#define nd_frml u2.argc +#define nd_rest u1.id +#define nd_opt u1.node +#define nd_pid u1.id +#define nd_plen u2.argc + +#define nd_recv u1.node +#define nd_mid u2.id +#define nd_args u3.node + +#define nd_noex u3.id +#define nd_defn u3.node + +#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 nd_visi u2.argc + +#define NEW_NODE(t,a0,a1,a2) rb_node_newnode((t),(VALUE)(a0),(VALUE)(a1),(VALUE)(a2)) + +#define NEW_METHOD(n,x,v) NEW_NODE(NODE_METHOD,x,n,v) +#define NEW_FBODY(n,i) NEW_NODE(NODE_FBODY,i,n,0) +#define NEW_DEFN(i,a,d,p) NEW_NODE(NODE_DEFN,0,i,NEW_SCOPE(a,d)) +#define NEW_DEFS(r,i,a,d) NEW_NODE(NODE_DEFS,r,i,NEW_SCOPE(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_SCOPE(a,b) NEW_NODE(NODE_SCOPE,local_tbl(),b,a) +#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(a,b) NEW_NODE(NODE_ITER,0,NEW_SCOPE(a,b),0) +#define NEW_LAMBDA(a) NEW_NODE(NODE_LAMBDA,a,0,0) +#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_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,0) +#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_IASGN2(v,val) NEW_NODE(NODE_IASGN2,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,0) +#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,0) +#define NEW_BACK_REF(n) NEW_NODE(NODE_BACK_REF,0,n,0) +#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(m,o) NEW_NODE(NODE_ARGS,o,m,0) +#define NEW_ARGS_AUX(r,b) NEW_NODE(NODE_ARGS_AUX,r,b,0) +#define NEW_OPT_ARG(i,v) NEW_NODE(NODE_OPT_ARG,i,v,0) +#define NEW_POSTARG(i,v) NEW_NODE(NODE_POSTARG,i,v,0) +#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_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,n,o,0) +#define NEW_VALIAS(n,o) NEW_NODE(NODE_VALIAS,n,o,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(0,b),(s)) +#define NEW_SCLASS(r,b) NEW_NODE(NODE_SCLASS,r,NEW_SCOPE(0,b),0) +#define NEW_MODULE(n,b) NEW_NODE(NODE_MODULE,n,NEW_SCOPE(0,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_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_ERRINFO() NEW_NODE(NODE_ERRINFO,0,0,0) +#define NEW_DEFINED(e) NEW_NODE(NODE_DEFINED,e,0,0) +#define NEW_PREEXE(b) NEW_SCOPE(b) +#define NEW_POSTEXE(b) NEW_NODE(NODE_POSTEXE,0,b,0) +#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 NEW_PRELUDE(p,b) NEW_NODE(NODE_PRELUDE,p,b,0) +#define NEW_OPTBLOCK(a) NEW_NODE(NODE_OPTBLOCK,a,0,0) + +#define NOEX_PUBLIC 0x00 +#define NOEX_NOSUPER 0x01 +#define NOEX_PRIVATE 0x02 +#define NOEX_PROTECTED 0x04 +#define NOEX_MASK 0x06 /* 0110 */ +#define NOEX_BASIC 0x08 + +#define NOEX_UNDEF NOEX_NOSUPER + +#define NOEX_MODFUNC 0x10 +#define NOEX_SUPER 0x20 +#define NOEX_VCALL 0x40 + +#define NOEX_SAFE(n) (((n) >> 8) & 0x0F) +#define NOEX_WITH(n, s) ((s << 8) | (n) | (ruby_running ? 0 : NOEX_BASIC)) +#define NOEX_WITH_SAFE(n) NOEX_WITH(n, rb_safe_level()) + +#define CALL_PUBLIC 0 +#define CALL_FCALL 1 +#define CALL_VCALL 2 +#define CALL_SUPER 3 + +#define RUBY_VM_METHOD_NODE NODE_METHOD + +VALUE rb_parser_new(void); +VALUE rb_parser_end_seen_p(VALUE); +VALUE rb_parser_encoding(VALUE); + +NODE *rb_parser_compile_cstr(volatile VALUE, const char*, const char*, int, int); +NODE *rb_parser_compile_string(volatile VALUE, const char*, VALUE, int); +NODE *rb_parser_compile_file(volatile VALUE, const char*, VALUE, int); + +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); +int rb_node_arity(NODE* node); + +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 *); + +#if defined(__cplusplus) +#if 0 +{ /* satisfy cc-mode */ +#endif +} /* extern "C" { */ +#endif + +#endif /* RUBY_NODE_H */ Property changes on: node.h ___________________________________________________________________ Name: svn:eol-style + LF Name: svn:keywords + Author Date Id Revision -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/