ruby-internal 0.8.0 → 0.8.1

data/ext/internal/node/nodeinfo.c

@@ -450,28 +450,8 @@ VALUE dump_node_elem(enum Node_Elem_Name nen, NODE * n, VALUE node_hash)
         return ID2SYM(n->nd_entry->id);
       }
     case NEN_FRML:
-      if(n->nd_frml)
       {
-        int node_type;
-        if(0 && nd_type(n) == NODE_OP_ASGN2)
-        {
-          /* All children of NODE_OP_ASGN2 are NODE_OP_ASGN2_ARG */
-          node_type = NODE_OP_ASGN2_ARG;
-        }
-        else
-        {
-          node_type = nd_type(n->nd_frml);
-        }
-
-        dump_node_or_iseq_to_hash(
-          (VALUE)n->nd_frml,
-          node_type,
-          node_hash);
-        return node_id(n->nd_frml);
-      }
-      else
-      {
-        return Qnil;
+      return LONG2NUM((long)n->nd_frml);
       }
     case NEN_HEAD:
       if(n->nd_head)
@@ -497,30 +477,6 @@ VALUE dump_node_elem(enum Node_Elem_Name nen, NODE * n, VALUE node_hash)
       {
         return Qnil;
       }
-    case NEN_IBDY:
-      if(n->nd_ibdy)
-      {
-        int node_type;
-        if(0 && nd_type(n) == NODE_OP_ASGN2)
-        {
-          /* All children of NODE_OP_ASGN2 are NODE_OP_ASGN2_ARG */
-          node_type = NODE_OP_ASGN2_ARG;
-        }
-        else
-        {
-          node_type = nd_type(n->nd_ibdy);
-        }
-
-        dump_node_or_iseq_to_hash(
-          (VALUE)n->nd_ibdy,
-          node_type,
-          node_hash);
-        return node_id(n->nd_ibdy);
-      }
-      else
-      {
-        return Qnil;
-      }
     case NEN_ITER:
       if(n->nd_iter)
       {
@@ -645,6 +601,19 @@ VALUE dump_node_elem(enum Node_Elem_Name nen, NODE * n, VALUE node_hash)
       {
       return LONG2NUM((long)n->nd_nth);
       }
+    case NEN_OID:
+      if(n->nd_oid == 0)
+      {
+        return Qfalse;
+      }
+      else if(n->nd_oid == 1)
+      {
+        return Qtrue;
+      }
+      else
+      {
+        return ID2SYM(n->nd_oid);
+      }
     case NEN_OPT:
       if(n->nd_opt)
       {
@@ -711,6 +680,23 @@ VALUE dump_node_elem(enum Node_Elem_Name nen, NODE * n, VALUE node_hash)
               INT2NUM(TYPE((VALUE)n->nd_orig)),
               (VALUE)n->nd_orig);
       }
+    case NEN_PID:
+      if(n->nd_pid == 0)
+      {
+        return Qfalse;
+      }
+      else if(n->nd_pid == 1)
+      {
+        return Qtrue;
+      }
+      else
+      {
+        return ID2SYM(n->nd_pid);
+      }
+    case NEN_PLEN:
+      {
+      return LONG2NUM((long)n->nd_plen);
+      }
     case NEN_RECV:
       if(n->nd_recv)
       {
@@ -760,28 +746,17 @@ VALUE dump_node_elem(enum Node_Elem_Name nen, NODE * n, VALUE node_hash)
         return Qnil;
       }
     case NEN_REST:
-      if(n->nd_rest)
+      if(n->nd_rest == 0)
       {
-        int node_type;
-        if(0 && nd_type(n) == NODE_OP_ASGN2)
-        {
-          /* All children of NODE_OP_ASGN2 are NODE_OP_ASGN2_ARG */
-          node_type = NODE_OP_ASGN2_ARG;
-        }
-        else
-        {
-          node_type = nd_type(n->nd_rest);
-        }
-
-        dump_node_or_iseq_to_hash(
-          (VALUE)n->nd_rest,
-          node_type,
-          node_hash);
-        return node_id(n->nd_rest);
+        return Qfalse;
+      }
+      else if(n->nd_rest == 1)
+      {
+        return Qtrue;
       }
       else
       {
-        return Qnil;
+        return ID2SYM(n->nd_rest);
       }
     case NEN_RVAL:
       if(n->nd_2nd)
@@ -980,6 +955,10 @@ VALUE dump_node_elem(enum Node_Elem_Name nen, NODE * n, VALUE node_hash)
       {
         return ID2SYM(n->nd_vid);
       }
+    case NEN_VISI:
+      {
+      return LONG2NUM((long)n->nd_visi);
+      }
   }
   rb_raise(rb_eArgError, "Invalid Node_Elem_Name %d", nen);
 }
