ruby-internal 0.8.0 → 0.8.1

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

@@ -2,15 +2,15 @@
 #include "version.h"
 
 Node_Type_Descrip node_type_descrips_unsorted[] = {
-  { NODE_ALIAS, NEN_2ND, NEN_1ST, NEN_NONE, "ALIAS" },
+  { NODE_ALIAS, NEN_1ST, NEN_2ND, NEN_NONE, "ALIAS" },
 #ifdef HAVE_NODE_ALLOCA
   { NODE_ALLOCA, NEN_CFNC, NEN_VALUE, NEN_CNT, "ALLOCA" },
 #endif
   { NODE_AND, NEN_2ND, NEN_1ST, NEN_NONE, "AND" },
-  { NODE_ARGS, NEN_OPT, NEN_REST, NEN_CNT, "ARGS" },
+  { 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_ARRAY, NEN_ALEN, NEN_HEAD, NEN_NEXT, "ARRAY" },
   { NODE_ATTRASGN, NEN_RECV, NEN_ARGS, NEN_MID, "ATTRASGN" },
   { NODE_ATTRSET, NEN_VID, NEN_NONE, NEN_NONE, "ATTRSET" },
   { NODE_BACK_REF, NEN_NTH, NEN_CNT, NEN_NONE, "BACK_REF" },
@@ -20,78 +20,78 @@ Node_Type_Descrip node_type_descrips_unsorted[] = {
   { 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_RECV, NEN_ARGS, NEN_MID, "CALL" },
+  { NODE_CALL, NEN_ARGS, NEN_MID, NEN_RECV, "CALL" },
   { NODE_CASE, NEN_HEAD, NEN_BODY, NEN_NEXT, "CASE" },
-  { NODE_CDECL, NEN_VID, NEN_VALUE, NEN_NONE, "CDECL" },
+  { NODE_CDECL, NEN_VALUE, NEN_VID, NEN_NONE, "CDECL" },
   { NODE_CFUNC, NEN_CFNC, NEN_ARGC, NEN_NONE, "CFUNC" },
-  { NODE_CLASS, NEN_BODY, NEN_CPATH, NEN_SUPER, "CLASS" },
+  { NODE_CLASS, NEN_SUPER, NEN_CPATH, NEN_BODY, "CLASS" },
   { NODE_COLON2, NEN_HEAD, NEN_MID, 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_CLSS, NEN_NEXT, "CREF" },
+  { NODE_CREF, NEN_CLSS, NEN_BODY, NEN_NEXT, "CREF" },
   { NODE_CVAR, NEN_VID, NEN_NONE, NEN_NONE, "CVAR" },
-  { 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_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_DEFINED, NEN_HEAD, NEN_NONE, NEN_NONE, "DEFINED" },
-  { NODE_DEFN, NEN_DEFN, NEN_NOEX, NEN_MID, "DEFN" },
+  { NODE_DEFN, NEN_DEFN, NEN_MID, NEN_NOEX, "DEFN" },
   { NODE_DEFS, NEN_DEFN, NEN_RECV, NEN_MID, "DEFS" },
   { NODE_DMETHOD, NEN_CVAL, NEN_NONE, NEN_NONE, "DMETHOD" },
-  { NODE_DOT2, NEN_STATE, NEN_BEG, NEN_END, "DOT2" },
-  { NODE_DOT3, NEN_STATE, NEN_BEG, NEN_END, "DOT3" },
-  { NODE_DREGX, NEN_CFLAG, NEN_NEXT, NEN_LIT, "DREGX" },
-  { NODE_DREGX_ONCE, NEN_CFLAG, NEN_NEXT, NEN_LIT, "DREGX_ONCE" },
-  { NODE_DSTR, NEN_NEXT, NEN_LIT, NEN_NONE, "DSTR" },
-  { NODE_DSYM, NEN_NEXT, NEN_LIT, NEN_NONE, "DSYM" },
+  { NODE_DOT2, NEN_BEG, NEN_END, NEN_STATE, "DOT2" },
+  { NODE_DOT3, NEN_BEG, NEN_END, NEN_STATE, "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" },
-  { NODE_DXSTR, NEN_NEXT, NEN_LIT, NEN_NONE, "DXSTR" },
+  { NODE_DXSTR, NEN_LIT, NEN_NEXT, NEN_NONE, "DXSTR" },
   { 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_FBODY, NEN_ORIG, NEN_MID, NEN_HEAD, "FBODY" },
   { NODE_FCALL, NEN_ARGS, NEN_MID, NEN_NONE, "FCALL" },
-  { NODE_FLIP2, NEN_BEG, NEN_CNT, NEN_END, "FLIP2" },
-  { NODE_FLIP3, NEN_BEG, NEN_CNT, NEN_END, "FLIP3" },
+  { NODE_FLIP2, NEN_CNT, NEN_BEG, NEN_END, "FLIP2" },
+  { NODE_FLIP3, NEN_CNT, NEN_BEG, NEN_END, "FLIP3" },
   { NODE_FOR, NEN_BODY, NEN_ITER, NEN_VAR, "FOR" },
-  { NODE_GASGN, NEN_VID, NEN_VALUE, NEN_ENTRY, "GASGN" },
+  { NODE_GASGN, NEN_VALUE, NEN_VID, NEN_ENTRY, "GASGN" },
   { NODE_GVAR, NEN_VID, NEN_ENTRY, NEN_NONE, "GVAR" },
   { NODE_HASH, NEN_HEAD, NEN_NONE, NEN_NONE, "HASH" },
-  { NODE_IASGN, NEN_VID, NEN_VALUE, NEN_NONE, "IASGN" },
-  { NODE_IF, NEN_ELSE, NEN_BODY, NEN_COND, "IF" },
-  { NODE_IFUNC, NEN_CFNC, NEN_STATE, NEN_TVAL, "IFUNC" },
+  { 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_ITER, NEN_BODY, NEN_ITER, NEN_VAR, "ITER" },
   { NODE_IVAR, NEN_VID, NEN_NONE, NEN_NONE, "IVAR" },
-  { NODE_LASGN, NEN_VID, NEN_VALUE, NEN_CNT, "LASGN" },
+  { NODE_LASGN, NEN_VALUE, NEN_VID, NEN_CNT, "LASGN" },
   { NODE_LIT, NEN_LIT, NEN_NONE, NEN_NONE, "LIT" },
   { NODE_LVAR, NEN_VID, NEN_CNT, NEN_NONE, "LVAR" },
-  { NODE_MASGN, NEN_HEAD, NEN_VALUE, NEN_ARGS, "MASGN" },
-  { NODE_MATCH, NEN_VALUE, NEN_LIT, NEN_NONE, "MATCH" },
+  { NODE_MASGN, NEN_ARGS, NEN_HEAD, NEN_VALUE, "MASGN" },
+  { NODE_MATCH, NEN_LIT, NEN_VALUE, NEN_NONE, "MATCH" },
   { 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_BODY, NEN_CPATH, NEN_NONE, "MODULE" },
+  { NODE_METHOD, NEN_NOEX, NEN_BODY, NEN_NONE, "METHOD" },
+  { NODE_MODULE, NEN_CPATH, NEN_BODY, 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_RECV, NEN_ARGS, NEN_MID, "OP_ASGN1" },
-  { NODE_OP_ASGN2, NEN_RECV, NEN_VALUE, NEN_NEXT, "OP_ASGN2" },
+  { NODE_OP_ASGN1, NEN_ARGS, NEN_MID, NEN_RECV, "OP_ASGN1" },
+  { NODE_OP_ASGN2, NEN_RECV, NEN_NEXT, NEN_VALUE, "OP_ASGN2" },
   { NODE_OP_ASGN2_ARG, NEN_VID, NEN_AID, NEN_MID, "OP_ASGN2_ARG" },
   { NODE_OP_ASGN_AND, NEN_RECV, NEN_VALUE, NEN_NONE, "OP_ASGN_AND" },
-  { NODE_OP_ASGN_OR, NEN_RECV, NEN_VALUE, NEN_AID, "OP_ASGN_OR" },
+  { NODE_OP_ASGN_OR, NEN_AID, NEN_VALUE, NEN_RECV, "OP_ASGN_OR" },
   { NODE_OR, NEN_2ND, NEN_1ST, 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_BODY, NEN_ARGS, "RESBODY" },
-  { NODE_RESCUE, NEN_ELSE, NEN_HEAD, NEN_RESQ, "RESCUE" },
+  { NODE_RESCUE, NEN_HEAD, NEN_RESQ, 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" },
-  { NODE_SCOPE, NEN_RVAL, NEN_TBL, NEN_NEXT, "SCOPE" },
+  { NODE_SCOPE, NEN_TBL, NEN_RVAL, NEN_NEXT, "SCOPE" },
   { NODE_SELF, NEN_NONE, NEN_NONE, NEN_NONE, "SELF" },
   { NODE_SPLAT, NEN_HEAD, NEN_NONE, NEN_NONE, "SPLAT" },
   { NODE_STR, NEN_LIT, NEN_NONE, NEN_NONE, "STR" },
@@ -101,7 +101,7 @@ Node_Type_Descrip node_type_descrips_unsorted[] = {
   { 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_VALIAS, NEN_2ND, NEN_1ST, NEN_NONE, "VALIAS" },
+  { 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" },

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

@@ -2925,10 +2925,10 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cALIAS, "__member__", members);
     rb_iv_set(rb_cALIAS, "__type__", INT2NUM(NODE_ALIAS));
     rb_define_singleton_method(rb_cALIAS, "members", node_s_members, 0);
-    rb_define_method(rb_cALIAS, "second", node_2nd, 0);
-    rb_ary_push(members, rb_str_new2("second"));
     rb_define_method(rb_cALIAS, "first", node_1st, 0);
     rb_ary_push(members, rb_str_new2("first"));
+    rb_define_method(rb_cALIAS, "second", node_2nd, 0);
+    rb_ary_push(members, rb_str_new2("second"));
   }
 
   /* Document-class: Node::ALLOCA
@@ -3005,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: rest
+     * an assignment node to assign the rest arg, if it is present
+     */
+    rb_define_method(rb_cARGS, "rest", node_rest, 0);
+    rb_ary_push(members, rb_str_new2("rest"));
+
     /* Document-method: opt
      * a list of assignment nodes to assign default values to the
      * optional arguments if no argument is specified
@@ -3012,12 +3018,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: rest
-     * an assignment node to assign the rest arg, if it is present
-     */
-    rb_define_method(rb_cARGS, "rest", node_rest, 0);
-    rb_ary_push(members, rb_str_new2("rest"));
-
     /* Document-method: cnt
      * the number of required arguments
      */
@@ -3088,14 +3088,14 @@ 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);
+    rb_define_method(rb_cARRAY, "alen", node_alen, 0);
+    rb_ary_push(members, rb_str_new2("alen"));
 
     /* 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"));
 
     /* Document-method: next
      * the tail of the array
@@ -3340,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: recv
-     * the receiver of the method
-     */
-    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
      */
@@ -3357,6 +3351,12 @@ void define_node_subclass_methods()
      */
     rb_define_method(rb_cCALL, "mid", node_mid, 0);
     rb_ary_push(members, rb_str_new2("mid"));
+
+    /* Document-method: recv
+     * the receiver of the method
+     */
+    rb_define_method(rb_cCALL, "recv", node_recv, 0);
+    rb_ary_push(members, rb_str_new2("recv"));
   }
 
   /* Document-class: Node::CASE
@@ -3402,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: 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-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-class: Node::CFUNC
@@ -3455,11 +3455,12 @@ 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: body
-     * the body of the class definition
+    /* Document-method: super
+     * an expression returning the base class, or false if there is no
+     * base class specified
      */
-    rb_define_method(rb_cCLASS, "body", node_body, 0);
-    rb_ary_push(members, rb_str_new2("body"));
+    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
@@ -3467,12 +3468,11 @@ void define_node_subclass_methods()
     rb_define_method(rb_cCLASS, "cpath", node_cpath, 0);
     rb_ary_push(members, rb_str_new2("cpath"));
 
-    /* Document-method: super
-     * an expression returning the base class, or false if there is no
-     * base class specified
+    /* Document-method: body
+     * the body of the class definition
      */
-    rb_define_method(rb_cCLASS, "super", node_super, 0);
-    rb_ary_push(members, rb_str_new2("super"));
+    rb_define_method(rb_cCLASS, "body", node_body, 0);
+    rb_ary_push(members, rb_str_new2("body"));
   }
 
   /* Document-class: Node::COLON2
@@ -3560,18 +3560,18 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cCREF, "__type__", INT2NUM(NODE_CREF));
     rb_define_singleton_method(rb_cCREF, "members", node_s_members, 0);
 
-    /* Document-method: body
-     * always 0 (false)
-     */
-    rb_define_method(rb_cCREF, "body", node_body, 0);
-    rb_ary_push(members, rb_str_new2("body"));
-
     /* 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: body
+     * always 0 (false)
+     */
+    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
      */
