ruby-internal 0.7.3 → 0.8.0

data/ext/cached/ruby-1.8.5/internal/vm/instruction/insns_info.c

@@ -2,6 +2,9 @@
 
 #ifdef RUBY_VM
 
+#include "iseq.h"
+#include "vm_core.h"
+
 
 VALUE instruction_class[VM_INSTRUCTION_SIZE];
 

data/ext/cached/ruby-1.8.5/internal/vm/iseq/iseq_load.inc

@@ -1,9 +1,28 @@
 #ifndef ruby_internal_iseq_load__inc_
 #define ruby_internal_iseq_load__inc_
 
-#include "internal/yarv-headers/gc.h"
-#include "internal/yarv-headers/iseq.h"
+#ifdef HAVE_TYPE_STRUCT_RTYPEDDATA
 
+  static rb_data_type_t const * p_iseq_data_type;
+
+  static void init_iseq_data_type()
+  {
+    rb_proc_t * p;
+    VALUE body;
+
+    VALUE binding = rb_binding_new();
+    VALUE new_proc = rb_funcall(
+        rb_cObject, rb_intern("eval"), 2, rb_str_new2("proc { }"), binding);
+    GetProcPtr(new_proc, p);
+    body = p->block.iseq->self;
+
+    p_iseq_data_type = RTYPEDDATA_TYPE(body);
+  }
+
+#else
+
+#endif
+#
 
 #endif
 

data/ext/cached/{ruby-1.8.5/internal/method/method.h → ruby-1.8.6/internal/method/internal_method.h}

@@ -3,8 +3,20 @@
 
 #include <ruby.h>
 
+#ifdef RUBY_VM
+#include "method.h"
+#endif
+
 #include "internal/node/ruby_internal_node.h"
 