@@ -1386,27 +1365,7 @@ void load_node_elem(enum Node_Elem_Name nen, VALUE v, NODE * n, VALUE node_hash,
       }
     case NEN_FRML:
     {
-      if(v == Qnil)
-      {
-        n->nd_frml = 0;
-      }
-      else
-      {
-        VALUE nid = rb_hash_aref(id_hash, v);
-        if(RTEST(nid))
-        {
-          n->nd_frml = id_to_node(nid);
-        }
-        else
-        {
-          n->u1.node = (NODE *)load_node_or_iseq_from_hash(
-              v, node_hash, id_hash);
-          if(nd_type(n->u1.node) == NODE_OP_ASGN2_ARG)
-          {
-            nd_set_type(n->u1.node, NODE_OP_ASGN2);
-          }
-        }
-      }
+      n->nd_frml = NUM2LONG(v);
       return;
       }
     case NEN_HEAD:
@@ -1434,31 +1393,6 @@ void load_node_elem(enum Node_Elem_Name nen, VALUE v, NODE * n, VALUE node_hash,
       }
       return;
       }
-    case NEN_IBDY:
-    {
-      if(v == Qnil)
-      {
-        n->nd_ibdy = 0;
-      }
-      else
-      {
-        VALUE nid = rb_hash_aref(id_hash, v);
-        if(RTEST(nid))
-        {
-          n->nd_ibdy = id_to_node(nid);
-        }
-        else
-        {
-          n->u2.node = (NODE *)load_node_or_iseq_from_hash(
-              v, node_hash, id_hash);
-          if(nd_type(n->u2.node) == NODE_OP_ASGN2_ARG)
-          {
-            nd_set_type(n->u2.node, NODE_OP_ASGN2);
-          }
-        }
-      }
-      return;
-      }
     case NEN_ITER:
     {
       if(v == Qnil)
@@ -1588,6 +1522,22 @@ void load_node_elem(enum Node_Elem_Name nen, VALUE v, NODE * n, VALUE node_hash,
       n->nd_nth = NUM2LONG(v);
       return;
       }
+    case NEN_OID:
+    {
+      if(v == Qfalse)
+      {
+        n->nd_oid = 0;
+      }
+      else if(v == Qfalse)
+      {
+        n->nd_oid = 1;
+      }
+      else
+      {
+        n->nd_oid = SYM2ID(v);
+      }
+      return;
+      }
     case NEN_OPT:
     {
       if(v == Qnil)
@@ -1650,6 +1600,27 @@ void load_node_elem(enum Node_Elem_Name nen, VALUE v, NODE * n, VALUE node_hash,
       }
       return;
       }
+    case NEN_PID:
+    {
+      if(v == Qfalse)
+      {
+        n->nd_pid = 0;
+      }
+      else if(v == Qfalse)
+      {
+        n->nd_pid = 1;
+      }
+      else
+      {
+        n->nd_pid = SYM2ID(v);
+      }
+      return;
+      }
+    case NEN_PLEN:
+    {
+      n->nd_plen = NUM2LONG(v);
+      return;
+      }
     case NEN_RECV:
     {
       if(v == Qnil)
@@ -1702,26 +1673,17 @@ void load_node_elem(enum Node_Elem_Name nen, VALUE v, NODE * n, VALUE node_hash,
       }
     case NEN_REST:
     {
-      if(v == Qnil)
+      if(v == Qfalse)
       {
         n->nd_rest = 0;
       }
+      else if(v == Qfalse)
+      {
+        n->nd_rest = 1;
+      }
       else
       {
-        VALUE nid = rb_hash_aref(id_hash, v);
-        if(RTEST(nid))
-        {
-          n->nd_rest = id_to_node(nid);
-        }
-        else
-        {
-          n->u2.node = (NODE *)load_node_or_iseq_from_hash(
-              v, node_hash, id_hash);
-          if(nd_type(n->u2.node) == NODE_OP_ASGN2_ARG)
-          {
-            nd_set_type(n->u2.node, NODE_OP_ASGN2);
-          }
-        }
+        n->nd_rest = SYM2ID(v);
       }
       return;
       }
@@ -1959,6 +1921,11 @@ void load_node_elem(enum Node_Elem_Name nen, VALUE v, NODE * n, VALUE node_hash,
       }
       return;
       }
+    case NEN_VISI:
+    {
+      n->nd_visi = NUM2LONG(v);
+      return;
+      }
   }
   rb_raise(rb_eRuntimeError, "Internal error: invalid Node_Elem_Name %d", nen);
 }