@@ -3609,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
@@ -3636,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
@@ -3670,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: 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-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-class: Node::DASGN_CURR
@@ -3695,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: 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-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-class: Node::DEFINED
@@ -3747,17 +3747,17 @@ void define_node_subclass_methods()
     rb_define_method(rb_cDEFN, "defn", node_defn, 0);
     rb_ary_push(members, rb_str_new2("defn"));
 
-    /* Document-method: noex
-     * the flags which should be used to define the method
-     */
-    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
      */
     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
+     */
+    rb_define_method(rb_cDEFN, "noex", node_noex, 0);
+    rb_ary_push(members, rb_str_new2("noex"));
   }
 
   /* Document-class: Node::DEFS
@@ -3824,8 +3824,6 @@ 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);
-    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
@@ -3838,6 +3836,8 @@ void define_node_subclass_methods()
      */
     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-class: Node::DOT3
@@ -3852,8 +3852,6 @@ 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);
-    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
@@ -3866,6 +3864,8 @@ void define_node_subclass_methods()
      */
     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-class: Node::DREGX
@@ -3884,6 +3884,18 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cDREGX, "__type__", INT2NUM(NODE_DREGX));
     rb_define_singleton_method(rb_cDREGX, "members", node_s_members, 0);
 
+    /* Document-method: lit
+     * a string
+     */
+    rb_define_method(rb_cDREGX, "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, "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:
@@ -3900,18 +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-method: lit
-     * a string
-     */
-    rb_define_method(rb_cDREGX, "lit", node_lit, 0);
-    rb_ary_push(members, rb_str_new2("lit"));
   }
 
   /* Document-class: Node::DREGX_ONCE
@@ -3927,12 +3927,11 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cDREGX_ONCE, "__type__", INT2NUM(NODE_DREGX_ONCE));
     rb_define_singleton_method(rb_cDREGX_ONCE, "members", node_s_members, 0);
 
-    /* Document-method: cflag
-     * a bitfield containing the options used in the regular
-     * expression.  See DREGX for a list of valid values.
+    /* Document-method: lit
+     * a string
      */