+#ifndef FALSE
+#define FALSE 0
+#endif
+
+#ifndef TRUE
+#define TRUE (!FALSE)
+#endif
+
 struct METHOD {
     VALUE klass, rklass;
     VALUE recv;

data/ext/cached/ruby-1.8.6/internal/module/getcfp.h

@@ -0,0 +1,13 @@
+#ifndef getcfp__h
+#define getcfp__h
+
+#include "ruby.h"
+
+#ifdef RUBY_VM
+
+#include "vm_core.h"
+
+
+#endif
+
+#endif

data/ext/cached/ruby-1.8.6/internal/node/global_entry.h

@@ -1,10 +1,104 @@
 #ifndef global_entry__h_
 #define global_entry__h_
 
+st_table * rb_global_tbl;
+
+struct trace_var {
+    int removed;
+    void (*func)();
+    VALUE data;
+    struct trace_var *next;
+};
+struct global_variable {
+    int   counter;
+    void *data;
+    VALUE (*getter)();
+    void  (*setter)();
+    void  (*marker)();
+    int block_trace;
+    struct trace_var *trace;
+};
 struct global_entry {
     struct global_variable *var;
     ID id;
 };
+static VALUE undef_getter();
+static void  undef_setter();
+static void  undef_marker();
+static VALUE val_getter();
+static void  val_setter();
+static void  val_marker();
+struct global_entry*
+rb_global_entry(id)
+    ID id;
+{
+    struct global_entry *entry;
+
+    if (!st_lookup(rb_global_tbl, id, (st_data_t *)&entry)) {
+	struct global_variable *var;
+	entry = ALLOC(struct global_entry);
+	var = ALLOC(struct global_variable);
+	entry->id = id;
+	entry->var = var;
+	var->counter = 1;
+	var->data = 0;
+	var->getter = undef_getter;
+	var->setter = undef_setter;
+	var->marker = undef_marker;
+
+	var->block_trace = 0;
+	var->trace = 0;
+	st_add_direct(rb_global_tbl, id, (st_data_t)entry);
+    }
+    return entry;
+}
+static VALUE
+undef_getter(id)
+    ID id;
+{
+    rb_warning("global variable `%s' not initialized", rb_id2name(id));
+
+    return Qnil;
+}
+static void
+undef_setter(val, id, data, var)
+    VALUE val;
+    ID id;
+    void *data;
+    struct global_variable *var;
+{
+    var->getter = val_getter;
+    var->setter = val_setter;
+    var->marker = val_marker;
+
+    var->data = (void*)val;
+}
+static void
+undef_marker()
+{
+}
+static VALUE
+val_getter(id, val)
+    ID id;
+    VALUE val;
+{
+    return val;
+}
+static void
+val_setter(val, id, data, var)
+    VALUE val;
+    ID id;
+    void *data;
+    struct global_variable *var;
+{
+    var->data = (void*)val;
+}
+static void
+val_marker(data)
+    VALUE data;
+{
+    if (data) rb_gc_mark_maybe(data);
+}
 
 #endif
 

data/ext/cached/ruby-1.8.6/internal/node/node_type_descrip.c

@@ -4,44 +4,44 @@
 Node_Type_Descrip node_type_descrips_unsorted[] = {
   { NODE_ALIAS, NEN_1ST, NEN_2ND, NEN_NONE, "ALIAS" },
 #ifdef HAVE_NODE_ALLOCA
-  { NODE_ALLOCA, NEN_CFNC, NEN_VALUE, NEN_CNT, "ALLOCA" },
+  { NODE_ALLOCA, NEN_CFNC, NEN_CNT, NEN_VALUE, "ALLOCA" },
 #endif
   { NODE_AND, NEN_1ST, NEN_2ND, NEN_NONE, "AND" },
-  { NODE_ARGS, NEN_REST, NEN_OPT, NEN_CNT, "ARGS" },
-  { NODE_ARGSCAT, NEN_HEAD, NEN_BODY, NEN_NONE, "ARGSCAT" },
-  { NODE_ARGSPUSH, NEN_HEAD, NEN_BODY, NEN_NONE, "ARGSPUSH" },
-  { NODE_ARRAY, NEN_HEAD, NEN_ALEN, NEN_NEXT, "ARRAY" },
-  { NODE_ATTRASGN, NEN_ARGS, NEN_MID, NEN_RECV, "ATTRASGN" },
+  { NODE_ARGS, NEN_CNT, NEN_REST, NEN_OPT, "ARGS" },
+  { NODE_ARGSCAT, NEN_BODY, NEN_HEAD, NEN_NONE, "ARGSCAT" },
+  { NODE_ARGSPUSH, NEN_BODY, NEN_HEAD, NEN_NONE, "ARGSPUSH" },
+  { NODE_ARRAY, NEN_ALEN, NEN_NEXT, NEN_HEAD, "ARRAY" },
+  { NODE_ATTRASGN, NEN_MID, NEN_RECV, NEN_ARGS, "ATTRASGN" },
   { NODE_ATTRSET, NEN_VID, NEN_NONE, NEN_NONE, "ATTRSET" },
   { NODE_BACK_REF, NEN_NTH, NEN_CNT, NEN_NONE, "BACK_REF" },
   { NODE_BEGIN, NEN_BODY, NEN_NONE, NEN_NONE, "BEGIN" },
-  { NODE_BLOCK, NEN_HEAD, NEN_NEXT, NEN_NONE, "BLOCK" },
+  { NODE_BLOCK, NEN_NEXT, NEN_HEAD, NEN_NONE, "BLOCK" },
   { NODE_BLOCK_ARG, NEN_CNT, NEN_NONE, NEN_NONE, "BLOCK_ARG" },
   { NODE_BLOCK_PASS, NEN_BODY, NEN_ITER, NEN_NONE, "BLOCK_PASS" },
   { NODE_BMETHOD, NEN_CVAL, NEN_NONE, NEN_NONE, "BMETHOD" },
   { NODE_BREAK, NEN_STTS, NEN_NONE, NEN_NONE, "BREAK" },
-  { NODE_CALL, NEN_ARGS, NEN_MID, NEN_RECV, "CALL" },
-  { NODE_CASE, NEN_HEAD, NEN_BODY, NEN_NEXT, "CASE" },
-  { NODE_CDECL, NEN_VALUE, NEN_VID, NEN_NONE, "CDECL" },
+  { NODE_CALL, NEN_MID, NEN_RECV, NEN_ARGS, "CALL" },
+  { NODE_CASE, NEN_BODY, NEN_NEXT, NEN_HEAD, "CASE" },
+  { NODE_CDECL, NEN_VID, NEN_VALUE, NEN_NONE, "CDECL" },
   { NODE_CFUNC, NEN_CFNC, NEN_ARGC, NEN_NONE, "CFUNC" },
-  { NODE_CLASS, NEN_CPATH, NEN_BODY, NEN_SUPER, "CLASS" },
-  { NODE_COLON2, NEN_HEAD, NEN_MID, NEN_NONE, "COLON2" },
+  { NODE_CLASS, NEN_BODY, NEN_SUPER, NEN_CPATH, "CLASS" },
+  { NODE_COLON2, NEN_MID, NEN_HEAD, NEN_NONE, "COLON2" },
   { NODE_COLON3, NEN_MID, NEN_NONE, NEN_NONE, "COLON3" },
   { NODE_CONST, NEN_VID, NEN_NONE, NEN_NONE, "CONST" },
-  { NODE_CREF, NEN_BODY, NEN_NEXT, NEN_CLSS, "CREF" },
+  { NODE_CREF, NEN_BODY, NEN_CLSS, NEN_NEXT, "CREF" },
   { NODE_CVAR, NEN_VID, NEN_NONE, NEN_NONE, "CVAR" },
-  { NODE_CVASGN, NEN_VALUE, NEN_VID, NEN_NONE, "CVASGN" },
-  { NODE_CVDECL, NEN_VALUE, NEN_VID, NEN_NONE, "CVDECL" },
-  { NODE_DASGN, NEN_VALUE, NEN_VID, NEN_NONE, "DASGN" },
-  { NODE_DASGN_CURR, NEN_VALUE, NEN_VID, NEN_NONE, "DASGN_CURR" },
+  { NODE_CVASGN, NEN_VID, NEN_VALUE, NEN_NONE, "CVASGN" },
+  { NODE_CVDECL, NEN_VID, NEN_VALUE, NEN_NONE, "CVDECL" },
+  { NODE_DASGN, NEN_VID, NEN_VALUE, NEN_NONE, "DASGN" },
+  { NODE_DASGN_CURR, NEN_VID, NEN_VALUE, NEN_NONE, "DASGN_CURR" },
   { NODE_DEFINED, NEN_HEAD, NEN_NONE, NEN_NONE, "DEFINED" },
-  { NODE_DEFN, NEN_DEFN, NEN_MID, NEN_NOEX, "DEFN" },
-  { NODE_DEFS, NEN_DEFN, NEN_MID, NEN_RECV, "DEFS" },
+  { NODE_DEFN, NEN_NOEX, NEN_MID, NEN_DEFN, "DEFN" },
+  { NODE_DEFS, NEN_MID, NEN_DEFN, NEN_RECV, "DEFS" },
   { NODE_DMETHOD, NEN_CVAL, NEN_NONE, NEN_NONE, "DMETHOD" },
-  { NODE_DOT2, NEN_BEG, NEN_END, NEN_STATE, "DOT2" },
-  { NODE_DOT3, NEN_BEG, NEN_END, NEN_STATE, "DOT3" },
-  { NODE_DREGX, NEN_LIT, NEN_CFLAG, NEN_NEXT, "DREGX" },
-  { NODE_DREGX_ONCE, NEN_LIT, NEN_CFLAG, NEN_NEXT, "DREGX_ONCE" },
+  { NODE_DOT2, NEN_STATE, NEN_END, NEN_BEG, "DOT2" },
+  { NODE_DOT3, NEN_STATE, NEN_END, NEN_BEG, "DOT3" },
+  { NODE_DREGX, NEN_LIT, NEN_NEXT, NEN_CFLAG, "DREGX" },
+  { NODE_DREGX_ONCE, NEN_LIT, NEN_NEXT, NEN_CFLAG, "DREGX_ONCE" },
   { NODE_DSTR, NEN_LIT, NEN_NEXT, NEN_NONE, "DSTR" },
   { NODE_DSYM, NEN_LIT, NEN_NEXT, NEN_NONE, "DSYM" },
   { NODE_DVAR, NEN_VID, NEN_NONE, NEN_NONE, "DVAR" },
@@ -49,45 +49,45 @@ Node_Type_Descrip node_type_descrips_unsorted[] = {
   { NODE_ENSURE, NEN_HEAD, NEN_ENSR, NEN_NONE, "ENSURE" },
   { NODE_EVSTR, NEN_BODY, NEN_NONE, NEN_NONE, "EVSTR" },
   { NODE_FALSE, NEN_NONE, NEN_NONE, NEN_NONE, "FALSE" },
-  { NODE_FBODY, NEN_HEAD, NEN_ORIG, NEN_MID, "FBODY" },
-  { NODE_FCALL, NEN_ARGS, NEN_MID, NEN_NONE, "FCALL" },
-  { NODE_FLIP2, NEN_BEG, NEN_END, NEN_CNT, "FLIP2" },
-  { NODE_FLIP3, NEN_BEG, NEN_END, NEN_CNT, "FLIP3" },
+  { NODE_FBODY, NEN_MID, NEN_ORIG, NEN_HEAD, "FBODY" },
+  { NODE_FCALL, NEN_MID, NEN_ARGS, NEN_NONE, "FCALL" },
+  { NODE_FLIP2, NEN_CNT, NEN_END, NEN_BEG, "FLIP2" },
+  { NODE_FLIP3, NEN_CNT, NEN_END, NEN_BEG, "FLIP3" },
   { NODE_FOR, NEN_BODY, NEN_ITER, NEN_VAR, "FOR" },
-  { NODE_GASGN, NEN_VALUE, NEN_VID, NEN_ENTRY, "GASGN" },
-  { NODE_GVAR, NEN_VID, NEN_ENTRY, NEN_NONE, "GVAR" },
+  { NODE_GASGN, NEN_ENTRY, NEN_VID, NEN_VALUE, "GASGN" },
+  { NODE_GVAR, NEN_ENTRY, NEN_VID, NEN_NONE, "GVAR" },
   { NODE_HASH, NEN_HEAD, NEN_NONE, NEN_NONE, "HASH" },
-  { NODE_IASGN, NEN_VALUE, NEN_VID, NEN_NONE, "IASGN" },
-  { NODE_IF, NEN_COND, NEN_BODY, NEN_ELSE, "IF" },
-  { NODE_IFUNC, NEN_CFNC, NEN_TVAL, NEN_STATE, "IFUNC" },
+  { NODE_IASGN, NEN_VID, NEN_VALUE, NEN_NONE, "IASGN" },
+  { NODE_IF, NEN_BODY, NEN_COND, NEN_ELSE, "IF" },
+  { NODE_IFUNC, NEN_STATE, NEN_CFNC, NEN_TVAL, "IFUNC" },
   { NODE_ITER, NEN_BODY, NEN_ITER, NEN_VAR, "ITER" },
   { NODE_IVAR, NEN_VID, NEN_NONE, NEN_NONE, "IVAR" },
-  { NODE_LASGN, NEN_VALUE, NEN_VID, NEN_CNT, "LASGN" },
+  { NODE_LASGN, NEN_CNT, NEN_VID, NEN_VALUE, "LASGN" },
   { NODE_LIT, NEN_LIT, NEN_NONE, NEN_NONE, "LIT" },
-  { NODE_LVAR, NEN_VID, NEN_CNT, NEN_NONE, "LVAR" },
+  { NODE_LVAR, NEN_CNT, NEN_VID, NEN_NONE, "LVAR" },
   { NODE_MASGN, NEN_ARGS, NEN_HEAD, NEN_VALUE, "MASGN" },
   { NODE_MATCH, NEN_LIT, NEN_VALUE, NEN_NONE, "MATCH" },
-  { NODE_MATCH2, NEN_VALUE, NEN_RECV, NEN_NONE, "MATCH2" },
-  { NODE_MATCH3, NEN_VALUE, NEN_RECV, NEN_NONE, "MATCH3" },
+  { NODE_MATCH2, NEN_RECV, NEN_VALUE, NEN_NONE, "MATCH2" },
+  { NODE_MATCH3, NEN_RECV, NEN_VALUE, NEN_NONE, "MATCH3" },
   { NODE_MEMO, NEN_NONE, NEN_NONE, NEN_NONE, "MEMO" },
   { NODE_METHOD, NEN_BODY, NEN_NOEX, NEN_NONE, "METHOD" },
-  { NODE_MODULE, NEN_CPATH, NEN_BODY, NEN_NONE, "MODULE" },
+  { NODE_MODULE, NEN_BODY, NEN_CPATH, NEN_NONE, "MODULE" },
   { NODE_NEWLINE, NEN_NEXT, NEN_NONE, NEN_NONE, "NEWLINE" },
   { NODE_NEXT, NEN_STTS, NEN_NONE, NEN_NONE, "NEXT" },
   { NODE_NIL, NEN_NONE, NEN_NONE, NEN_NONE, "NIL" },
   { NODE_NOT, NEN_BODY, NEN_NONE, NEN_NONE, "NOT" },
   { NODE_NTH_REF, NEN_NTH, NEN_CNT, NEN_NONE, "NTH_REF" },
   { NODE_OPT_N, NEN_BODY, NEN_NONE, NEN_NONE, "OPT_N" },
-  { NODE_OP_ASGN1, NEN_ARGS, NEN_MID, NEN_RECV, "OP_ASGN1" },
-  { NODE_OP_ASGN2, NEN_VALUE, NEN_NEXT, NEN_RECV, "OP_ASGN2" },
-  { NODE_OP_ASGN2_ARG, NEN_VID, NEN_AID, NEN_MID, "OP_ASGN2_ARG" },
-  { NODE_OP_ASGN_AND, NEN_VALUE, NEN_RECV, NEN_NONE, "OP_ASGN_AND" },
-  { NODE_OP_ASGN_OR, NEN_AID, NEN_VALUE, NEN_RECV, "OP_ASGN_OR" },
+  { NODE_OP_ASGN1, NEN_MID, NEN_RECV, NEN_ARGS, "OP_ASGN1" },
+  { NODE_OP_ASGN2, NEN_RECV, NEN_NEXT, NEN_VALUE, "OP_ASGN2" },
+  { NODE_OP_ASGN2_ARG, NEN_AID, NEN_MID, NEN_VID, "OP_ASGN2_ARG" },
+  { NODE_OP_ASGN_AND, NEN_RECV, NEN_VALUE, NEN_NONE, "OP_ASGN_AND" },
+  { NODE_OP_ASGN_OR, NEN_AID, NEN_RECV, NEN_VALUE, "OP_ASGN_OR" },
   { NODE_OR, NEN_1ST, NEN_2ND, NEN_NONE, "OR" },
   { NODE_POSTEXE, NEN_NONE, NEN_NONE, NEN_NONE, "POSTEXE" },
   { NODE_REDO, NEN_NONE, NEN_NONE, NEN_NONE, "REDO" },
-  { NODE_RESBODY, NEN_HEAD, NEN_ARGS, NEN_BODY, "RESBODY" },
-  { NODE_RESCUE, NEN_HEAD, NEN_ELSE, NEN_RESQ, "RESCUE" },
+  { NODE_RESBODY, NEN_BODY, NEN_HEAD, NEN_ARGS, "RESBODY" },
+  { NODE_RESCUE, NEN_RESQ, NEN_HEAD, NEN_ELSE, "RESCUE" },
   { NODE_RETRY, NEN_NONE, NEN_NONE, NEN_NONE, "RETRY" },
   { NODE_RETURN, NEN_STTS, NEN_NONE, NEN_NONE, "RETURN" },
   { NODE_SCLASS, NEN_BODY, NEN_RECV, NEN_NONE, "SCLASS" },
@@ -100,13 +100,13 @@ Node_Type_Descrip node_type_descrips_unsorted[] = {
   { NODE_TO_ARY, NEN_HEAD, NEN_NONE, NEN_NONE, "TO_ARY" },
   { NODE_TRUE, NEN_NONE, NEN_NONE, NEN_NONE, "TRUE" },
   { NODE_UNDEF, NEN_BODY, NEN_NONE, NEN_NONE, "UNDEF" },
-  { NODE_UNTIL, NEN_BODY, NEN_COND, NEN_STATE, "UNTIL" },
+  { NODE_UNTIL, NEN_BODY, NEN_STATE, NEN_COND, "UNTIL" },
   { NODE_VALIAS, NEN_1ST, NEN_2ND, NEN_NONE, "VALIAS" },
   { NODE_VCALL, NEN_MID, NEN_NONE, NEN_NONE, "VCALL" },
-  { NODE_WHEN, NEN_HEAD, NEN_BODY, NEN_NEXT, "WHEN" },
-  { NODE_WHILE, NEN_BODY, NEN_COND, NEN_STATE, "WHILE" },
+  { NODE_WHEN, NEN_BODY, NEN_NEXT, NEN_HEAD, "WHEN" },
+  { NODE_WHILE, NEN_BODY, NEN_STATE, NEN_COND, "WHILE" },
   { NODE_XSTR, NEN_LIT, NEN_NONE, NEN_NONE, "XSTR" },
-  { NODE_YIELD, NEN_HEAD, NEN_STATE, NEN_NONE, "YIELD" },
+  { NODE_YIELD, NEN_STATE, NEN_HEAD, NEN_NONE, "YIELD" },
   { NODE_ZARRAY, NEN_NONE, NEN_NONE, NEN_NONE, "ZARRAY" },
   { NODE_ZSUPER, NEN_NONE, NEN_NONE, NEN_NONE, "ZSUPER" },
   { NODE_LAST, NEN_NONE, NEN_NONE, NEN_NONE, "LAST" },

data/ext/cached/ruby-1.8.6/internal/node/nodeinfo.c

@@ -228,7 +228,7 @@ VALUE dump_node_elem(enum Node_Elem_Name nen, NODE * n, VALUE node_hash)
           else
           {
             path = rb_class_path(klass);
-            if(STR2CSTR(path)[0] == '#')
+            if(StringValuePtr(path)[0] == '#')
             {
               rb_raise(rb_eArgError, "cannot dump anonymous class");
             }
@@ -322,7 +322,7 @@ VALUE dump_node_elem(enum Node_Elem_Name nen, NODE * n, VALUE node_hash)
           else
           {
             path = rb_class_path(klass);
-            if(STR2CSTR(path)[0] == '#')
+            if(StringValuePtr(path)[0] == '#')
             {
               rb_raise(rb_eArgError, "cannot dump anonymous class");
             }
@@ -565,7 +565,7 @@ VALUE dump_node_elem(enum Node_Elem_Name nen, NODE * n, VALUE node_hash)
           else
           {
             path = rb_class_path(klass);
-            if(STR2CSTR(path)[0] == '#')
+            if(StringValuePtr(path)[0] == '#')
             {
               rb_raise(rb_eArgError, "cannot dump anonymous class");
             }
@@ -689,7 +689,7 @@ VALUE dump_node_elem(enum Node_Elem_Name nen, NODE * n, VALUE node_hash)
           else
           {
             path = rb_class_path(klass);
-            if(STR2CSTR(path)[0] == '#')
+            if(StringValuePtr(path)[0] == '#')
             {
               rb_raise(rb_eArgError, "cannot dump anonymous class");
             }
@@ -897,7 +897,7 @@ VALUE dump_node_elem(enum Node_Elem_Name nen, NODE * n, VALUE node_hash)
           else
           {
             path = rb_class_path(klass);
-            if(STR2CSTR(path)[0] == '#')
+            if(StringValuePtr(path)[0] == '#')
             {
               rb_raise(rb_eArgError, "cannot dump anonymous class");
             }
@@ -1152,20 +1152,23 @@ void load_node_elem(enum Node_Elem_Name nen, VALUE v, NODE * n, VALUE node_hash,
       }
     case NEN_CLSS:
     {
+      int flags;
       Check_Type(v, T_ARRAY);
       if(RARRAY_LEN(v) != 2)
       {
         rb_raise(rb_eArgError, "wrong size for array");
       }
-      int flags = NUM2INT(RARRAY_PTR(v)[0]);
+      flags = NUM2INT(RARRAY_PTR(v)[0]);
       switch(flags & T_MASK)
       {
         case T_CLASS:
         case T_MODULE:
         {
-          VALUE str = RARRAY_PTR(v)[1];
+          VALUE str, klass;
+
+          str = RARRAY_PTR(v)[1];
           Check_Type(str, T_STRING);
-          VALUE klass = rb_path2class(STR2CSTR(str));
+          klass = rb_path2class(StringValuePtr(str));
           if(flags & FL_SINGLETON)
           {
             *(VALUE *)(&n->nd_clss) =
@@ -1241,20 +1244,23 @@ void load_node_elem(enum Node_Elem_Name nen, VALUE v, NODE * n, VALUE node_hash,
       }
     case NEN_CVAL:
     {
+      int flags;
       Check_Type(v, T_ARRAY);
       if(RARRAY_LEN(v) != 2)
       {
         rb_raise(rb_eArgError, "wrong size for array");
       }
-      int flags = NUM2INT(RARRAY_PTR(v)[0]);
+      flags = NUM2INT(RARRAY_PTR(v)[0]);
       switch(flags & T_MASK)
       {
         case T_CLASS:
         case T_MODULE:
         {
-          VALUE str = RARRAY_PTR(v)[1];
+          VALUE str, klass;
+
+          str = RARRAY_PTR(v)[1];
           Check_Type(str, T_STRING);
-          VALUE klass = rb_path2class(STR2CSTR(str));
+          klass = rb_path2class(StringValuePtr(str));
           if(flags & FL_SINGLETON)
           {
             *(VALUE *)(&n->nd_cval) =
@@ -1480,20 +1486,23 @@ void load_node_elem(enum Node_Elem_Name nen, VALUE v, NODE * n, VALUE node_hash,
       }
     case NEN_LIT:
     {
+      int flags;
       Check_Type(v, T_ARRAY);
       if(RARRAY_LEN(v) != 2)
       {
         rb_raise(rb_eArgError, "wrong size for array");
       }
-      int flags = NUM2INT(RARRAY_PTR(v)[0]);
+      flags = NUM2INT(RARRAY_PTR(v)[0]);
       switch(flags & T_MASK)
       {
         case T_CLASS:
         case T_MODULE:
         {
-          VALUE str = RARRAY_PTR(v)[1];
+          VALUE str, klass;
+
+          str = RARRAY_PTR(v)[1];
           Check_Type(str, T_STRING);
-          VALUE klass = rb_path2class(STR2CSTR(str));
+          klass = rb_path2class(StringValuePtr(str));
           if(flags & FL_SINGLETON)
           {
             *(VALUE *)(&n->nd_lit) =
@@ -1606,20 +1615,23 @@ void load_node_elem(enum Node_Elem_Name nen, VALUE v, NODE * n, VALUE node_hash,
       }
     case NEN_ORIG:
     {
+      int flags;
       Check_Type(v, T_ARRAY);
       if(RARRAY_LEN(v) != 2)
       {
         rb_raise(rb_eArgError, "wrong size for array");
       }
-      int flags = NUM2INT(RARRAY_PTR(v)[0]);
+      flags = NUM2INT(RARRAY_PTR(v)[0]);
       switch(flags & T_MASK)
       {
         case T_CLASS:
         case T_MODULE:
         {
-          VALUE str = RARRAY_PTR(v)[1];
+          VALUE str, klass;
+
+          str = RARRAY_PTR(v)[1];
           Check_Type(str, T_STRING);
-          VALUE klass = rb_path2class(STR2CSTR(str));
+          klass = rb_path2class(StringValuePtr(str));
           if(flags & FL_SINGLETON)
           {
             *(VALUE *)(&n->nd_orig) =
@@ -1846,20 +1858,23 @@ void load_node_elem(enum Node_Elem_Name nen, VALUE v, NODE * n, VALUE node_hash,
       }
     case NEN_TVAL:
     {
+      int flags;
       Check_Type(v, T_ARRAY);
       if(RARRAY_LEN(v) != 2)
       {
         rb_raise(rb_eArgError, "wrong size for array");
       }
-      int flags = NUM2INT(RARRAY_PTR(v)[0]);
+      flags = NUM2INT(RARRAY_PTR(v)[0]);
       switch(flags & T_MASK)
       {
         case T_CLASS:
         case T_MODULE:
         {
-          VALUE str = RARRAY_PTR(v)[1];
+          VALUE str, klass;
+
+          str = RARRAY_PTR(v)[1];
           Check_Type(str, T_STRING);
-          VALUE klass = rb_path2class(STR2CSTR(str));
+          klass = rb_path2class(StringValuePtr(str));
           if(flags & FL_SINGLETON)
           {
             *(VALUE *)(&n->nd_tval) =
@@ -2937,17 +2952,17 @@ void define_node_subclass_methods()
     rb_define_method(rb_cALLOCA, "cfnc", node_cfnc, 0);
     rb_ary_push(members, rb_str_new2("cfnc"));
 
-    /* Document-method: value
-     * a pointer to the previously allocated temporary node
-     */
-    rb_define_method(rb_cALLOCA, "value", node_value, 0);
-    rb_ary_push(members, rb_str_new2("value"));
-
     /* Document-method: cnt
      * the number of bytes allocated
      */
     rb_define_method(rb_cALLOCA, "cnt", node_cnt, 0);
     rb_ary_push(members, rb_str_new2("cnt"));
+
+    /* Document-method: value
+     * a pointer to the previously allocated temporary node
+     */
+    rb_define_method(rb_cALLOCA, "value", node_value, 0);
+    rb_ary_push(members, rb_str_new2("value"));
   }
 #endif
 
@@ -2990,6 +3005,12 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cARGS, "__type__", INT2NUM(NODE_ARGS));
     rb_define_singleton_method(rb_cARGS, "members", node_s_members, 0);
 
+    /* Document-method: cnt
+     * the number of required arguments
+     */
+    rb_define_method(rb_cARGS, "cnt", node_cnt, 0);
+    rb_ary_push(members, rb_str_new2("cnt"));
+
     /* Document-method: rest
      * an assignment node to assign the rest arg, if it is present
      */
@@ -3002,12 +3023,6 @@ void define_node_subclass_methods()
      */
     rb_define_method(rb_cARGS, "opt", node_opt, 0);
     rb_ary_push(members, rb_str_new2("opt"));
-
-    /* Document-method: cnt
-     * the number of required arguments
-     */
-    rb_define_method(rb_cARGS, "cnt", node_cnt, 0);
-    rb_ary_push(members, rb_str_new2("cnt"));
   }
 
   /* Document-class: Node::ARGSCAT
@@ -3027,18 +3042,18 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cARGSCAT, "__type__", INT2NUM(NODE_ARGSCAT));
     rb_define_singleton_method(rb_cARGSCAT, "members", node_s_members, 0);
 
-    /* Document-method: head
-     * a list of fixed arguments
-     */
-    rb_define_method(rb_cARGSCAT, "head", node_head, 0);
-    rb_ary_push(members, rb_str_new2("head"));
-
     /* Document-method: body
      * the last argument, which will be splatted onto the end of the
      * fixed arguments
      */
     rb_define_method(rb_cARGSCAT, "body", node_body, 0);
     rb_ary_push(members, rb_str_new2("body"));
+
+    /* Document-method: head
+     * a list of fixed arguments
+     */
+    rb_define_method(rb_cARGSCAT, "head", node_head, 0);
+    rb_ary_push(members, rb_str_new2("head"));
   }
 
   /* Document-class: Node::ARGSPUSH
@@ -3055,10 +3070,10 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cARGSPUSH, "__member__", members);
     rb_iv_set(rb_cARGSPUSH, "__type__", INT2NUM(NODE_ARGSPUSH));
     rb_define_singleton_method(rb_cARGSPUSH, "members", node_s_members, 0);
-    rb_define_method(rb_cARGSPUSH, "head", node_head, 0);
-    rb_ary_push(members, rb_str_new2("head"));
     rb_define_method(rb_cARGSPUSH, "body", node_body, 0);
     rb_ary_push(members, rb_str_new2("body"));
+    rb_define_method(rb_cARGSPUSH, "head", node_head, 0);
+    rb_ary_push(members, rb_str_new2("head"));
   }
 
   /* Document-class: Node::ARRAY
@@ -3073,12 +3088,6 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cARRAY, "__member__", members);
     rb_iv_set(rb_cARRAY, "__type__", INT2NUM(NODE_ARRAY));
     rb_define_singleton_method(rb_cARRAY, "members", node_s_members, 0);
-
-    /* Document-method: head
-     * the first element of the array
-     */
-    rb_define_method(rb_cARRAY, "head", node_head, 0);
-    rb_ary_push(members, rb_str_new2("head"));
     rb_define_method(rb_cARRAY, "alen", node_alen, 0);
     rb_ary_push(members, rb_str_new2("alen"));
 
@@ -3087,6 +3096,12 @@ void define_node_subclass_methods()
      */
     rb_define_method(rb_cARRAY, "next", node_next, 0);
     rb_ary_push(members, rb_str_new2("next"));
+
+    /* Document-method: head
+     * the first element of the array
+     */
+    rb_define_method(rb_cARRAY, "head", node_head, 0);
+    rb_ary_push(members, rb_str_new2("head"));
   }
 
   /* Document-class: Node::ATTRASGN
@@ -3103,12 +3118,6 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cATTRASGN, "__type__", INT2NUM(NODE_ATTRASGN));
     rb_define_singleton_method(rb_cATTRASGN, "members", node_s_members, 0);
 
-    /* Document-method: args
-     * the arguments to the method
-     */
-    rb_define_method(rb_cATTRASGN, "args", node_args, 0);
-    rb_ary_push(members, rb_str_new2("args"));
-
     /* Document-method: mid
      * the id of the attribute, with a trailing '=' sign
      */
@@ -3120,6 +3129,12 @@ void define_node_subclass_methods()
      */
     rb_define_method(rb_cATTRASGN, "recv", node_recv, 0);
     rb_ary_push(members, rb_str_new2("recv"));
+
+    /* Document-method: args
+     * the arguments to the method
+     */
+    rb_define_method(rb_cATTRASGN, "args", node_args, 0);
+    rb_ary_push(members, rb_str_new2("args"));
   }
 
   /* Document-class: Node::ATTRSET
@@ -3207,17 +3222,17 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cBLOCK, "__type__", INT2NUM(NODE_BLOCK));
     rb_define_singleton_method(rb_cBLOCK, "members", node_s_members, 0);
 
-    /* Document-method: head
-     * the first expression in the block of code
-     */
-    rb_define_method(rb_cBLOCK, "head", node_head, 0);
-    rb_ary_push(members, rb_str_new2("head"));
-
     /* Document-method: next
      * the second expression in the block of code
      */
     rb_define_method(rb_cBLOCK, "next", node_next, 0);
     rb_ary_push(members, rb_str_new2("next"));
+
+    /* Document-method: head
+     * the first expression in the block of code
+     */
+    rb_define_method(rb_cBLOCK, "head", node_head, 0);
+    rb_ary_push(members, rb_str_new2("head"));
   }
 
   /* Document-class: Node::BLOCK_ARG
@@ -3325,12 +3340,6 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cCALL, "__type__", INT2NUM(NODE_CALL));
     rb_define_singleton_method(rb_cCALL, "members", node_s_members, 0);
 
-    /* Document-method: args
-     * the arguments to the method
-     */
-    rb_define_method(rb_cCALL, "args", node_args, 0);
-    rb_ary_push(members, rb_str_new2("args"));
-
     /* Document-method: mid
      * the method id
      */
@@ -3342,6 +3351,12 @@ void define_node_subclass_methods()
      */
     rb_define_method(rb_cCALL, "recv", node_recv, 0);
     rb_ary_push(members, rb_str_new2("recv"));
+
+    /* Document-method: args
+     * the arguments to the method
+     */
+    rb_define_method(rb_cCALL, "args", node_args, 0);
+    rb_ary_push(members, rb_str_new2("args"));
   }
 
   /* Document-class: Node::CASE
@@ -3359,12 +3374,6 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cCASE, "__type__", INT2NUM(NODE_CASE));
     rb_define_singleton_method(rb_cCASE, "members", node_s_members, 0);
 
-    /* Document-method: head
-     * the value to select on
-     */
-    rb_define_method(rb_cCASE, "head", node_head, 0);
-    rb_ary_push(members, rb_str_new2("head"));
-
     /* Document-method: body
      * a linked list of nodes, each node representing a when
      * conditional
@@ -3373,6 +3382,12 @@ void define_node_subclass_methods()
     rb_ary_push(members, rb_str_new2("body"));
     rb_define_method(rb_cCASE, "next", node_next, 0);
     rb_ary_push(members, rb_str_new2("next"));
+
+    /* Document-method: head
+     * the value to select on
+     */
+    rb_define_method(rb_cCASE, "head", node_head, 0);
+    rb_ary_push(members, rb_str_new2("head"));
   }
 
   /* Document-class: Node::CDECL
@@ -3387,17 +3402,17 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cCDECL, "__type__", INT2NUM(NODE_CDECL));
     rb_define_singleton_method(rb_cCDECL, "members", node_s_members, 0);
 
-    /* Document-method: value
-     * the value to be assigned to the constant
-     */
-    rb_define_method(rb_cCDECL, "value", node_value, 0);
-    rb_ary_push(members, rb_str_new2("value"));
-
     /* Document-method: vid
      * the name of the constant to be assigned, all uppercase
      */
     rb_define_method(rb_cCDECL, "vid", node_vid, 0);
     rb_ary_push(members, rb_str_new2("vid"));
+
+    /* Document-method: value
+     * the value to be assigned to the constant
+     */
+    rb_define_method(rb_cCDECL, "value", node_value, 0);
+    rb_ary_push(members, rb_str_new2("value"));
   }
 
   /* Document-class: Node::CFUNC
@@ -3440,12 +3455,6 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cCLASS, "__type__", INT2NUM(NODE_CLASS));
     rb_define_singleton_method(rb_cCLASS, "members", node_s_members, 0);
 
-    /* Document-method: cpath
-     * the name of the class to define
-     */
-    rb_define_method(rb_cCLASS, "cpath", node_cpath, 0);
-    rb_ary_push(members, rb_str_new2("cpath"));
-
     /* Document-method: body
      * the body of the class definition
      */
@@ -3458,6 +3467,12 @@ void define_node_subclass_methods()
      */
     rb_define_method(rb_cCLASS, "super", node_super, 0);
     rb_ary_push(members, rb_str_new2("super"));
+
+    /* Document-method: cpath
+     * the name of the class to define
+     */
+    rb_define_method(rb_cCLASS, "cpath", node_cpath, 0);
+    rb_ary_push(members, rb_str_new2("cpath"));
   }
 
   /* Document-class: Node::COLON2
@@ -3476,17 +3491,17 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cCOLON2, "__type__", INT2NUM(NODE_COLON2));
     rb_define_singleton_method(rb_cCOLON2, "members", node_s_members, 0);
 
-    /* Document-method: head
-     * an expression specifying the class in which to do the lookup
-     */
-    rb_define_method(rb_cCOLON2, "head", node_head, 0);
-    rb_ary_push(members, rb_str_new2("head"));
-
     /* Document-method: mid
      * the name of the method or constant to call/look up
      */
     rb_define_method(rb_cCOLON2, "mid", node_mid, 0);
     rb_ary_push(members, rb_str_new2("mid"));
+
+    /* Document-method: head
+     * an expression specifying the class in which to do the lookup
+     */
+    rb_define_method(rb_cCOLON2, "head", node_head, 0);
+    rb_ary_push(members, rb_str_new2("head"));
   }
 
   /* Document-class: Node::COLON3
@@ -3551,17 +3566,17 @@ void define_node_subclass_methods()
     rb_define_method(rb_cCREF, "body", node_body, 0);
     rb_ary_push(members, rb_str_new2("body"));
 
-    /* Document-method: next
-     * the previous value of ruby_cref or ruby_top_cref
-     */
-    rb_define_method(rb_cCREF, "next", node_next, 0);
-    rb_ary_push(members, rb_str_new2("next"));
-
     /* Document-method: clss
      * the new class to use for the cbase.
      */
     rb_define_method(rb_cCREF, "clss", node_clss, 0);
     rb_ary_push(members, rb_str_new2("clss"));
+
+    /* Document-method: next
+     * the previous value of ruby_cref or ruby_top_cref
+     */
+    rb_define_method(rb_cCREF, "next", node_next, 0);
+    rb_ary_push(members, rb_str_new2("next"));
   }
 
   /* Document-class: Node::CVAR
@@ -3594,18 +3609,18 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cCVASGN, "__type__", INT2NUM(NODE_CVASGN));
     rb_define_singleton_method(rb_cCVASGN, "members", node_s_members, 0);
 
+    /* Document-method: vid
+     * the name of the class variable to assign
+     */
+    rb_define_method(rb_cCVASGN, "vid", node_vid, 0);
+    rb_ary_push(members, rb_str_new2("vid"));
+
     /* Document-method: value
      * an expression whose result is the new value of the class
      * variable
      */
     rb_define_method(rb_cCVASGN, "value", node_value, 0);
     rb_ary_push(members, rb_str_new2("value"));
-
-    /* Document-method: vid
-     * the name of the class variable to assign
-     */
-    rb_define_method(rb_cCVASGN, "vid", node_vid, 0);
-    rb_ary_push(members, rb_str_new2("vid"));
   }
 
   /* Document-class: Node::CVDECL
@@ -3621,18 +3636,18 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cCVDECL, "__type__", INT2NUM(NODE_CVDECL));
     rb_define_singleton_method(rb_cCVDECL, "members", node_s_members, 0);
 
+    /* Document-method: vid
+     * the name of the class variable to assign
+     */
+    rb_define_method(rb_cCVDECL, "vid", node_vid, 0);
+    rb_ary_push(members, rb_str_new2("vid"));
+
     /* Document-method: value
      * an expression whose result is the new value of the class
      * variable
      */
     rb_define_method(rb_cCVDECL, "value", node_value, 0);
     rb_ary_push(members, rb_str_new2("value"));
-
-    /* Document-method: vid
-     * the name of the class variable to assign
-     */
-    rb_define_method(rb_cCVDECL, "vid", node_vid, 0);
-    rb_ary_push(members, rb_str_new2("vid"));
   }
 
   /* Document-class: Node::DASGN
@@ -3655,17 +3670,17 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cDASGN, "__type__", INT2NUM(NODE_DASGN));
     rb_define_singleton_method(rb_cDASGN, "members", node_s_members, 0);
 
-    /* Document-method: value
-     * the value to assign to the local variable
-     */
-    rb_define_method(rb_cDASGN, "value", node_value, 0);
-    rb_ary_push(members, rb_str_new2("value"));
-
     /* Document-method: vid
      * the name of the local variable
      */
     rb_define_method(rb_cDASGN, "vid", node_vid, 0);
     rb_ary_push(members, rb_str_new2("vid"));
+
+    /* Document-method: value
+     * the value to assign to the local variable
+     */
+    rb_define_method(rb_cDASGN, "value", node_value, 0);
+    rb_ary_push(members, rb_str_new2("value"));
   }
 
   /* Document-class: Node::DASGN_CURR
@@ -3680,17 +3695,17 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cDASGN_CURR, "__type__", INT2NUM(NODE_DASGN_CURR));
     rb_define_singleton_method(rb_cDASGN_CURR, "members", node_s_members, 0);
 
-    /* Document-method: value
-     * the value to assign to the local variable
-     */
-    rb_define_method(rb_cDASGN_CURR, "value", node_value, 0);
-    rb_ary_push(members, rb_str_new2("value"));
-
     /* Document-method: vid
      * the name of the local variable
      */
     rb_define_method(rb_cDASGN_CURR, "vid", node_vid, 0);
     rb_ary_push(members, rb_str_new2("vid"));
+
+    /* Document-method: value
+     * the value to assign to the local variable
+     */
+    rb_define_method(rb_cDASGN_CURR, "value", node_value, 0);
+    rb_ary_push(members, rb_str_new2("value"));
   }
 
   /* Document-class: Node::DEFINED
@@ -3726,11 +3741,11 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cDEFN, "__type__", INT2NUM(NODE_DEFN));
     rb_define_singleton_method(rb_cDEFN, "members", node_s_members, 0);
 
-    /* Document-method: defn
-     * the body of the method definition
+    /* Document-method: noex
+     * the flags which should be used to define the method
      */
-    rb_define_method(rb_cDEFN, "defn", node_defn, 0);
-    rb_ary_push(members, rb_str_new2("defn"));
+    rb_define_method(rb_cDEFN, "noex", node_noex, 0);
+    rb_ary_push(members, rb_str_new2("noex"));
 
     /* Document-method: mid
      * the name of the method* defn the body of the method
@@ -3738,11 +3753,11 @@ void define_node_subclass_methods()
     rb_define_method(rb_cDEFN, "mid", node_mid, 0);
     rb_ary_push(members, rb_str_new2("mid"));
 
-    /* Document-method: noex
-     * the flags which should be used to define the method
+    /* Document-method: defn
+     * the body of the method definition
      */
-    rb_define_method(rb_cDEFN, "noex", node_noex, 0);
-    rb_ary_push(members, rb_str_new2("noex"));
+    rb_define_method(rb_cDEFN, "defn", node_defn, 0);
+    rb_ary_push(members, rb_str_new2("defn"));
   }
 
   /* Document-class: Node::DEFS
@@ -3758,14 +3773,14 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cDEFS, "__member__", members);
     rb_iv_set(rb_cDEFS, "__type__", INT2NUM(NODE_DEFS));
     rb_define_singleton_method(rb_cDEFS, "members", node_s_members, 0);
-    rb_define_method(rb_cDEFS, "defn", node_defn, 0);
-    rb_ary_push(members, rb_str_new2("defn"));
 
     /* Document-method: mid
      * the name of the method* defn the body of the method
      */
     rb_define_method(rb_cDEFS, "mid", node_mid, 0);
     rb_ary_push(members, rb_str_new2("mid"));
+    rb_define_method(rb_cDEFS, "defn", node_defn, 0);
+    rb_ary_push(members, rb_str_new2("defn"));
 
     /* Document-method: recv
      * the object to whose singleton class the new method is to be  added
@@ -3809,20 +3824,20 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cDOT2, "__member__", members);
     rb_iv_set(rb_cDOT2, "__type__", INT2NUM(NODE_DOT2));
     rb_define_singleton_method(rb_cDOT2, "members", node_s_members, 0);
-
-    /* Document-method: beg
-     * the beginning of the range
-     */
-    rb_define_method(rb_cDOT2, "beg", node_beg, 0);
-    rb_ary_push(members, rb_str_new2("beg"));
+    rb_define_method(rb_cDOT2, "state", node_state, 0);
+    rb_ary_push(members, rb_str_new2("state"));
 
     /* Document-method: end
      * the end of the range
      */
     rb_define_method(rb_cDOT2, "end", node_end, 0);
     rb_ary_push(members, rb_str_new2("end"));
-    rb_define_method(rb_cDOT2, "state", node_state, 0);
-    rb_ary_push(members, rb_str_new2("state"));
+
+    /* Document-method: beg
+     * the beginning of the range
+     */
+    rb_define_method(rb_cDOT2, "beg", node_beg, 0);
+    rb_ary_push(members, rb_str_new2("beg"));
   }
 
   /* Document-class: Node::DOT3
@@ -3837,20 +3852,20 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cDOT3, "__member__", members);
     rb_iv_set(rb_cDOT3, "__type__", INT2NUM(NODE_DOT3));
     rb_define_singleton_method(rb_cDOT3, "members", node_s_members, 0);
-
-    /* Document-method: beg
-     * the beginning of the range
-     */
-    rb_define_method(rb_cDOT3, "beg", node_beg, 0);
-    rb_ary_push(members, rb_str_new2("beg"));
+    rb_define_method(rb_cDOT3, "state", node_state, 0);
+    rb_ary_push(members, rb_str_new2("state"));
 
     /* Document-method: end
      * the end of the range
      */
     rb_define_method(rb_cDOT3, "end", node_end, 0);
     rb_ary_push(members, rb_str_new2("end"));
-    rb_define_method(rb_cDOT3, "state", node_state, 0);
-    rb_ary_push(members, rb_str_new2("state"));
+
+    /* Document-method: beg
+     * the beginning of the range
+     */
+    rb_define_method(rb_cDOT3, "beg", node_beg, 0);
+    rb_ary_push(members, rb_str_new2("beg"));
   }
 
   /* Document-class: Node::DREGX
@@ -3875,9 +3890,15 @@ void define_node_subclass_methods()
     rb_define_method(rb_cDREGX, "lit", node_lit, 0);
     rb_ary_push(members, rb_str_new2("lit"));
 
-    /* Document-method: cflag
-     * a bitfield containing the options used in the regular
-     * expression.  Valid values include:
+    /* Document-method: next
+     * a list of expressions to be appended onto the string
+     */
+    rb_define_method(rb_cDREGX, "next", node_next, 0);
+    rb_ary_push(members, rb_str_new2("next"));
+
+    /* Document-method: cflag
+     * a bitfield containing the options used in the regular
+     * expression.  Valid values include:
      * * RE_OPTION_IGNORECASE
      * * RE_OPTION_EXTENDED
      * * RE_OPTION_MULTILINE
@@ -3891,12 +3912,6 @@ void define_node_subclass_methods()
      */
     rb_define_method(rb_cDREGX, "cflag", node_cflag, 0);
     rb_ary_push(members, rb_str_new2("cflag"));
-
-    /* Document-method: next
-     * a list of expressions to be appended onto the string
-     */
-    rb_define_method(rb_cDREGX, "next", node_next, 0);
-    rb_ary_push(members, rb_str_new2("next"));
   }
 
   /* Document-class: Node::DREGX_ONCE
@@ -3918,18 +3933,18 @@ void define_node_subclass_methods()
     rb_define_method(rb_cDREGX_ONCE, "lit", node_lit, 0);
     rb_ary_push(members, rb_str_new2("lit"));
 
+    /* Document-method: next
+     * a list of expressions to be appended onto the string
+     */
+    rb_define_method(rb_cDREGX_ONCE, "next", node_next, 0);
+    rb_ary_push(members, rb_str_new2("next"));
+
     /* Document-method: cflag
      * a bitfield containing the options used in the regular
      * expression.  See DREGX for a list of valid values.
      */
     rb_define_method(rb_cDREGX_ONCE, "cflag", node_cflag, 0);
     rb_ary_push(members, rb_str_new2("cflag"));
-
-    /* Document-method: next
-     * a list of expressions to be appended onto the string
-     */
-    rb_define_method(rb_cDREGX_ONCE, "next", node_next, 0);
-    rb_ary_push(members, rb_str_new2("next"));
   }
 
   /* Document-class: Node::DSTR
@@ -4119,11 +4134,11 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cFBODY, "__type__", INT2NUM(NODE_FBODY));
     rb_define_singleton_method(rb_cFBODY, "members", node_s_members, 0);
 
-    /* Document-method: head
-     * the method body
+    /* Document-method: mid
+     * the name of the method
      */
-    rb_define_method(rb_cFBODY, "head", node_head, 0);
-    rb_ary_push(members, rb_str_new2("head"));
+    rb_define_method(rb_cFBODY, "mid", node_mid, 0);
+    rb_ary_push(members, rb_str_new2("mid"));
 
     /* Document-method: orig
      * the origin class
@@ -4131,11 +4146,11 @@ void define_node_subclass_methods()
     rb_define_method(rb_cFBODY, "orig", node_orig, 0);
     rb_ary_push(members, rb_str_new2("orig"));
 
-    /* Document-method: mid
-     * the name of the method
+    /* Document-method: head
+     * the method body
      */
-    rb_define_method(rb_cFBODY, "mid", node_mid, 0);
-    rb_ary_push(members, rb_str_new2("mid"));
+    rb_define_method(rb_cFBODY, "head", node_head, 0);
+    rb_ary_push(members, rb_str_new2("head"));
   }
 
   /* Document-class: Node::FCALL
@@ -4153,17 +4168,17 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cFCALL, "__type__", INT2NUM(NODE_FCALL));
     rb_define_singleton_method(rb_cFCALL, "members", node_s_members, 0);
 
-    /* Document-method: args
-     * the arguments to the method
-     */
-    rb_define_method(rb_cFCALL, "args", node_args, 0);
-    rb_ary_push(members, rb_str_new2("args"));
-
     /* Document-method: mid
      * the method id
      */
     rb_define_method(rb_cFCALL, "mid", node_mid, 0);
     rb_ary_push(members, rb_str_new2("mid"));
+
+    /* Document-method: args
+     * the arguments to the method
+     */
+    rb_define_method(rb_cFCALL, "args", node_args, 0);
+    rb_ary_push(members, rb_str_new2("args"));
   }
 
   /* Document-class: Node::FLIP2
@@ -4180,11 +4195,12 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cFLIP2, "__type__", INT2NUM(NODE_FLIP2));
     rb_define_singleton_method(rb_cFLIP2, "members", node_s_members, 0);
 
-    /* Document-method: beg
-     * the beginning of the range
+    /* Document-method: cnt
+     * the index into the local variable table of the special variable
+     * to use in the flip-flop expression (usually 2 for $_)
      */
-    rb_define_method(rb_cFLIP2, "beg", node_beg, 0);
-    rb_ary_push(members, rb_str_new2("beg"));
+    rb_define_method(rb_cFLIP2, "cnt", node_cnt, 0);
+    rb_ary_push(members, rb_str_new2("cnt"));
 
     /* Document-method: end
      * the end of the range
@@ -4192,12 +4208,11 @@ void define_node_subclass_methods()
     rb_define_method(rb_cFLIP2, "end", node_end, 0);
     rb_ary_push(members, rb_str_new2("end"));
 
-    /* Document-method: cnt
-     * the index into the local variable table of the special variable
-     * to use in the flip-flop expression (usually 2 for $_)
+    /* Document-method: beg
+     * the beginning of the range
      */
-    rb_define_method(rb_cFLIP2, "cnt", node_cnt, 0);
-    rb_ary_push(members, rb_str_new2("cnt"));
+    rb_define_method(rb_cFLIP2, "beg", node_beg, 0);
+    rb_ary_push(members, rb_str_new2("beg"));
   }
 
   /* Document-class: Node::FLIP3
@@ -4214,11 +4229,12 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cFLIP3, "__type__", INT2NUM(NODE_FLIP3));
     rb_define_singleton_method(rb_cFLIP3, "members", node_s_members, 0);
 
-    /* Document-method: beg
-     * the beginning of the range
+    /* Document-method: cnt
+     * the index into the local variable table of the special variable
+     * to use in the flip-flop expression (usually 2 for $_)
      */
-    rb_define_method(rb_cFLIP3, "beg", node_beg, 0);
-    rb_ary_push(members, rb_str_new2("beg"));
+    rb_define_method(rb_cFLIP3, "cnt", node_cnt, 0);
+    rb_ary_push(members, rb_str_new2("cnt"));
 
     /* Document-method: end
      * the end of the range
@@ -4226,12 +4242,11 @@ void define_node_subclass_methods()
     rb_define_method(rb_cFLIP3, "end", node_end, 0);
     rb_ary_push(members, rb_str_new2("end"));
 
-    /* Document-method: cnt
-     * the index into the local variable table of the special variable
-     * to use in the flip-flop expression (usually 2 for $_)
+    /* Document-method: beg
+     * the beginning of the range
      */
-    rb_define_method(rb_cFLIP3, "cnt", node_cnt, 0);
-    rb_ary_push(members, rb_str_new2("cnt"));
+    rb_define_method(rb_cFLIP3, "beg", node_beg, 0);
+    rb_ary_push(members, rb_str_new2("beg"));
   }
 
   /* Document-class: Node::FOR
@@ -4287,20 +4302,20 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cGASGN, "__member__", members);
     rb_iv_set(rb_cGASGN, "__type__", INT2NUM(NODE_GASGN));
     rb_define_singleton_method(rb_cGASGN, "members", node_s_members, 0);
-
-    /* Document-method: value
-     * an expression whose result is the new value of the global variable
-     */
-    rb_define_method(rb_cGASGN, "value", node_value, 0);
-    rb_ary_push(members, rb_str_new2("value"));
+    rb_define_method(rb_cGASGN, "entry", node_entry, 0);
+    rb_ary_push(members, rb_str_new2("entry"));
 
     /* Document-method: vid
      * the name of the global variable, with a leading '$' character.
      */
     rb_define_method(rb_cGASGN, "vid", node_vid, 0);
     rb_ary_push(members, rb_str_new2("vid"));
-    rb_define_method(rb_cGASGN, "entry", node_entry, 0);
-    rb_ary_push(members, rb_str_new2("entry"));
+
+    /* Document-method: value
+     * an expression whose result is the new value of the global variable
+     */
+    rb_define_method(rb_cGASGN, "value", node_value, 0);
+    rb_ary_push(members, rb_str_new2("value"));
   }
 
   /* Document-class: Node::GVAR
@@ -4313,14 +4328,14 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cGVAR, "__member__", members);
     rb_iv_set(rb_cGVAR, "__type__", INT2NUM(NODE_GVAR));
     rb_define_singleton_method(rb_cGVAR, "members", node_s_members, 0);
+    rb_define_method(rb_cGVAR, "entry", node_entry, 0);
+    rb_ary_push(members, rb_str_new2("entry"));
 
     /* Document-method: vid
      * the name of the global variable to retrieve, with a leading '$'
      */
     rb_define_method(rb_cGVAR, "vid", node_vid, 0);
     rb_ary_push(members, rb_str_new2("vid"));
-    rb_define_method(rb_cGVAR, "entry", node_entry, 0);
-    rb_ary_push(members, rb_str_new2("entry"));
   }
 
   /* Document-class: Node::HASH
@@ -4353,17 +4368,17 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cIASGN, "__type__", INT2NUM(NODE_IASGN));
     rb_define_singleton_method(rb_cIASGN, "members", node_s_members, 0);
 
-    /* Document-method: value
-     * the value to assign to the instance variable
-     */
-    rb_define_method(rb_cIASGN, "value", node_value, 0);
-    rb_ary_push(members, rb_str_new2("value"));
-
     /* Document-method: vid
      * the name of the instance variable, with a leading '@' sign
      */
     rb_define_method(rb_cIASGN, "vid", node_vid, 0);
     rb_ary_push(members, rb_str_new2("vid"));
+
+    /* Document-method: value
+     * the value to assign to the instance variable
+     */
+    rb_define_method(rb_cIASGN, "value", node_value, 0);
+    rb_ary_push(members, rb_str_new2("value"));
   }
 
   /* Document-class: Node::IF
@@ -4395,12 +4410,6 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cIF, "__type__", INT2NUM(NODE_IF));
     rb_define_singleton_method(rb_cIF, "members", node_s_members, 0);
 
-    /* Document-method: cond
-     * the condition to evaluate
-     */
-    rb_define_method(rb_cIF, "cond", node_cond, 0);
-    rb_ary_push(members, rb_str_new2("cond"));
-
     /* Document-method: body
      * the expression to evaluate if the expression is true, or false
      * if the expression is empty
@@ -4408,6 +4417,12 @@ void define_node_subclass_methods()
     rb_define_method(rb_cIF, "body", node_body, 0);
     rb_ary_push(members, rb_str_new2("body"));
 
+    /* Document-method: cond
+     * the condition to evaluate
+     */
+    rb_define_method(rb_cIF, "cond", node_cond, 0);
+    rb_ary_push(members, rb_str_new2("cond"));
+
     /* Document-method: else
      * the expression to evaluate if the expression is false, or false
      * if the expression is empty
@@ -4427,6 +4442,12 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cIFUNC, "__type__", INT2NUM(NODE_IFUNC));
     rb_define_singleton_method(rb_cIFUNC, "members", node_s_members, 0);
 
+    /* Document-method: state
+     * always 0
+     */
+    rb_define_method(rb_cIFUNC, "state", node_state, 0);
+    rb_ary_push(members, rb_str_new2("state"));
+
     /* Document-method: cfnc
      * a pointer to the C function to which to yield
      */