@@ -2048,16 +2015,6 @@ static VALUE node_alen(VALUE self)
   Data_Get_Struct(self, NODE, n);
   return LONG2NUM(n->nd_alen);
 }
-/*
- * Return the Node's _argc_ member.  The return type is an
- * Integer.
- */
-static VALUE node_argc(VALUE self)
-{
-  NODE * n;
-  Data_Get_Struct(self, NODE, n);
-  return LONG2NUM(n->nd_argc);
-}
 /*
  * Return the Node's _args_ member.  The return type is
  * either a Node or an Object.
@@ -2155,33 +2112,6 @@ static VALUE node_cfnc(VALUE self)
   Data_Get_Struct(self, NODE, n);
   return LONG2NUM((long)(n->nd_cfnc));
 }
-/*
- * Return the Node's _clss_ member.  The return type is
- * either a Node or an Object.
- */
-static VALUE node_clss(VALUE self)
-{
-  NODE * n;
-  Data_Get_Struct(self, NODE, n);
-
-  if(TYPE(n->nd_clss) == T_NODE)
-  {
-    if(0 && nd_type(n) == NODE_OP_ASGN2)
-    {
-      return wrap_node_as(
-        (NODE *)n->nd_clss,
-        rb_cNodeSubclass[NODE_OP_ASGN2_ARG]);
-    }
-    else
-    {
-      return wrap_node((NODE *)n->nd_clss);
-    }
-  }
-  else
-  {
-    return (VALUE)n->nd_clss;
-  }
-}
 /*
  * Return the Node's _cnt_ member.  The return type is an
  * Integer.
@@ -2574,33 +2504,6 @@ static VALUE node_opt(VALUE self)
     return (VALUE)n->nd_opt;
   }
 }
-/*
- * Return the Node's _orig_ member.  The return type is
- * either a Node or an Object.
- */
-static VALUE node_orig(VALUE self)
-{
-  NODE * n;
-  Data_Get_Struct(self, NODE, n);
-
-  if(TYPE(n->nd_orig) == T_NODE)
-  {
-    if(0 && nd_type(n) == NODE_OP_ASGN2)
-    {
-      return wrap_node_as(
-        (NODE *)n->nd_orig,
-        rb_cNodeSubclass[NODE_OP_ASGN2_ARG]);
-    }
-    else
-    {
-      return wrap_node((NODE *)n->nd_orig);
-    }
-  }
-  else
-  {
-    return (VALUE)n->nd_orig;
-  }
-}
 /*
  * Return the Node's _recv_ member.  The return type is
  * either a Node or an Object.
@@ -2656,30 +2559,24 @@ static VALUE node_resq(VALUE self)
   }
 }
 /*
- * Return the Node's _rest_ member.  The return type is
- * either a Node or an Object.
+ * Return the Node's _rest_ member.  The return type is a
+ * Symbol.
  */
 static VALUE node_rest(VALUE self)
 {
   NODE * n;
   Data_Get_Struct(self, NODE, n);
-
-  if(TYPE(n->nd_rest) == T_NODE)
+  if(n->nd_rest == 0)
   {
-    if(0 && nd_type(n) == NODE_OP_ASGN2)
-    {
-      return wrap_node_as(
-        (NODE *)n->nd_rest,
-        rb_cNodeSubclass[NODE_OP_ASGN2_ARG]);
-    }
-    else
-    {
-      return wrap_node((NODE *)n->nd_rest);
-    }
+    return Qfalse;
+  }
+  else if(n->nd_rest == 1)
+  {
+    return Qtrue;
   }
   else
   {
-    return (VALUE)n->nd_rest;
+    return ID2SYM(n->nd_rest);
   }
 }
 /*
@@ -2925,10 +2822,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
@@ -2946,6 +2843,12 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cALLOCA, "__type__", INT2NUM(NODE_ALLOCA));
     rb_define_singleton_method(rb_cALLOCA, "members", node_s_members, 0);
 
+    /* Document-method: cfnc
+     * a pointer to the allocated memory
+     */
+    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
      */
@@ -2957,12 +2860,6 @@ void define_node_subclass_methods()
      */
     rb_define_method(rb_cALLOCA, "cnt", node_cnt, 0);
     rb_ary_push(members, rb_str_new2("cnt"));
-
-    /* Document-method: cfnc
-     * a pointer to the allocated memory
-     */
-    rb_define_method(rb_cALLOCA, "cfnc", node_cfnc, 0);
-    rb_ary_push(members, rb_str_new2("cfnc"));
   }
 #endif
 
@@ -3011,24 +2908,24 @@ void define_node_subclass_methods()
     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