-    rb_define_method(rb_cDREGX_ONCE, "cflag", node_cflag, 0);
-    rb_ary_push(members, rb_str_new2("cflag"));
+    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
@@ -3940,11 +3939,12 @@ void define_node_subclass_methods()
     rb_define_method(rb_cDREGX_ONCE, "next", node_next, 0);
     rb_ary_push(members, rb_str_new2("next"));
 
-    /* Document-method: lit
-     * a string
+    /* 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, "lit", node_lit, 0);
-    rb_ary_push(members, rb_str_new2("lit"));
+    rb_define_method(rb_cDREGX_ONCE, "cflag", node_cflag, 0);
+    rb_ary_push(members, rb_str_new2("cflag"));
   }
 
   /* Document-class: Node::DSTR
@@ -3963,17 +3963,17 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cDSTR, "__type__", INT2NUM(NODE_DSTR));
     rb_define_singleton_method(rb_cDSTR, "members", node_s_members, 0);
 
-    /* Document-method: next
-     * a list of expressions to be appended onto the string
-     */
-    rb_define_method(rb_cDSTR, "next", node_next, 0);
-    rb_ary_push(members, rb_str_new2("next"));
-
     /* Document-method: lit
      * a string
      */
     rb_define_method(rb_cDSTR, "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_cDSTR, "next", node_next, 0);
+    rb_ary_push(members, rb_str_new2("next"));
   }
 
   /* Document-class: Node::DSYM
@@ -3994,10 +3994,10 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cDSYM, "__member__", members);
     rb_iv_set(rb_cDSYM, "__type__", INT2NUM(NODE_DSYM));
     rb_define_singleton_method(rb_cDSYM, "members", node_s_members, 0);
-    rb_define_method(rb_cDSYM, "next", node_next, 0);
-    rb_ary_push(members, rb_str_new2("next"));
     rb_define_method(rb_cDSYM, "lit", node_lit, 0);
     rb_ary_push(members, rb_str_new2("lit"));
+    rb_define_method(rb_cDSYM, "next", node_next, 0);
+    rb_ary_push(members, rb_str_new2("next"));
   }
 
   /* Document-class: Node::DVAR
@@ -4040,17 +4040,17 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cDXSTR, "__type__", INT2NUM(NODE_DXSTR));
     rb_define_singleton_method(rb_cDXSTR, "members", node_s_members, 0);
 
-    /* Document-method: next
-     * a list of expressions to be appended onto the string
-     */
-    rb_define_method(rb_cDXSTR, "next", node_next, 0);
-    rb_ary_push(members, rb_str_new2("next"));
-
     /* Document-method: lit
      * a string
      */
     rb_define_method(rb_cDXSTR, "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_cDXSTR, "next", node_next, 0);
+    rb_ary_push(members, rb_str_new2("next"));
   }
 
   /* Document-class: Node::ENSURE
@@ -4134,12 +4134,6 @@ 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
-     */
-    rb_define_method(rb_cFBODY, "head", node_head, 0);
-    rb_ary_push(members, rb_str_new2("head"));
-
     /* Document-method: orig
      * the origin class
      */
