debase-ruby_core_source 0.10.14 → 0.10.17

data/lib/debase/ruby_core_source/{ruby-1.9.3-p550 → ruby-2.5.4-p155}/node.h

@@ -2,7 +2,7 @@
 
   node.h -
 
-  $Author: usa $
+  $Author: mame $
   created at: Fri May 28 15:14:02 JST 1993
 
   Copyright (C) 1993-2007 Yukihiro Matsumoto
@@ -26,12 +26,14 @@ enum node_type {
 #define NODE_BLOCK       NODE_BLOCK
     NODE_IF,
 #define NODE_IF          NODE_IF
+    NODE_UNLESS,
+#define NODE_UNLESS      NODE_UNLESS
     NODE_CASE,
 #define NODE_CASE        NODE_CASE
+    NODE_CASE2,
+#define NODE_CASE2       NODE_CASE2
     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,
@@ -72,14 +74,10 @@ enum node_type {
 #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,
@@ -88,12 +86,18 @@ enum node_type {
 #define NODE_OP_ASGN_AND NODE_OP_ASGN_AND
     NODE_OP_ASGN_OR,
 #define NODE_OP_ASGN_OR  NODE_OP_ASGN_OR
+    NODE_OP_CDECL,
+#define NODE_OP_CDECL    NODE_OP_CDECL
     NODE_CALL,
 #define NODE_CALL        NODE_CALL
+    NODE_OPCALL,
+#define NODE_OPCALL      NODE_OPCALL
     NODE_FCALL,
 #define NODE_FCALL       NODE_FCALL
     NODE_VCALL,
 #define NODE_VCALL       NODE_VCALL
+    NODE_QCALL,
+#define NODE_QCALL       NODE_QCALL
     NODE_SUPER,
 #define NODE_SUPER       NODE_SUPER
     NODE_ZSUPER,
@@ -146,14 +150,14 @@ enum node_type {
 #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_KW_ARG,
+#define NODE_KW_ARG	 NODE_KW_ARG
     NODE_POSTARG,
 #define NODE_POSTARG     NODE_POSTARG
     NODE_ARGSCAT,
@@ -162,10 +166,6 @@ enum node_type {
 #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,
@@ -210,14 +210,6 @@ enum node_type {
 #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,
@@ -226,15 +218,22 @@ enum node_type {
 #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 rb_code_location_struct {
+    int lineno;
+    int column;
+} rb_code_location_t;
+
+typedef struct rb_code_range_struct {
+    rb_code_location_t first_loc;
+    rb_code_location_t last_loc;
+} rb_code_range_t;
+
 typedef struct RNode {
     VALUE flags;
-    VALUE nd_reserved;		/* ex nd_file */
     union {
 	struct RNode *node;
 	ID id;
@@ -253,29 +252,46 @@ typedef struct RNode {
 	ID id;
 	long state;
 	struct rb_global_entry *entry;
+	struct rb_args_info *args;
 	long cnt;
 	VALUE value;
     } u3;
+    rb_code_range_t nd_loc;
 } 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_FL_CREF_PUSHED_BY_EVAL NODE_FL_NEWLINE
+/* FL     : 0..4: T_TYPES, 5: KEEP_WB, 6: PROMOTED, 7: FINALIZE, 8: TAINT, 9: UNTRUSTED, 10: EXIVAR, 11: FREEZE */
+/* NODE_FL: 0..4: T_TYPES, 5: KEEP_WB, 6: PROMOTED, 7: NODE_FL_NEWLINE,
+ *          8..14: nd_type,
+ *          15..: nd_line
+ */
+#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_type(n) ((int) (((n)->flags & NODE_TYPEMASK)>>NODE_TYPESHIFT))
 #define nd_set_type(n,t) \
-    RNODE(n)->flags=((RNODE(n)->flags&~NODE_TYPEMASK)|((((unsigned long)(t))<<NODE_TYPESHIFT)&NODE_TYPEMASK))
+    (n)->flags=(((n)->flags&~NODE_TYPEMASK)|((((unsigned long)(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) (int)(RNODE(n)->flags>>NODE_LSHIFT)
+#define nd_line(n) (int)(((SIGNED_VALUE)(n)->flags)>>NODE_LSHIFT)
 #define nd_set_line(n,l) \
-    RNODE(n)->flags=((RNODE(n)->flags&~(-1<<NODE_LSHIFT))|(((l)&NODE_LMASK)<<NODE_LSHIFT))
+    (n)->flags=(((n)->flags&~((VALUE)(-1)<<NODE_LSHIFT))|((VALUE)((l)&NODE_LMASK)<<NODE_LSHIFT))
+
+#define nd_first_column(n) ((int)((n)->nd_loc.first_loc.column))
+#define nd_set_first_column(n, v) ((n)->nd_loc.first_loc.column = (v))
+#define nd_first_lineno(n) ((int)((n)->nd_loc.first_loc.lineno))
+#define nd_set_first_lineno(n, v) ((n)->nd_loc.first_loc.lineno = (v))
+
+#define nd_last_column(n) ((int)((n)->nd_loc.last_loc.column))
+#define nd_set_last_column(n, v) ((n)->nd_loc.last_loc.column = (v))
+#define nd_last_lineno(n) ((int)((n)->nd_loc.last_loc.lineno))
+#define nd_set_last_lineno(n, v) ((n)->nd_loc.last_loc.lineno = (v))
+#define nd_last_loc(n) ((n)->nd_loc.last_loc)
+#define nd_set_last_loc(n, v) (nd_last_loc(n) = (v))
 
 #define nd_head  u1.node
 #define nd_alen  u2.argc
@@ -285,8 +301,6 @@ typedef struct RNode {
 #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
 
@@ -321,6 +335,7 @@ typedef struct RNode {
 #define nd_recv  u1.node
 #define nd_mid   u2.id
 #define nd_args  u3.node
+#define nd_ainfo u3.args
 
 #define nd_noex  u3.id
 #define nd_defn  u3.node
@@ -331,9 +346,6 @@ typedef struct RNode {
 #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
@@ -342,27 +354,29 @@ typedef struct RNode {
 #define nd_nth   u2.argc
 
 #define nd_tag   u1.id
-#define nd_tval  u2.value
 
-#define nd_visi  u2.argc
+#define nd_alias  u1.id
+#define nd_orig   u2.id
+#define nd_undef  u2.node
+
+#define nd_compile_option  u3.value
 
 #define NEW_NODE(t,a0,a1,a2) rb_node_newnode((t),(VALUE)(a0),(VALUE)(a1),(VALUE)(a2))
 
 #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_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_UNLESS(c,t,e) NEW_NODE(NODE_UNLESS,c,t,e)
 #define NEW_CASE(h,b) NEW_NODE(NODE_CASE,h,b,0)
+#define NEW_CASE2(b) NEW_NODE(NODE_CASE2,0,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_LAMBDA(a,b) NEW_NODE(NODE_LAMBDA,0,NEW_SCOPE(a,b),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)
@@ -372,7 +386,7 @@ typedef struct RNode {
 #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_YIELD(a) NEW_NODE(NODE_YIELD,a,0,0)
 #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)
@@ -383,15 +397,14 @@ typedef struct RNode {
 #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_ASGN2(r,t,i,o,val) NEW_NODE(NODE_OP_ASGN2,r,val,NEW_OP_ASGN22(i,o,t))
+#define NEW_OP_ASGN22(i,o,t) NEW_NODE(NODE_OP_ASGN2,i,o,t)
 #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_OP_CDECL(v,op,val) NEW_NODE(NODE_OP_CDECL,v,val,op)
 #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)
@@ -411,19 +424,18 @@ typedef struct RNode {
 #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_OPCALL(r,m,a) NEW_NODE(NODE_OPCALL,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_KW_ARG(i,v) NEW_NODE(NODE_KW_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)
@@ -443,15 +455,31 @@ typedef struct RNode {
 #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 NEW_MEMO(a,b,c) NEW_NODE(NODE_MEMO,a,b,c)
+#define NEW_PRELUDE(p,b,o) NEW_NODE(NODE_PRELUDE,p,b,o)
 
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility push(default)
-#endif
+#define NODE_SPECIAL_REQUIRED_KEYWORD ((NODE *)-1)
+#define NODE_SPECIAL_NO_NAME_REST     ((NODE *)-1)
+
+RUBY_SYMBOL_EXPORT_BEGIN
+
+typedef struct node_buffer_struct node_buffer_t;
+/* T_IMEMO/ast */
+typedef struct rb_ast_struct {
+    VALUE flags;
+    VALUE reserved1;
+    NODE *root;
+    node_buffer_t *node_buffer;
+    VALUE mark_ary;
+} rb_ast_t;
+rb_ast_t *rb_ast_new();
+void rb_ast_mark(rb_ast_t*);
+void rb_ast_dispose(rb_ast_t*);
+void rb_ast_free(rb_ast_t*);
+void rb_ast_add_mark_object(rb_ast_t*, VALUE);
+void rb_ast_delete_mark_object(rb_ast_t*, VALUE);
+NODE *rb_ast_newnode(rb_ast_t*);
+void rb_ast_delete_node(rb_ast_t*, NODE *n);
 
 VALUE rb_parser_new(void);
 VALUE rb_parser_end_seen_p(VALUE);
@@ -459,40 +487,48 @@ VALUE rb_parser_encoding(VALUE);
 VALUE rb_parser_get_yydebug(VALUE);
 VALUE rb_parser_set_yydebug(VALUE, VALUE);
 VALUE rb_parser_dump_tree(NODE *node, int comment);
-NODE *rb_parser_append_print(VALUE, NODE *);
-NODE *rb_parser_while_loop(VALUE, NODE *, int, int);
+void rb_parser_set_options(VALUE, int, int, int, int);
 
-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);
+rb_ast_t *rb_parser_compile_cstr(VALUE, const char*, const char*, int, int);
+rb_ast_t *rb_parser_compile_string(VALUE, const char*, VALUE, int);
+rb_ast_t *rb_parser_compile_file(VALUE, const char*, VALUE, int);
+rb_ast_t *rb_parser_compile_string_path(VALUE vparser, VALUE fname, VALUE src, int line);
+rb_ast_t *rb_parser_compile_file_path(VALUE vparser, VALUE fname, VALUE input, int line);
 
-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);
+rb_ast_t *rb_compile_cstr(const char*, const char*, int, int);
+rb_ast_t *rb_compile_string(const char*, VALUE, int);
+rb_ast_t *rb_compile_file(const char*, VALUE, int);
 
-NODE *rb_node_newnode(enum node_type,VALUE,VALUE,VALUE);
-NODE *rb_node_newnode_longlife(enum node_type,VALUE,VALUE,VALUE);
+void rb_node_init(NODE *n, enum node_type type, VALUE a0, VALUE a1, VALUE a2);
 
-struct rb_global_entry {
-    struct rb_global_variable *var;
-    ID id;
-};
-
-struct rb_global_entry *rb_global_entry(ID);
-VALUE rb_gvar_get(struct rb_global_entry *);
-VALUE rb_gvar_set(struct rb_global_entry *, VALUE);
-VALUE rb_gvar_defined(struct rb_global_entry *);
 const struct kwtable *rb_reserved_word(const char *, unsigned int);
 
+struct rb_args_info {
+    NODE *pre_init;
+    NODE *post_init;
+
+    int pre_args_num;  /* count of mandatory pre-arguments */
+    int post_args_num; /* count of mandatory post-arguments */
+
+    ID first_post_arg;
+
+    ID rest_arg;
+    ID block_arg;
+
+    NODE *kw_args;
+    NODE *kw_rest_arg;
+
+    NODE *opt_args;
+};
+
 struct parser_params;
 void *rb_parser_malloc(struct parser_params *, size_t);
 void *rb_parser_realloc(struct parser_params *, void *, size_t);
 void *rb_parser_calloc(struct parser_params *, size_t, size_t);
 void rb_parser_free(struct parser_params *, void *);
+void rb_parser_printf(struct parser_params *parser, const char *fmt, ...);
 
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility pop
-#endif
+RUBY_SYMBOL_EXPORT_END
 
 #if defined(__cplusplus)
 #if 0

data/lib/debase/ruby_core_source/{ruby-1.9.3-p550 → ruby-2.5.4-p155}/node_name.inc

@@ -4,12 +4,14 @@
 	return "NODE_BLOCK";
       case NODE_IF:
 	return "NODE_IF";
+      case NODE_UNLESS:
+	return "NODE_UNLESS";
       case NODE_CASE:
 	return "NODE_CASE";
+      case NODE_CASE2:
+	return "NODE_CASE2";
       case NODE_WHEN:
 	return "NODE_WHEN";
-      case NODE_OPT_N:
-	return "NODE_OPT_N";
       case NODE_WHILE:
 	return "NODE_WHILE";
       case NODE_UNTIL:
@@ -50,14 +52,10 @@
 	return "NODE_GASGN";
       case NODE_IASGN:
 	return "NODE_IASGN";
-      case NODE_IASGN2:
-	return "NODE_IASGN2";
       case NODE_CDECL:
 	return "NODE_CDECL";
       case NODE_CVASGN:
 	return "NODE_CVASGN";
-      case NODE_CVDECL:
-	return "NODE_CVDECL";
       case NODE_OP_ASGN1:
 	return "NODE_OP_ASGN1";
       case NODE_OP_ASGN2:
@@ -66,12 +64,18 @@
 	return "NODE_OP_ASGN_AND";
       case NODE_OP_ASGN_OR:
 	return "NODE_OP_ASGN_OR";
+      case NODE_OP_CDECL:
+	return "NODE_OP_CDECL";
       case NODE_CALL:
 	return "NODE_CALL";
+      case NODE_OPCALL:
+	return "NODE_OPCALL";
       case NODE_FCALL:
 	return "NODE_FCALL";
       case NODE_VCALL:
 	return "NODE_VCALL";
+      case NODE_QCALL:
+	return "NODE_QCALL";
       case NODE_SUPER:
 	return "NODE_SUPER";
       case NODE_ZSUPER:
@@ -124,14 +128,14 @@
 	return "NODE_EVSTR";
       case NODE_DREGX:
 	return "NODE_DREGX";
-      case NODE_DREGX_ONCE:
-	return "NODE_DREGX_ONCE";
       case NODE_ARGS:
 	return "NODE_ARGS";
       case NODE_ARGS_AUX:
 	return "NODE_ARGS_AUX";
       case NODE_OPT_ARG:
 	return "NODE_OPT_ARG";
+      case NODE_KW_ARG:
+	return "NODE_KW_ARG";
       case NODE_POSTARG:
 	return "NODE_POSTARG";
       case NODE_ARGSCAT:
@@ -140,10 +144,6 @@
 	return "NODE_ARGSPUSH";
       case NODE_SPLAT:
 	return "NODE_SPLAT";
-      case NODE_TO_ARY:
-	return "NODE_TO_ARY";
-      case NODE_BLOCK_ARG:
-	return "NODE_BLOCK_ARG";
       case NODE_BLOCK_PASS:
 	return "NODE_BLOCK_PASS";
       case NODE_DEFN:
@@ -188,14 +188,6 @@
 	return "NODE_DEFINED";
       case NODE_POSTEXE:
 	return "NODE_POSTEXE";
-      case NODE_ALLOCA:
-	return "NODE_ALLOCA";
-      case NODE_BMETHOD:
-	return "NODE_BMETHOD";
-      case NODE_MEMO:
-	return "NODE_MEMO";
-      case NODE_IFUNC:
-	return "NODE_IFUNC";
       case NODE_DSYM:
 	return "NODE_DSYM";
       case NODE_ATTRASGN:
@@ -204,5 +196,3 @@
 	return "NODE_PRELUDE";
       case NODE_LAMBDA:
 	return "NODE_LAMBDA";
-      case NODE_OPTBLOCK:
-	return "NODE_OPTBLOCK";