-     */
-    rb_define_method(rb_cARGS, "cnt", node_cnt, 0);
-    rb_ary_push(members, rb_str_new2("cnt"));
-
     /* Document-method: opt
      * a list of assignment nodes to assign default values to the
      * optional arguments if no argument is specified
      */
     rb_define_method(rb_cARGS, "opt", node_opt, 0);
     rb_ary_push(members, rb_str_new2("opt"));
-  }
 
-  /* Document-class: Node::ARGSCAT
-   * Represents the concatenation of a list of arguments and a splatted
-   * value, e.g.:
-   *   a, b, *value
+    /* 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
+   * Represents the concatenation of a list of arguments and a splatted
+   * value, e.g.:
+   *   a, b, *value
    * Evaluates head to create an array.  Evaluates body and performs a
    * splat operation on the result to create another array (see SPLAT).
    * Concatenates the the second array onto the end of the first to
@@ -3088,20 +2985,20 @@ 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: next
-     * the tail of the array
-     */
-    rb_define_method(rb_cARRAY, "next", node_next, 0);
-    rb_ary_push(members, rb_str_new2("next"));
+    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
+     */
+    rb_define_method(rb_cARRAY, "next", node_next, 0);
+    rb_ary_push(members, rb_str_new2("next"));
   }
 
   /* Document-class: Node::ATTRASGN
@@ -3118,12 +3015,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: mid
-     * the id of the attribute, with a trailing '=' sign
-     */
-    rb_define_method(rb_cATTRASGN, "mid", node_mid, 0);
-    rb_ary_push(members, rb_str_new2("mid"));
-
     /* Document-method: recv
      * the receiver of the method
      */
@@ -3135,27 +3026,12 @@ void define_node_subclass_methods()
      */
     rb_define_method(rb_cATTRASGN, "args", node_args, 0);
     rb_ary_push(members, rb_str_new2("args"));
-  }
-
-  /* Document-class: Node::ATTRSET
-   * A placeholder for an attribute writer method, which can added to a
-   * class by using attr_writer:
-   *   attr_writer :attribute
-   * Its reader counterpart is IVAR.
-   */
-  {
-    VALUE rb_cATTRSET = rb_define_class_under(rb_cNode, "ATTRSET", rb_cNode);
-    members = rb_ary_new();
-    rb_cNodeSubclass[NODE_ATTRSET] = rb_cATTRSET;
-    rb_iv_set(rb_cATTRSET, "__member__", members);
-    rb_iv_set(rb_cATTRSET, "__type__", INT2NUM(NODE_ATTRSET));
-    rb_define_singleton_method(rb_cATTRSET, "members", node_s_members, 0);
 
-    /* Document-method: vid
-     * the name of the attribute, with a leading '@' sign
+    /* Document-method: mid
+     * the id of the attribute, with a trailing '=' sign
      */
-    rb_define_method(rb_cATTRSET, "vid", node_vid, 0);
-    rb_ary_push(members, rb_str_new2("vid"));
+    rb_define_method(rb_cATTRASGN, "mid", node_mid, 0);
+    rb_ary_push(members, rb_str_new2("mid"));
   }
 
   /* Document-class: Node::BACK_REF
@@ -3222,17 +3098,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: 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-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-class: Node::BLOCK_ARG
@@ -3340,6 +3216,12 @@ 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
      */
@@ -3351,12 +3233,6 @@ 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
@@ -3373,8 +3249,6 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cCASE, "__member__", members);
     rb_iv_set(rb_cCASE, "__type__", INT2NUM(NODE_CASE));
     rb_define_singleton_method(rb_cCASE, "members", node_s_members, 0);
-    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
@@ -3388,6 +3262,8 @@ void define_node_subclass_methods()
      */
     rb_define_method(rb_cCASE, "body", node_body, 0);
     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-class: Node::CDECL
@@ -3415,22 +3291,6 @@ void define_node_subclass_methods()
     rb_ary_push(members, rb_str_new2("vid"));
   }
 