@@ -4151,6 +4145,12 @@ void define_node_subclass_methods()
      */
     rb_define_method(rb_cFBODY, "mid", node_mid, 0);
     rb_ary_push(members, rb_str_new2("mid"));
+
+    /* Document-method: head
+     * the method body
+     */
+    rb_define_method(rb_cFBODY, "head", node_head, 0);
+    rb_ary_push(members, rb_str_new2("head"));
   }
 
   /* Document-class: Node::FCALL
@@ -4195,12 +4195,6 @@ 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
-     */
-    rb_define_method(rb_cFLIP2, "beg", node_beg, 0);
-    rb_ary_push(members, rb_str_new2("beg"));
-
     /* Document-method: cnt
      * the index into the local variable table of the special variable
      * to use in the flip-flop expression (usually 2 for $_)
@@ -4208,6 +4202,12 @@ void define_node_subclass_methods()
     rb_define_method(rb_cFLIP2, "cnt", node_cnt, 0);
     rb_ary_push(members, rb_str_new2("cnt"));
 
+    /* Document-method: beg
+     * the beginning of the range
+     */
+    rb_define_method(rb_cFLIP2, "beg", node_beg, 0);
+    rb_ary_push(members, rb_str_new2("beg"));
+
     /* Document-method: end
      * the end of the range
      */