@@ -4439,12 +4460,6 @@ void define_node_subclass_methods()
      */
     rb_define_method(rb_cIFUNC, "tval", node_tval, 0);
     rb_ary_push(members, rb_str_new2("tval"));
-
-    /* Document-method: state
-     * always 0
-     */
-    rb_define_method(rb_cIFUNC, "state", node_state, 0);
-    rb_ary_push(members, rb_str_new2("state"));
   }
 
   /* Document-class: Node::ITER
@@ -4521,20 +4536,20 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cLASGN, "__member__", members);
     rb_iv_set(rb_cLASGN, "__type__", INT2NUM(NODE_LASGN));
     rb_define_singleton_method(rb_cLASGN, "members", node_s_members, 0);
-
-    /* Document-method: value
-     * the value to assign to the local variable
-     */
-    rb_define_method(rb_cLASGN, "value", node_value, 0);
-    rb_ary_push(members, rb_str_new2("value"));
+    rb_define_method(rb_cLASGN, "cnt", node_cnt, 0);
+    rb_ary_push(members, rb_str_new2("cnt"));
 
     /* Document-method: vid
      * the name of the local variable
      */
     rb_define_method(rb_cLASGN, "vid", node_vid, 0);
     rb_ary_push(members, rb_str_new2("vid"));