-  /* Document-class: Node::CFUNC
-   * A placeholder for a function implemented in C.
-   */
-  {
-    VALUE rb_cCFUNC = rb_define_class_under(rb_cNode, "CFUNC", rb_cNode);
-    members = rb_ary_new();
-    rb_cNodeSubclass[NODE_CFUNC] = rb_cCFUNC;
-    rb_iv_set(rb_cCFUNC, "__member__", members);
-    rb_iv_set(rb_cCFUNC, "__type__", INT2NUM(NODE_CFUNC));
-    rb_define_singleton_method(rb_cCFUNC, "members", node_s_members, 0);
-    rb_define_method(rb_cCFUNC, "cfnc", node_cfnc, 0);
-    rb_ary_push(members, rb_str_new2("cfnc"));
-    rb_define_method(rb_cCFUNC, "argc", node_argc, 0);
-    rb_ary_push(members, rb_str_new2("argc"));
-  }
-
   /* Document-class: Node::CLASS
    * Represents a class definition, e.g.:
    *   class cpath
@@ -3491,17 +3351,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: 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-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-class: Node::COLON3
@@ -3544,41 +3404,6 @@ void define_node_subclass_methods()
     rb_ary_push(members, rb_str_new2("vid"));
   }
 
-  /* Document-class: Node::CREF
-   * A temporary node used to store the value of ruby_cref or
-   * ruby_top_cref and later restore it.  The cref holds a reference to
-   * the cbase, which, among other things, is used for constant and class
-   * variable lookup.
-   * 
-   * It should never be evaluated as an expression.
-   */
-  {
-    VALUE rb_cCREF = rb_define_class_under(rb_cNode, "CREF", rb_cNode);
-    members = rb_ary_new();
-    rb_cNodeSubclass[NODE_CREF] = rb_cCREF;
-    rb_iv_set(rb_cCREF, "__member__", members);
-    rb_iv_set(rb_cCREF, "__type__", INT2NUM(NODE_CREF));
-    rb_define_singleton_method(rb_cCREF, "members", node_s_members, 0);
-
-    /* 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: 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-class: Node::CVAR
    * Represents a class variable retrieval.  The result of the expression
    * is the value of the class variable.
@@ -3741,6 +3566,12 @@ 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
+     */
+    rb_define_method(rb_cDEFN, "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
      */
@@ -3752,12 +3583,6 @@ void define_node_subclass_methods()
      */
     rb_define_method(rb_cDEFN, "noex", node_noex, 0);
     rb_ary_push(members, rb_str_new2("noex"));
-
-    /* Document-method: defn
-     * the body of the method definition
-     */
-    rb_define_method(rb_cDEFN, "defn", node_defn, 0);
-    rb_ary_push(members, rb_str_new2("defn"));
   }
 
   /* Document-class: Node::DEFS
@@ -3773,12 +3598,6 @@ 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);
-
-    /* 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"));
 
@@ -3787,29 +3606,12 @@ void define_node_subclass_methods()
      */
     rb_define_method(rb_cDEFS, "recv", node_recv, 0);
     rb_ary_push(members, rb_str_new2("recv"));
-  }
-
-  /* Document-class: Node::DMETHOD
-   * A placeholder for a method defined using define_method where the
-   * passed block is created from a Method object, e.g.:
-   *   define_method(:name, method(:foo))
-   * 
-   * See also BMETHOD.
-   */
-  {
-    VALUE rb_cDMETHOD = rb_define_class_under(rb_cNode, "DMETHOD", rb_cNode);
-    members = rb_ary_new();
-    rb_cNodeSubclass[NODE_DMETHOD] = rb_cDMETHOD;
-    rb_iv_set(rb_cDMETHOD, "__member__", members);
-    rb_iv_set(rb_cDMETHOD, "__type__", INT2NUM(NODE_DMETHOD));
-    rb_define_singleton_method(rb_cDMETHOD, "members", node_s_members, 0);
 
-    /* Document-method: cval
-     * the Method object passed to define_method, which contains the
-     * body of the method
+    /* Document-method: mid
+     * the name of the method* defn the body of the method
      */
-    rb_define_method(rb_cDMETHOD, "cval", node_cval, 0);
-    rb_ary_push(members, rb_str_new2("cval"));
+    rb_define_method(rb_cDEFS, "mid", node_mid, 0);
+    rb_ary_push(members, rb_str_new2("mid"));
   }
 
   /* Document-class: Node::DOT2
@@ -3824,20 +3626,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);
-    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"));
 
     /* 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-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-class: Node::DOT3
@@ -3852,20 +3654,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);
-    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"));
 
     /* 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-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-class: Node::DREGX
@@ -4121,38 +3923,6 @@ void define_node_subclass_methods()
     rb_define_singleton_method(rb_cFALSE, "members", node_s_members, 0);
   }
 
-  /* Document-class: Node::FBODY
-   * A placeholder for a method alias, which can be added to a class by
-   * using alias or alias_method:
-   *   alias old new
-   */
-  {
-    VALUE rb_cFBODY = rb_define_class_under(rb_cNode, "FBODY", rb_cNode);
-    members = rb_ary_new();
-    rb_cNodeSubclass[NODE_FBODY] = rb_cFBODY;
-    rb_iv_set(rb_cFBODY, "__member__", members);
-    rb_iv_set(rb_cFBODY, "__type__", INT2NUM(NODE_FBODY));
-    rb_define_singleton_method(rb_cFBODY, "members", node_s_members, 0);
-
-    /* Document-method: orig
-     * the origin class
-     */
-    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
-     */
-    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
    * Represents a method call in the form:
    *   mid(args).
@@ -4168,17 +3938,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: 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-method: mid
+     * the method id
+     */
+    rb_define_method(rb_cFCALL, "mid", node_mid, 0);
+    rb_ary_push(members, rb_str_new2("mid"));
   }
 
   /* Document-class: Node::FLIP2
@@ -4202,17 +3972,17 @@ void define_node_subclass_methods()
     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
-     */
-    rb_define_method(rb_cFLIP2, "end", node_end, 0);
-    rb_ary_push(members, rb_str_new2("end"));
-
     /* 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
+     */
+    rb_define_method(rb_cFLIP2, "end", node_end, 0);
+    rb_ary_push(members, rb_str_new2("end"));
   }
 
   /* Document-class: Node::FLIP3
@@ -4236,17 +4006,17 @@ void define_node_subclass_methods()
     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
-     */
-    rb_define_method(rb_cFLIP3, "end", node_end, 0);
-    rb_ary_push(members, rb_str_new2("end"));
-
     /* 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
+     */
+    rb_define_method(rb_cFLIP3, "end", node_end, 0);
+    rb_ary_push(members, rb_str_new2("end"));
   }
 
   /* Document-class: Node::FOR
@@ -4271,14 +4041,6 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cFOR, "__type__", INT2NUM(NODE_FOR));
     rb_define_singleton_method(rb_cFOR, "members", node_s_members, 0);
 
-    /* Document-method: var
-     * an assignment node which assigns the next value in the sequence
-     * to a variable, which may or may not be local.  May also be a
-     * multiple assignment.
-     */
-    rb_define_method(rb_cFOR, "var", node_var, 0);
-    rb_ary_push(members, rb_str_new2("var"));
-
     /* Document-method: body
      * the body of the loop
      */