@@ -4229,12 +4229,6 @@ 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
-     */
-    rb_define_method(rb_cFLIP3, "beg", node_beg, 0);
-    rb_ary_push(members, rb_str_new2("beg"));
-
     /* Document-method: cnt
      * the index into the local variable table of the special variable
      * to use in the flip-flop expression (usually 2 for $_)
@@ -4242,6 +4236,12 @@ void define_node_subclass_methods()
     rb_define_method(rb_cFLIP3, "cnt", node_cnt, 0);
     rb_ary_push(members, rb_str_new2("cnt"));
 
+    /* Document-method: beg
+     * the beginning of the range
+     */
+    rb_define_method(rb_cFLIP3, "beg", node_beg, 0);
+    rb_ary_push(members, rb_str_new2("beg"));
+
     /* Document-method: end
      * the end of the range
      */
@@ -4303,17 +4303,17 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cGASGN, "__type__", INT2NUM(NODE_GASGN));
     rb_define_singleton_method(rb_cGASGN, "members", node_s_members, 0);
 
-    /* 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"));
-
     /* 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-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"));
   }
@@ -4368,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: 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-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-class: Node::IF
@@ -4401,6 +4401,7 @@ void define_node_subclass_methods()
    * 
    * A conditional block using elsif has another IF node as the else
    * expression.
+   *     
    */
   {
     VALUE rb_cIF = rb_define_class_under(rb_cNode, "IF", rb_cNode);
@@ -4410,12 +4411,11 @@ 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: else
-     * the expression to evaluate if the expression is false, or false
-     * if the expression is empty
+    /* Document-method: cond
+     * the condition to evaluate
      */
-    rb_define_method(rb_cIF, "else", node_else, 0);
-    rb_ary_push(members, rb_str_new2("else"));
+    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
@@ -4424,11 +4424,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
+    /* Document-method: else
+     * the expression to evaluate if the expression is false, or false
+     * if the expression is empty
      */
-    rb_define_method(rb_cIF, "cond", node_cond, 0);
-    rb_ary_push(members, rb_str_new2("cond"));
+    rb_define_method(rb_cIF, "else", node_else, 0);
+    rb_ary_push(members, rb_str_new2("else"));
   }
 
   /* Document-class: Node::IFUNC
@@ -4448,18 +4449,18 @@ void define_node_subclass_methods()
     rb_define_method(rb_cIFUNC, "cfnc", node_cfnc, 0);
     rb_ary_push(members, rb_str_new2("cfnc"));
 
-    /* Document-method: state
-     * always 0
-     */
-    rb_define_method(rb_cIFUNC, "state", node_state, 0);
-    rb_ary_push(members, rb_str_new2("state"));
-
     /* Document-method: tval
      * the user-specified data to be passed as the second argument to
      * cfnc
      */
     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