-    rb_define_method(rb_cLASGN, "cnt", node_cnt, 0);
-    rb_ary_push(members, rb_str_new2("cnt"));
+
+    /* Document-method: value
+     * the value to assign to the local variable
+     */
+    rb_define_method(rb_cLASGN, "value", node_value, 0);
+    rb_ary_push(members, rb_str_new2("value"));
   }
 
   /* Document-class: Node::LIT
@@ -4566,14 +4581,14 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cLVAR, "__member__", members);
     rb_iv_set(rb_cLVAR, "__type__", INT2NUM(NODE_LVAR));
     rb_define_singleton_method(rb_cLVAR, "members", node_s_members, 0);
+    rb_define_method(rb_cLVAR, "cnt", node_cnt, 0);
+    rb_ary_push(members, rb_str_new2("cnt"));
 
     /* Document-method: vid
      * the name of the local variable to retrieve.
      */
     rb_define_method(rb_cLVAR, "vid", node_vid, 0);
     rb_ary_push(members, rb_str_new2("vid"));
-    rb_define_method(rb_cLVAR, "cnt", node_cnt, 0);
-    rb_ary_push(members, rb_str_new2("cnt"));
   }
 
   /* Document-class: Node::MASGN
@@ -4666,6 +4681,13 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cMATCH2, "__type__", INT2NUM(NODE_MATCH2));
     rb_define_singleton_method(rb_cMATCH2, "members", node_s_members, 0);
 
+    /* Document-method: recv
+     * the regular expression on the left hand side of the match
+     * operator
+     */
+    rb_define_method(rb_cMATCH2, "recv", node_recv, 0);
+    rb_ary_push(members, rb_str_new2("recv"));
+
     /* Document-method: value
      * the expression on the right hand side of the match operator, or
      * an expression returning $_ if there is nothing on the right hand
@@ -4673,13 +4695,6 @@ void define_node_subclass_methods()
      */
     rb_define_method(rb_cMATCH2, "value", node_value, 0);
     rb_ary_push(members, rb_str_new2("value"));