@@ -4290,6 +4052,14 @@ void define_node_subclass_methods()
      */
     rb_define_method(rb_cFOR, "iter", node_iter, 0);
     rb_ary_push(members, rb_str_new2("iter"));
+
+    /* Document-method: var
+     * an assignment node which assigns the next value in the sequence
+     * to a variable, which may or may not be local.  May also be a
+     * multiple assignment.
+     */
+    rb_define_method(rb_cFOR, "var", node_var, 0);
+    rb_ary_push(members, rb_str_new2("var"));
   }
 
   /* Document-class: Node::GASGN
@@ -4401,6 +4171,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,6 +4181,12 @@ 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
@@ -4423,12 +4200,6 @@ void define_node_subclass_methods()
      */
     rb_define_method(rb_cIF, "else", node_else, 0);
     rb_ary_push(members, rb_str_new2("else"));
-
-    /* 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-class: Node::IFUNC
@@ -4442,11 +4213,11 @@ 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
+    /* Document-method: cfnc
+     * a pointer to the C function to which to yield
      */
-    rb_define_method(rb_cIFUNC, "state", node_state, 0);
-    rb_ary_push(members, rb_str_new2("state"));
+    rb_define_method(rb_cIFUNC, "cfnc", node_cfnc, 0);
+    rb_ary_push(members, rb_str_new2("cfnc"));
 
     /* Document-method: tval
      * the user-specified data to be passed as the second argument to
@@ -4455,11 +4226,11 @@ void define_node_subclass_methods()
     rb_define_method(rb_cIFUNC, "tval", node_tval, 0);
     rb_ary_push(members, rb_str_new2("tval"));
 
-    /* Document-method: cfnc
-     * a pointer to the C function to which to yield
+    /* Document-method: state
+     * always 0
      */
-    rb_define_method(rb_cIFUNC, "cfnc", node_cfnc, 0);
-    rb_ary_push(members, rb_str_new2("cfnc"));
+    rb_define_method(rb_cIFUNC, "state", node_state, 0);
+    rb_ary_push(members, rb_str_new2("state"));
   }
 
   /* Document-class: Node::ITER
@@ -4483,14 +4254,6 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cITER, "__type__", INT2NUM(NODE_ITER));
     rb_define_singleton_method(rb_cITER, "members", node_s_members, 0);
 
-    /* Document-method: var
-     * an assignment node which assigns the next value in the sequence
-     * to a variable, which may or may not be local.  May also be a
-     * multiple assignment.
-     */
-    rb_define_method(rb_cITER, "var", node_var, 0);
-    rb_ary_push(members, rb_str_new2("var"));
-
     /* Document-method: body
      * the body of the loop
      */
@@ -4503,6 +4266,14 @@ void define_node_subclass_methods()
      */
     rb_define_method(rb_cITER, "iter", node_iter, 0);
     rb_ary_push(members, rb_str_new2("iter"));