@@ -4537,17 +4538,17 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cLASGN, "__type__", INT2NUM(NODE_LASGN));
     rb_define_singleton_method(rb_cLASGN, "members", node_s_members, 0);
 
-    /* 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"));
-
     /* 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-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"));
   }
@@ -4602,6 +4603,12 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cMASGN, "__type__", INT2NUM(NODE_MASGN));
     rb_define_singleton_method(rb_cMASGN, "members", node_s_members, 0);
 
+    /* Document-method: args
+     * TODO
+     */
+    rb_define_method(rb_cMASGN, "args", node_args, 0);
+    rb_ary_push(members, rb_str_new2("args"));
+
     /* Document-method: head
      * TODO
      */
@@ -4613,12 +4620,6 @@ void define_node_subclass_methods()
      */
     rb_define_method(rb_cMASGN, "value", node_value, 0);
     rb_ary_push(members, rb_str_new2("value"));
-
-    /* Document-method: args
-     * TODO
-     */
-    rb_define_method(rb_cMASGN, "args", node_args, 0);
-    rb_ary_push(members, rb_str_new2("args"));
   }
 
   /* Document-class: Node::MATCH
@@ -4643,17 +4644,17 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cMATCH, "__type__", INT2NUM(NODE_MATCH));
     rb_define_singleton_method(rb_cMATCH, "members", node_s_members, 0);
 
-    /* Document-method: value
-     * the value to compare against
-     */
-    rb_define_method(rb_cMATCH, "value", node_value, 0);
-    rb_ary_push(members, rb_str_new2("value"));
-
     /* Document-method: lit
      * the regular expression to use in the condition.
      */
     rb_define_method(rb_cMATCH, "lit", node_lit, 0);
     rb_ary_push(members, rb_str_new2("lit"));