-
-    /* Document-method: recv
-     * the regular expression on the left hand side of the match
-     * operator
-     */
-    rb_define_method(rb_cMATCH2, "recv", node_recv, 0);
-    rb_ary_push(members, rb_str_new2("recv"));
   }
 
   /* Document-class: Node::MATCH3
@@ -4697,17 +4712,17 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cMATCH3, "__type__", INT2NUM(NODE_MATCH3));
     rb_define_singleton_method(rb_cMATCH3, "members", node_s_members, 0);
 
-    /* Document-method: value
-     * the right hand side of the match
-     */
-    rb_define_method(rb_cMATCH3, "value", node_value, 0);
-    rb_ary_push(members, rb_str_new2("value"));
-
     /* Document-method: recv
      * the left hand side of the match
      */
     rb_define_method(rb_cMATCH3, "recv", node_recv, 0);
     rb_ary_push(members, rb_str_new2("recv"));
+
+    /* Document-method: value
+     * the right hand side of the match
+     */
+    rb_define_method(rb_cMATCH3, "value", node_value, 0);
+    rb_ary_push(members, rb_str_new2("value"));
   }
 
   /* Document-class: Node::MEMO
@@ -4776,17 +4791,17 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cMODULE, "__type__", INT2NUM(NODE_MODULE));
     rb_define_singleton_method(rb_cMODULE, "members", node_s_members, 0);
 
-    /* Document-method: cpath
-     * the name of the module to define
-     */
-    rb_define_method(rb_cMODULE, "cpath", node_cpath, 0);
-    rb_ary_push(members, rb_str_new2("cpath"));
-
     /* Document-method: body
      * the body of the module definition
      */
     rb_define_method(rb_cMODULE, "body", node_body, 0);
     rb_ary_push(members, rb_str_new2("body"));