+
+    /* Document-method: var
+     * an assignment node which assigns the next value in the sequence
+     * to a variable, which may or may not be local.  May also be a
+     * multiple assignment.
+     */
+    rb_define_method(rb_cITER, "var", node_var, 0);
+    rb_ary_push(members, rb_str_new2("var"));
   }
 
   /* Document-class: Node::IVAR
@@ -4542,14 +4313,14 @@ void define_node_subclass_methods()
      */
     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-class: Node::LIT
@@ -4581,14 +4352,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
@@ -4602,11 +4373,11 @@ 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: value
+    /* Document-method: args
      * TODO
      */
-    rb_define_method(rb_cMASGN, "value", node_value, 0);
-    rb_ary_push(members, rb_str_new2("value"));
+    rb_define_method(rb_cMASGN, "args", node_args, 0);
+    rb_ary_push(members, rb_str_new2("args"));
 
     /* Document-method: head
      * TODO
@@ -4614,11 +4385,11 @@ void define_node_subclass_methods()
     rb_define_method(rb_cMASGN, "head", node_head, 0);
     rb_ary_push(members, rb_str_new2("head"));
 
-    /* Document-method: args
+    /* Document-method: value
      * TODO
      */
-    rb_define_method(rb_cMASGN, "args", node_args, 0);
-    rb_ary_push(members, rb_str_new2("args"));
+    rb_define_method(rb_cMASGN, "value", node_value, 0);
+    rb_ary_push(members, rb_str_new2("value"));
   }
 
   /* Document-class: Node::MATCH
@@ -4643,17 +4414,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
@@ -4681,6 +4452,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
@@ -4688,13 +4466,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
@@ -4712,17 +4483,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
@@ -4748,30 +4519,6 @@ void define_node_subclass_methods()
     rb_define_singleton_method(rb_cMEMO, "members", node_s_members, 0);
   }
 
-  /* Document-class: Node::METHOD
-   * A placeholder for a method entry in a class's method table.
-   */
-  {
-    VALUE rb_cMETHOD = rb_define_class_under(rb_cNode, "METHOD", rb_cNode);
-    members = rb_ary_new();
-    rb_cNodeSubclass[NODE_METHOD] = rb_cMETHOD;
-    rb_iv_set(rb_cMETHOD, "__member__", members);
-    rb_iv_set(rb_cMETHOD, "__type__", INT2NUM(NODE_METHOD));
-    rb_define_singleton_method(rb_cMETHOD, "members", node_s_members, 0);
-
-    /* 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
    * Represents a module definition, e.g.:
    *   module cpath
@@ -4804,25 +4551,6 @@ void define_node_subclass_methods()
     rb_ary_push(members, rb_str_new2("body"));
   }
 
-  /* Document-class: Node::NEWLINE
-   * Represents the termination of a line.  This is used for calling
-   * event hooks when a new line of code is reached.
-   */
-  {
-    VALUE rb_cNEWLINE = rb_define_class_under(rb_cNode, "NEWLINE", rb_cNode);
-    members = rb_ary_new();
-    rb_cNodeSubclass[NODE_NEWLINE] = rb_cNEWLINE;
-    rb_iv_set(rb_cNEWLINE, "__member__", members);
-    rb_iv_set(rb_cNEWLINE, "__type__", INT2NUM(NODE_NEWLINE));
-    rb_define_singleton_method(rb_cNEWLINE, "members", node_s_members, 0);
-
-    /* Document-method: next
-     * the expression on the next line
-     */
-    rb_define_method(rb_cNEWLINE, "next", node_next, 0);
-    rb_ary_push(members, rb_str_new2("next"));
-  }
-
   /* Document-class: Node::NEXT
    * Represents the 'next' keyword.
    * Causes control to be transferred to the end of the loop, causing the
@@ -4851,24 +4579,6 @@ void define_node_subclass_methods()
     rb_define_singleton_method(rb_cNIL, "members", node_s_members, 0);
   }
 
-  /* Document-class: Node::NOT
-   * Represents a logical negation.
-   */
-  {
-    VALUE rb_cNOT = rb_define_class_under(rb_cNode, "NOT", rb_cNode);
-    members = rb_ary_new();
-    rb_cNodeSubclass[NODE_NOT] = rb_cNOT;
-    rb_iv_set(rb_cNOT, "__member__", members);
-    rb_iv_set(rb_cNOT, "__type__", INT2NUM(NODE_NOT));
-    rb_define_singleton_method(rb_cNOT, "members", node_s_members, 0);
-
-    /* Document-method: body
-     * the value to negate.
-     */
-    rb_define_method(rb_cNOT, "body", node_body, 0);
-    rb_ary_push(members, rb_str_new2("body"));
-  }
-
   /* Document-class: Node::NTH_REF
    * Represents the nth match data item, e.g. $1, $2, etc.
    */
@@ -4943,6 +4653,12 @@ 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
@@ -4955,12 +4671,6 @@ 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
@@ -4983,11 +4693,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
@@ -4996,11 +4706,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
@@ -5016,6 +4726,12 @@ 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
      */
@@ -5029,12 +4745,6 @@ 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
@@ -5053,18 +4763,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
@@ -5237,18 +4947,18 @@ 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
      */
     rb_define_method(rb_cRESCUE, "head", node_head, 0);
     rb_ary_push(members, rb_str_new2("head"));
 
+    /* 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: else
      * the expression to be evaluated if no exception is raised
      */
@@ -5350,18 +5060,18 @@ void define_node_subclass_methods()
     rb_define_method(rb_cSCOPE, "tbl", node_tbl, 0);
     rb_ary_push(members, rb_str_new2("tbl"));
 
-    /* Document-method: next
-     * the body of the lexical scope
-     */
-    rb_define_method(rb_cSCOPE, "next", node_next, 0);
-    rb_ary_push(members, rb_str_new2("next"));
-
     /* 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
+     */
+    rb_define_method(rb_cSCOPE, "next", node_next, 0);
+    rb_ary_push(members, rb_str_new2("next"));
   }
 
   /* Document-class: Node::SELF
@@ -5436,31 +5146,6 @@ void define_node_subclass_methods()
     rb_ary_push(members, rb_str_new2("args"));
   }
 
-  /* Document-class: Node::SVALUE
-   * Represents the collection of multiple values of the right hand side
-   * of an assignment into a single value, for use in single assignment,
-   * e.g.:
-   *   lhs = a, b, c
-   * The argument to this node is an Array.
-   * If it is length 0, returns nil.
-   * If it is length 1, returns the first element in the array.
-   * Otherwise, returns the array.
-   */
-  {
-    VALUE rb_cSVALUE = rb_define_class_under(rb_cNode, "SVALUE", rb_cNode);
-    members = rb_ary_new();
-    rb_cNodeSubclass[NODE_SVALUE] = rb_cSVALUE;
-    rb_iv_set(rb_cSVALUE, "__member__", members);
-    rb_iv_set(rb_cSVALUE, "__type__", INT2NUM(NODE_SVALUE));
-    rb_define_singleton_method(rb_cSVALUE, "members", node_s_members, 0);
-
-    /* Document-method: head
-     * an expression which returns an Array.
-     */
-    rb_define_method(rb_cSVALUE, "head", node_head, 0);
-    rb_ary_push(members, rb_str_new2("head"));
-  }
-
   /* Document-class: Node::TO_ARY
    * Represents a conversion from one object type to an array type.
    * Evaluation of this node converts its argument to an array by calling
@@ -5528,8 +5213,6 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cUNTIL, "__member__", members);
     rb_iv_set(rb_cUNTIL, "__type__", INT2NUM(NODE_UNTIL));
     rb_define_singleton_method(rb_cUNTIL, "members", node_s_members, 0);
-    rb_define_method(rb_cUNTIL, "state", node_state, 0);
-    rb_ary_push(members, rb_str_new2("state"));
 
     /* Document-method: body
      * the body of the loop
@@ -5542,6 +5225,8 @@ void define_node_subclass_methods()
      */
     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
@@ -5557,10 +5242,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
@@ -5620,12 +5305,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: next
-     * the next expression to be evaluated if the condition is false
-     */
-    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
      */
@@ -5637,6 +5316,12 @@ void define_node_subclass_methods()
      */
     rb_define_method(rb_cWHEN, "body", node_body, 0);
     rb_ary_push(members, rb_str_new2("body"));
+
+    /* Document-method: next
+     * the next expression to be evaluated if the condition is false
+     */
+    rb_define_method(rb_cWHEN, "next", node_next, 0);
+    rb_ary_push(members, rb_str_new2("next"));
   }
 
   /* Document-class: Node::WHILE
@@ -5652,8 +5337,6 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cWHILE, "__member__", members);
     rb_iv_set(rb_cWHILE, "__type__", INT2NUM(NODE_WHILE));
     rb_define_singleton_method(rb_cWHILE, "members", node_s_members, 0);
-    rb_define_method(rb_cWHILE, "state", node_state, 0);
-    rb_ary_push(members, rb_str_new2("state"));
 
     /* Document-method: body
      * the body of the loop
@@ -5666,6 +5349,8 @@ void define_node_subclass_methods()
      */
     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
@@ -5702,17 +5387,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: 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-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-class: Node::ZARRAY