+
+    /* Document-method: value
+     * the value to compare against
+     */
+    rb_define_method(rb_cMATCH, "value", node_value, 0);
+    rb_ary_push(members, rb_str_new2("value"));
   }
 
   /* Document-class: Node::MATCH2
@@ -4759,17 +4760,17 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cMETHOD, "__type__", INT2NUM(NODE_METHOD));
     rb_define_singleton_method(rb_cMETHOD, "members", node_s_members, 0);
 
-    /* Document-method: body
-     * the body of the method
-     */
-    rb_define_method(rb_cMETHOD, "body", node_body, 0);
-    rb_ary_push(members, rb_str_new2("body"));
-
     /* Document-method: noex
      * the method's flags
      */
     rb_define_method(rb_cMETHOD, "noex", node_noex, 0);
     rb_ary_push(members, rb_str_new2("noex"));
+
+    /* Document-method: body
+     * the body of the method
+     */
+    rb_define_method(rb_cMETHOD, "body", node_body, 0);
+    rb_ary_push(members, rb_str_new2("body"));
   }
 
   /* Document-class: Node::MODULE
@@ -4791,17 +4792,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: 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-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-class: Node::NEWLINE
@@ -4943,12 +4944,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: recv
-     * the receiver of the assignment
-     */
-    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
      */
@@ -4961,6 +4956,12 @@ void define_node_subclass_methods()
      */
     rb_define_method(rb_cOP_ASGN1, "mid", node_mid, 0);
     rb_ary_push(members, rb_str_new2("mid"));
+
+    /* Document-method: recv
+     * the receiver of the assignment
+     */
+    rb_define_method(rb_cOP_ASGN1, "recv", node_recv, 0);
+    rb_ary_push(members, rb_str_new2("recv"));
   }
 
   /* Document-class: Node::OP_ASGN2
@@ -4989,18 +4990,18 @@ void define_node_subclass_methods()
     rb_define_method(rb_cOP_ASGN2, "recv", node_recv, 0);
     rb_ary_push(members, rb_str_new2("recv"));
 
-    /* Document-method: value
-     * the value to assign to the attribute
-     */
-    rb_define_method(rb_cOP_ASGN2, "value", node_value, 0);
-    rb_ary_push(members, rb_str_new2("value"));
-
     /* Document-method: next
      * another node of type OP_ASGN2 which contains more information
      * about the assignment operation than can fit in this node alone
      */
     rb_define_method(rb_cOP_ASGN2, "next", node_next, 0);
     rb_ary_push(members, rb_str_new2("next"));
+
+    /* Document-method: value
+     * the value to assign to the attribute
+     */
+    rb_define_method(rb_cOP_ASGN2, "value", node_value, 0);
+    rb_ary_push(members, rb_str_new2("value"));
   }
 
   /* Document-class: Node::OP_ASGN2_ARG
@@ -5083,11 +5084,13 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cOP_ASGN_OR, "__type__", INT2NUM(NODE_OP_ASGN_OR));
     rb_define_singleton_method(rb_cOP_ASGN_OR, "members", node_s_members, 0);
 
-    /* Document-method: recv
-     * the receiver of the assignment
+    /* Document-method: aid
+     * if this indicator is nonzero, ruby will check to see if the
+     * provided expression is defined, otherwise it will assume that
+     * the provided expression is defined.
      */