+
+    /* Document-method: cpath
+     * the name of the module to define
+     */
+    rb_define_method(rb_cMODULE, "cpath", node_cpath, 0);
+    rb_ary_push(members, rb_str_new2("cpath"));
   }
 
   /* Document-class: Node::NEWLINE
@@ -4928,12 +4943,6 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cOP_ASGN1, "__type__", INT2NUM(NODE_OP_ASGN1));
     rb_define_singleton_method(rb_cOP_ASGN1, "members", node_s_members, 0);
 
-    /* Document-method: args
-     * the arguments to the assigment
-     */
-    rb_define_method(rb_cOP_ASGN1, "args", node_args, 0);
-    rb_ary_push(members, rb_str_new2("args"));
-
     /* Document-method: mid
      * 0, 1, or the name a method to call to calculate the value of the
      * rhs
@@ -4946,6 +4955,12 @@ void define_node_subclass_methods()
      */
     rb_define_method(rb_cOP_ASGN1, "recv", node_recv, 0);
     rb_ary_push(members, rb_str_new2("recv"));
+
+    /* Document-method: args
+     * the arguments to the assigment
+     */
+    rb_define_method(rb_cOP_ASGN1, "args", node_args, 0);
+    rb_ary_push(members, rb_str_new2("args"));
   }
 
   /* Document-class: Node::OP_ASGN2
@@ -4968,11 +4983,11 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cOP_ASGN2, "__type__", INT2NUM(NODE_OP_ASGN2));
     rb_define_singleton_method(rb_cOP_ASGN2, "members", node_s_members, 0);
 
-    /* Document-method: value
-     * the value to assign to the attribute
+    /* Document-method: recv
+     * the receiver of the attribute
      */
-    rb_define_method(rb_cOP_ASGN2, "value", node_value, 0);
-    rb_ary_push(members, rb_str_new2("value"));
+    rb_define_method(rb_cOP_ASGN2, "recv", node_recv, 0);
+    rb_ary_push(members, rb_str_new2("recv"));
 
     /* Document-method: next
      * another node of type OP_ASGN2 which contains more information
@@ -4981,11 +4996,11 @@ void define_node_subclass_methods()
     rb_define_method(rb_cOP_ASGN2, "next", node_next, 0);
     rb_ary_push(members, rb_str_new2("next"));
 
-    /* Document-method: recv
-     * the receiver of the attribute
+    /* Document-method: value
+     * the value to assign to the attribute
      */
-    rb_define_method(rb_cOP_ASGN2, "recv", node_recv, 0);
-    rb_ary_push(members, rb_str_new2("recv"));
+    rb_define_method(rb_cOP_ASGN2, "value", node_value, 0);
+    rb_ary_push(members, rb_str_new2("value"));
   }
 
   /* Document-class: Node::OP_ASGN2_ARG
@@ -5001,12 +5016,6 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cOP_ASGN2_ARG, "__type__", INT2NUM(NODE_OP_ASGN2_ARG));
     rb_define_singleton_method(rb_cOP_ASGN2_ARG, "members", node_s_members, 0);
 
-    /* Document-method: vid
-     * The method to call on the receiver to retrieve the attribute
-     */
-    rb_define_method(rb_cOP_ASGN2_ARG, "vid", node_vid, 0);
-    rb_ary_push(members, rb_str_new2("vid"));
-
     /* Document-method: aid
      * The method to call on the receiver to set the attribute
      */