-    rb_define_method(rb_cOP_ASGN_OR, "recv", node_recv, 0);
-    rb_ary_push(members, rb_str_new2("recv"));
+    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
@@ -5095,13 +5098,11 @@ void define_node_subclass_methods()
     rb_define_method(rb_cOP_ASGN_OR, "value", node_value, 0);
     rb_ary_push(members, rb_str_new2("value"));
 
-    /* Document-method: aid
-     * if this indicator is nonzero, ruby will check to see if the
-     * provided expression is defined, otherwise it will assume that
-     * the provided expression is defined.
+    /* Document-method: recv
+     * the receiver of the assignment
      */
-    rb_define_method(rb_cOP_ASGN_OR, "aid", node_aid, 0);
-    rb_ary_push(members, rb_str_new2("aid"));
+    rb_define_method(rb_cOP_ASGN_OR, "recv", node_recv, 0);
+    rb_ary_push(members, rb_str_new2("recv"));
   }
 
   /* Document-class: Node::OR
@@ -5237,12 +5238,6 @@ 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: else
-     * the expression to be evaluated if no exception is raised
-     */
-    rb_define_method(rb_cRESCUE, "else", node_else, 0);
-    rb_ary_push(members, rb_str_new2("else"));
-
     /* Document-method: head
      * the body of the block to evaluate
      */
@@ -5254,6 +5249,12 @@ void define_node_subclass_methods()
      */
     rb_define_method(rb_cRESCUE, "resq", node_resq, 0);
     rb_ary_push(members, rb_str_new2("resq"));
+
+    /* Document-method: else
+     * the expression to be evaluated if no exception is raised
+     */
+    rb_define_method(rb_cRESCUE, "else", node_else, 0);
+    rb_ary_push(members, rb_str_new2("else"));
   }
 
   /* Document-class: Node::RETRY
@@ -5343,13 +5344,6 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cSCOPE, "__type__", INT2NUM(NODE_SCOPE));
     rb_define_singleton_method(rb_cSCOPE, "members", node_s_members, 0);
 
-    /* Document-method: rval
-     * holds information about which class(es) to search for  constants
-     * in this scope
-     */
-    rb_define_method(rb_cSCOPE, "rval", node_rval, 0);
-    rb_ary_push(members, rb_str_new2("rval"));
-
     /* Document-method: tbl
      * the names of the local variables* next the first expression in
      * the scope
@@ -5357,6 +5351,13 @@ void define_node_subclass_methods()
     rb_define_method(rb_cSCOPE, "tbl", node_tbl, 0);
     rb_ary_push(members, rb_str_new2("tbl"));
 
+    /* Document-method: rval
+     * holds information about which class(es) to search for  constants
+     * in this scope
+     */
+    rb_define_method(rb_cSCOPE, "rval", node_rval, 0);
+    rb_ary_push(members, rb_str_new2("rval"));
+
     /* Document-method: next
      * the body of the lexical scope
      */
@@ -5557,10 +5558,10 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cVALIAS, "__member__", members);
     rb_iv_set(rb_cVALIAS, "__type__", INT2NUM(NODE_VALIAS));
     rb_define_singleton_method(rb_cVALIAS, "members", node_s_members, 0);
-    rb_define_method(rb_cVALIAS, "second", node_2nd, 0);
-    rb_ary_push(members, rb_str_new2("second"));
     rb_define_method(rb_cVALIAS, "first", node_1st, 0);
     rb_ary_push(members, rb_str_new2("first"));
+    rb_define_method(rb_cVALIAS, "second", node_2nd, 0);
+    rb_ary_push(members, rb_str_new2("second"));
   }
 
   /* Document-class: Node::VCALL