@@ -5020,6 +5029,12 @@ void define_node_subclass_methods()
      */
     rb_define_method(rb_cOP_ASGN2_ARG, "mid", node_mid, 0);
     rb_ary_push(members, rb_str_new2("mid"));
+
+    /* Document-method: vid
+     * The method to call on the receiver to retrieve the attribute
+     */
+    rb_define_method(rb_cOP_ASGN2_ARG, "vid", node_vid, 0);
+    rb_ary_push(members, rb_str_new2("vid"));
   }
 
   /* Document-class: Node::OP_ASGN_AND
@@ -5038,18 +5053,18 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cOP_ASGN_AND, "__type__", INT2NUM(NODE_OP_ASGN_AND));
     rb_define_singleton_method(rb_cOP_ASGN_AND, "members", node_s_members, 0);
 
+    /* Document-method: recv
+     * an expression representing the left hand side of the assignment
+     */
+    rb_define_method(rb_cOP_ASGN_AND, "recv", node_recv, 0);
+    rb_ary_push(members, rb_str_new2("recv"));
+
     /* Document-method: value
      * an expression representing the assignment that should be
      * performed if the left hand side is true
      */
     rb_define_method(rb_cOP_ASGN_AND, "value", node_value, 0);
     rb_ary_push(members, rb_str_new2("value"));
-
-    /* Document-method: recv
-     * an expression representing the left hand side of the assignment
-     */
-    rb_define_method(rb_cOP_ASGN_AND, "recv", node_recv, 0);
-    rb_ary_push(members, rb_str_new2("recv"));
   }
 
   /* Document-class: Node::OP_ASGN_OR
@@ -5076,17 +5091,17 @@ void define_node_subclass_methods()
     rb_define_method(rb_cOP_ASGN_OR, "aid", node_aid, 0);
     rb_ary_push(members, rb_str_new2("aid"));
 
-    /* Document-method: value
-     * the right hand side of the assignment
-     */
-    rb_define_method(rb_cOP_ASGN_OR, "value", node_value, 0);
-    rb_ary_push(members, rb_str_new2("value"));
-
     /* Document-method: recv
      * the receiver of the assignment
      */
     rb_define_method(rb_cOP_ASGN_OR, "recv", node_recv, 0);
     rb_ary_push(members, rb_str_new2("recv"));
+
+    /* Document-method: value
+     * the right hand side of the assignment
+     */
+    rb_define_method(rb_cOP_ASGN_OR, "value", node_value, 0);
+    rb_ary_push(members, rb_str_new2("value"));
   }
 
   /* Document-class: Node::OR
@@ -5166,6 +5181,12 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cRESBODY, "__type__", INT2NUM(NODE_RESBODY));
     rb_define_singleton_method(rb_cRESBODY, "members", node_s_members, 0);
 
+    /* Document-method: body
+     * the expresion to evaluate if the exception type matches
+     */
+    rb_define_method(rb_cRESBODY, "body", node_body, 0);
+    rb_ary_push(members, rb_str_new2("body"));
+
     /* Document-method: head
      * the next rescue
      */
@@ -5177,12 +5198,6 @@ void define_node_subclass_methods()
      */
     rb_define_method(rb_cRESBODY, "args", node_args, 0);
     rb_ary_push(members, rb_str_new2("args"));
-
-    /* Document-method: body
-     * the expresion to evaluate if the exception type matches
-     */
-    rb_define_method(rb_cRESBODY, "body", node_body, 0);
-    rb_ary_push(members, rb_str_new2("body"));
   }
 
   /* Document-class: Node::RESCUE
@@ -5222,6 +5237,12 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cRESCUE, "__type__", INT2NUM(NODE_RESCUE));
     rb_define_singleton_method(rb_cRESCUE, "members", node_s_members, 0);
 
+    /* Document-method: resq
+     * the expression to be evaluated if an exception is raised
+     */
+    rb_define_method(rb_cRESCUE, "resq", node_resq, 0);
+    rb_ary_push(members, rb_str_new2("resq"));
+
     /* Document-method: head
      * the body of the block to evaluate
      */
@@ -5233,12 +5254,6 @@ void define_node_subclass_methods()
      */
     rb_define_method(rb_cRESCUE, "else", node_else, 0);
     rb_ary_push(members, rb_str_new2("else"));
-
-    /* Document-method: resq
-     * the expression to be evaluated if an exception is raised
-     */
-    rb_define_method(rb_cRESCUE, "resq", node_resq, 0);
-    rb_ary_push(members, rb_str_new2("resq"));
   }
 
   /* Document-class: Node::RETRY
@@ -5519,14 +5534,14 @@ void define_node_subclass_methods()
      */
     rb_define_method(rb_cUNTIL, "body", node_body, 0);
     rb_ary_push(members, rb_str_new2("body"));
+    rb_define_method(rb_cUNTIL, "state", node_state, 0);
+    rb_ary_push(members, rb_str_new2("state"));
 
     /* Document-method: cond
      * a condition to terminate the loop when it becomes true
      */
     rb_define_method(rb_cUNTIL, "cond", node_cond, 0);
     rb_ary_push(members, rb_str_new2("cond"));
-    rb_define_method(rb_cUNTIL, "state", node_state, 0);
-    rb_ary_push(members, rb_str_new2("state"));
   }
 
   /* Document-class: Node::VALIAS
@@ -5605,12 +5620,6 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cWHEN, "__type__", INT2NUM(NODE_WHEN));
     rb_define_singleton_method(rb_cWHEN, "members", node_s_members, 0);
 
-    /* Document-method: head
-     * a value to compare against, or a condition to be tested
-     */
-    rb_define_method(rb_cWHEN, "head", node_head, 0);
-    rb_ary_push(members, rb_str_new2("head"));
-
     /* Document-method: body
      * an expression to evaluate if the condition evaluates to true
      */
@@ -5622,6 +5631,12 @@ void define_node_subclass_methods()
      */
     rb_define_method(rb_cWHEN, "next", node_next, 0);
     rb_ary_push(members, rb_str_new2("next"));
+
+    /* Document-method: head
+     * a value to compare against, or a condition to be tested
+     */
+    rb_define_method(rb_cWHEN, "head", node_head, 0);
+    rb_ary_push(members, rb_str_new2("head"));
   }
 
   /* Document-class: Node::WHILE
@@ -5643,14 +5658,14 @@ void define_node_subclass_methods()
      */
     rb_define_method(rb_cWHILE, "body", node_body, 0);
     rb_ary_push(members, rb_str_new2("body"));
+    rb_define_method(rb_cWHILE, "state", node_state, 0);
+    rb_ary_push(members, rb_str_new2("state"));
 
     /* Document-method: cond
      * a condition to terminate the loop when it becomes false
      */
     rb_define_method(rb_cWHILE, "cond", node_cond, 0);
     rb_ary_push(members, rb_str_new2("cond"));
-    rb_define_method(rb_cWHILE, "state", node_state, 0);
-    rb_ary_push(members, rb_str_new2("state"));
   }
 
   /* Document-class: Node::XSTR
@@ -5687,17 +5702,17 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cYIELD, "__type__", INT2NUM(NODE_YIELD));
     rb_define_singleton_method(rb_cYIELD, "members", node_s_members, 0);
 
-    /* Document-method: head
-     * the value to yield
-     */
-    rb_define_method(rb_cYIELD, "head", node_head, 0);
-    rb_ary_push(members, rb_str_new2("head"));
-
     /* Document-method: state
      * if nonzero, splats the value before yielding
      */
     rb_define_method(rb_cYIELD, "state", node_state, 0);
     rb_ary_push(members, rb_str_new2("state"));
+
+    /* Document-method: head
+     * the value to yield
+     */
+    rb_define_method(rb_cYIELD, "head", node_head, 0);
+    rb_ary_push(members, rb_str_new2("head"));
   }
 
   /* Document-class: Node::ZARRAY