ruby-internal 0.7.3 → 0.8.0

data/ext/cached/{ruby-1.6.8 → ruby-1.9.3}/internal/node/nodeinfo.c

@@ -228,7 +228,7 @@ VALUE dump_node_elem(enum Node_Elem_Name nen, NODE * n, VALUE node_hash)
           else
           {
             path = rb_class_path(klass);
-            if(STR2CSTR(path)[0] == '#')
+            if(StringValuePtr(path)[0] == '#')
             {
               rb_raise(rb_eArgError, "cannot dump anonymous class");
             }
@@ -250,19 +250,6 @@ VALUE dump_node_elem(enum Node_Elem_Name nen, NODE * n, VALUE node_hash)
               INT2NUM(TYPE((VALUE)n->nd_clss)),
               (VALUE)n->nd_clss);
       }
-    case NEN_CNAME:
-      if(n->nd_cname == 0)
-      {
-        return Qfalse;
-      }
-      else if(n->nd_cname == 1)
-      {
-        return Qtrue;
-      }
-      else
-      {
-        return ID2SYM(n->nd_cname);
-      }
     case NEN_CNT:
       {
       return LONG2NUM((long)n->nd_cnt);
@@ -291,6 +278,30 @@ VALUE dump_node_elem(enum Node_Elem_Name nen, NODE * n, VALUE node_hash)
       {
         return Qnil;
       }
+    case NEN_CPATH:
+      if(n->nd_cpath)
+      {
+        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_cpath);
+        }
+
+        dump_node_or_iseq_to_hash(
+          (VALUE)n->nd_cpath,
+          node_type,
+          node_hash);
+        return node_id(n->nd_cpath);
+      }
+      else
+      {
+        return Qnil;
+      }
     case NEN_CVAL:
       switch(TYPE(n->nd_cval))
       {
@@ -311,7 +322,7 @@ VALUE dump_node_elem(enum Node_Elem_Name nen, NODE * n, VALUE node_hash)
           else
           {
             path = rb_class_path(klass);
-            if(STR2CSTR(path)[0] == '#')
+            if(StringValuePtr(path)[0] == '#')
             {
               rb_raise(rb_eArgError, "cannot dump anonymous class");
             }
@@ -439,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)
@@ -486,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)
       {
@@ -554,7 +521,7 @@ VALUE dump_node_elem(enum Node_Elem_Name nen, NODE * n, VALUE node_hash)
           else
           {
             path = rb_class_path(klass);
-            if(STR2CSTR(path)[0] == '#')
+            if(StringValuePtr(path)[0] == '#')
             {
               rb_raise(rb_eArgError, "cannot dump anonymous class");
             }
@@ -602,19 +569,6 @@ VALUE dump_node_elem(enum Node_Elem_Name nen, NODE * n, VALUE node_hash)
       {
         return ID2SYM(n->nd_modl);
       }
-    case NEN_NEW:
-      if(n->nd_new == 0)
-      {
-        return Qfalse;
-      }
-      else if(n->nd_new == 1)
-      {
-        return Qtrue;
-      }
-      else
-      {
-        return ID2SYM(n->nd_new);
-      }
     case NEN_NEXT:
       if(n->nd_next)
       {
@@ -647,18 +601,18 @@ VALUE dump_node_elem(enum Node_Elem_Name nen, NODE * n, VALUE node_hash)
       {
       return LONG2NUM((long)n->nd_nth);
       }
-    case NEN_OLD:
-      if(n->nd_old == 0)
+    case NEN_OID:
+      if(n->nd_oid == 0)
       {
         return Qfalse;
       }
-      else if(n->nd_old == 1)
+      else if(n->nd_oid == 1)
       {
         return Qtrue;
       }
       else
       {
-        return ID2SYM(n->nd_old);
+        return ID2SYM(n->nd_oid);
       }
     case NEN_OPT:
       if(n->nd_opt)
@@ -704,7 +658,7 @@ VALUE dump_node_elem(enum Node_Elem_Name nen, NODE * n, VALUE node_hash)
           else
           {
             path = rb_class_path(klass);
-            if(STR2CSTR(path)[0] == '#')
+            if(StringValuePtr(path)[0] == '#')
             {
               rb_raise(rb_eArgError, "cannot dump anonymous class");
             }
@@ -726,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)
       {
@@ -775,8 +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 == 0)
+      {
+        return Qfalse;
+      }
+      else if(n->nd_rest == 1)
+      {
+        return Qtrue;
+      }
+      else
       {
-      return LONG2NUM((long)n->nd_rest);
+        return ID2SYM(n->nd_rest);
       }
     case NEN_RVAL:
       if(n->nd_2nd)
@@ -892,7 +872,7 @@ VALUE dump_node_elem(enum Node_Elem_Name nen, NODE * n, VALUE node_hash)
           else
           {
             path = rb_class_path(klass);
-            if(STR2CSTR(path)[0] == '#')
+            if(StringValuePtr(path)[0] == '#')
             {
               rb_raise(rb_eArgError, "cannot dump anonymous class");
             }
@@ -975,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);
 }
@@ -1147,20 +1131,23 @@ void load_node_elem(enum Node_Elem_Name nen, VALUE v, NODE * n, VALUE node_hash,
       }
     case NEN_CLSS:
     {
+      int flags;
       Check_Type(v, T_ARRAY);
       if(RARRAY_LEN(v) != 2)
       {
         rb_raise(rb_eArgError, "wrong size for array");
       }
-      int flags = NUM2INT(RARRAY_PTR(v)[0]);
+      flags = NUM2INT(RARRAY_PTR(v)[0]);
       switch(flags & T_MASK)
       {
         case T_CLASS:
         case T_MODULE:
         {
-          VALUE str = RARRAY_PTR(v)[1];
+          VALUE str, klass;
+
+          str = RARRAY_PTR(v)[1];
           Check_Type(str, T_STRING);
-          VALUE klass = rb_path2class(STR2CSTR(str));
+          klass = rb_path2class(StringValuePtr(str));
           if(flags & FL_SINGLETON)
           {
             *(VALUE *)(&n->nd_clss) =
@@ -1179,39 +1166,48 @@ void load_node_elem(enum Node_Elem_Name nen, VALUE v, NODE * n, VALUE node_hash,
       }
       return;
       }
-    case NEN_CNAME:
+    case NEN_CNT:
     {
-      if(v == Qfalse)
-      {
-        n->nd_cname = 0;
+      n->nd_cnt = NUM2LONG(v);
+      return;
       }
-      else if(v == Qfalse)
+    case NEN_COND:
+    {
+      if(v == Qnil)
       {
-        n->nd_cname = 1;
+        n->nd_cond = 0;
       }
       else
       {
-        n->nd_cname = SYM2ID(v);
-      }
-      return;
+        VALUE nid = rb_hash_aref(id_hash, v);
+        if(RTEST(nid))
+        {
+          n->nd_cond = 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);
+          }
+        }
       }
-    case NEN_CNT:
-    {
-      n->nd_cnt = NUM2LONG(v);
       return;
       }
-    case NEN_COND:
+    case NEN_CPATH:
     {
       if(v == Qnil)
       {
-        n->nd_cond = 0;
+        n->nd_cpath = 0;
       }
       else
       {
         VALUE nid = rb_hash_aref(id_hash, v);
         if(RTEST(nid))
         {
-          n->nd_cond = id_to_node(nid);
+          n->nd_cpath = id_to_node(nid);
         }
         else
         {
@@ -1227,20 +1223,23 @@ void load_node_elem(enum Node_Elem_Name nen, VALUE v, NODE * n, VALUE node_hash,
       }
     case NEN_CVAL:
     {
+      int flags;
       Check_Type(v, T_ARRAY);
       if(RARRAY_LEN(v) != 2)
       {
         rb_raise(rb_eArgError, "wrong size for array");
       }
-      int flags = NUM2INT(RARRAY_PTR(v)[0]);
+      flags = NUM2INT(RARRAY_PTR(v)[0]);
       switch(flags & T_MASK)
       {
         case T_CLASS:
         case T_MODULE:
         {
-          VALUE str = RARRAY_PTR(v)[1];
+          VALUE str, klass;
+
+          str = RARRAY_PTR(v)[1];
           Check_Type(str, T_STRING);
-          VALUE klass = rb_path2class(STR2CSTR(str));
+          klass = rb_path2class(StringValuePtr(str));
           if(flags & FL_SINGLETON)
           {
             *(VALUE *)(&n->nd_cval) =
@@ -1366,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:
@@ -1414,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)
@@ -1466,20 +1420,23 @@ void load_node_elem(enum Node_Elem_Name nen, VALUE v, NODE * n, VALUE node_hash,
       }
     case NEN_LIT:
     {
+      int flags;
       Check_Type(v, T_ARRAY);
       if(RARRAY_LEN(v) != 2)
       {
         rb_raise(rb_eArgError, "wrong size for array");
       }
-      int flags = NUM2INT(RARRAY_PTR(v)[0]);
+      flags = NUM2INT(RARRAY_PTR(v)[0]);
       switch(flags & T_MASK)
       {
         case T_CLASS:
         case T_MODULE:
         {
-          VALUE str = RARRAY_PTR(v)[1];
+          VALUE str, klass;
+
+          str = RARRAY_PTR(v)[1];
           Check_Type(str, T_STRING);
-          VALUE klass = rb_path2class(STR2CSTR(str));
+          klass = rb_path2class(StringValuePtr(str));
           if(flags & FL_SINGLETON)
           {
             *(VALUE *)(&n->nd_lit) =
@@ -1530,22 +1487,6 @@ void load_node_elem(enum Node_Elem_Name nen, VALUE v, NODE * n, VALUE node_hash,
       }
       return;
       }
-    case NEN_NEW:
-    {
-      if(v == Qfalse)
-      {
-        n->nd_new = 0;
-      }
-      else if(v == Qfalse)
-      {
-        n->nd_new = 1;
-      }
-      else
-      {
-        n->nd_new = SYM2ID(v);
-      }
-      return;
-      }
     case NEN_NEXT:
     {
       if(v == Qnil)
@@ -1581,19 +1522,19 @@ void load_node_elem(enum Node_Elem_Name nen, VALUE v, NODE * n, VALUE node_hash,
       n->nd_nth = NUM2LONG(v);
       return;
       }
-    case NEN_OLD:
+    case NEN_OID:
     {
       if(v == Qfalse)
       {
-        n->nd_old = 0;
+        n->nd_oid = 0;
       }
       else if(v == Qfalse)
       {
-        n->nd_old = 1;
+        n->nd_oid = 1;
       }
       else
       {
-        n->nd_old = SYM2ID(v);
+        n->nd_oid = SYM2ID(v);
       }
       return;
       }
@@ -1624,20 +1565,23 @@ void load_node_elem(enum Node_Elem_Name nen, VALUE v, NODE * n, VALUE node_hash,
       }
     case NEN_ORIG:
     {
+      int flags;
       Check_Type(v, T_ARRAY);
       if(RARRAY_LEN(v) != 2)
       {
         rb_raise(rb_eArgError, "wrong size for array");
       }
-      int flags = NUM2INT(RARRAY_PTR(v)[0]);
+      flags = NUM2INT(RARRAY_PTR(v)[0]);
       switch(flags & T_MASK)
       {
         case T_CLASS:
         case T_MODULE:
         {
-          VALUE str = RARRAY_PTR(v)[1];
+          VALUE str, klass;
+
+          str = RARRAY_PTR(v)[1];
           Check_Type(str, T_STRING);
-          VALUE klass = rb_path2class(STR2CSTR(str));
+          klass = rb_path2class(StringValuePtr(str));
           if(flags & FL_SINGLETON)
           {
             *(VALUE *)(&n->nd_orig) =
@@ -1656,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)
@@ -1708,7 +1673,18 @@ void load_node_elem(enum Node_Elem_Name nen, VALUE v, NODE * n, VALUE node_hash,
       }
     case NEN_REST:
     {
-      n->nd_rest = NUM2LONG(v);
+      if(v == Qfalse)
+      {
+        n->nd_rest = 0;
+      }
+      else if(v == Qfalse)
+      {
+        n->nd_rest = 1;
+      }
+      else
+      {
+        n->nd_rest = SYM2ID(v);
+      }
       return;
       }
     case NEN_RVAL:
@@ -1844,20 +1820,23 @@ void load_node_elem(enum Node_Elem_Name nen, VALUE v, NODE * n, VALUE node_hash,
       }
     case NEN_TVAL:
     {
+      int flags;
       Check_Type(v, T_ARRAY);
       if(RARRAY_LEN(v) != 2)
       {
         rb_raise(rb_eArgError, "wrong size for array");
       }
-      int flags = NUM2INT(RARRAY_PTR(v)[0]);
+      flags = NUM2INT(RARRAY_PTR(v)[0]);
       switch(flags & T_MASK)
       {
         case T_CLASS:
         case T_MODULE:
         {
-          VALUE str = RARRAY_PTR(v)[1];
+          VALUE str, klass;
+
+          str = RARRAY_PTR(v)[1];
           Check_Type(str, T_STRING);
-          VALUE klass = rb_path2class(STR2CSTR(str));
+          klass = rb_path2class(StringValuePtr(str));
           if(flags & FL_SINGLETON)
           {
             *(VALUE *)(&n->nd_tval) =
@@ -1942,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);
 }
@@ -2031,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.
@@ -2138,54 +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 _cname_ member.  The return type is a
- * Symbol.
- */
-static VALUE node_cname(VALUE self)
-{
-  NODE * n;
-  Data_Get_Struct(self, NODE, n);
-  if(n->nd_cname == 0)
-  {
-    return Qfalse;
-  }
-  else if(n->nd_cname == 1)
-  {
-    return Qtrue;
-  }
-  else
-  {
-    return ID2SYM(n->nd_cname);
-  }
-}
 /*
  * Return the Node's _cnt_ member.  The return type is an
  * Integer.
@@ -2224,10 +2150,37 @@ static VALUE node_cond(VALUE self)
   }
 }
 /*
- * Return the Node's _cval_ member.  The return type is
+ * Return the Node's _cpath_ member.  The return type is
  * either a Node or an Object.
  */
-static VALUE node_cval(VALUE self)
+static VALUE node_cpath(VALUE self)
+{
+  NODE * n;
+  Data_Get_Struct(self, NODE, n);
+
+  if(TYPE(n->nd_cpath) == T_NODE)
+  {
+    if(0 && nd_type(n) == NODE_OP_ASGN2)
+    {
+      return wrap_node_as(
+        (NODE *)n->nd_cpath,
+        rb_cNodeSubclass[NODE_OP_ASGN2_ARG]);
+    }
+    else
+    {
+      return wrap_node((NODE *)n->nd_cpath);
+    }
+  }
+  else
+  {
+    return (VALUE)n->nd_cpath;
+  }
+}
+/*
+ * Return the Node's _cval_ member.  The return type is
+ * either a Node or an Object.
+ */
+static VALUE node_cval(VALUE self)
 {
   NODE * n;
   Data_Get_Struct(self, NODE, n);
@@ -2551,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.
@@ -2633,14 +2559,25 @@ static VALUE node_resq(VALUE self)
   }
 }
 /*
- * Return the Node's _rest_ member.  The return type is an
- * Integer.
+ * 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);
-  return LONG2NUM(n->nd_rest);
+  if(n->nd_rest == 0)
+  {
+    return Qfalse;
+  }
+  else if(n->nd_rest == 1)
+  {
+    return Qtrue;
+  }
+  else
+  {
+    return ID2SYM(n->nd_rest);
+  }
 }
 /*
  * Return the Node's _rval_ member.  The return type is
@@ -2885,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, "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"));
+    rb_define_method(rb_cALIAS, "first", node_1st, 0);
+    rb_ary_push(members, rb_str_new2("first"));
   }
 
   /* Document-class: Node::ALLOCA
@@ -2912,17 +2849,17 @@ void define_node_subclass_methods()
     rb_define_method(rb_cALLOCA, "cfnc", node_cfnc, 0);
     rb_ary_push(members, rb_str_new2("cfnc"));
 
-    /* Document-method: value
-     * a pointer to the previously allocated temporary node
-     */
-    rb_define_method(rb_cALLOCA, "value", node_value, 0);
-    rb_ary_push(members, rb_str_new2("value"));
-
     /* Document-method: cnt
      * the number of bytes allocated
      */
     rb_define_method(rb_cALLOCA, "cnt", node_cnt, 0);
     rb_ary_push(members, rb_str_new2("cnt"));
+
+    /* Document-method: value
+     * a pointer to the previously allocated temporary node
+     */
+    rb_define_method(rb_cALLOCA, "value", node_value, 0);
+    rb_ary_push(members, rb_str_new2("value"));
   }
 #endif
 
@@ -2941,17 +2878,17 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cAND, "__type__", INT2NUM(NODE_AND));
     rb_define_singleton_method(rb_cAND, "members", node_s_members, 0);
 
-    /* Document-method: first
-     * the expression on the left hand side
-     */
-    rb_define_method(rb_cAND, "first", node_1st, 0);
-    rb_ary_push(members, rb_str_new2("first"));
-
     /* Document-method: second
      * the expression on the right hand side
      */
     rb_define_method(rb_cAND, "second", node_2nd, 0);
     rb_ary_push(members, rb_str_new2("second"));
+
+    /* Document-method: first
+     * the expression on the left hand side
+     */
+    rb_define_method(rb_cAND, "first", node_1st, 0);
+    rb_ary_push(members, rb_str_new2("first"));
   }
 
   /* Document-class: Node::ARGS
@@ -2965,12 +2902,6 @@ 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
@@ -2978,6 +2909,12 @@ 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
      */
@@ -3049,6 +2986,12 @@ void define_node_subclass_methods()
     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"));
+
     /* Document-method: head
      * the first element of the array
      */
@@ -3056,33 +2999,39 @@ void define_node_subclass_methods()
     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::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.
+  /* Document-class: Node::ATTRASGN
+   * Represents attribute assignment in the form:
+   *   recv.mid = args
+   * or:
+   *   recv.mid=(args).
    */
   {
-    VALUE rb_cATTRSET = rb_define_class_under(rb_cNode, "ATTRSET", rb_cNode);
+    VALUE rb_cATTRASGN = rb_define_class_under(rb_cNode, "ATTRASGN", 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);
+    rb_cNodeSubclass[NODE_ATTRASGN] = rb_cATTRASGN;
+    rb_iv_set(rb_cATTRASGN, "__member__", members);
+    rb_iv_set(rb_cATTRASGN, "__type__", INT2NUM(NODE_ATTRASGN));
+    rb_define_singleton_method(rb_cATTRASGN, "members", node_s_members, 0);
 
-    /* Document-method: vid
-     * the name of the attribute, with a leading '@' sign
+    /* Document-method: args
+     * the arguments to the method
      */
-    rb_define_method(rb_cATTRSET, "vid", node_vid, 0);
-    rb_ary_push(members, rb_str_new2("vid"));
+    rb_define_method(rb_cATTRASGN, "args", node_args, 0);
+    rb_ary_push(members, rb_str_new2("args"));
+
+    /* Document-method: mid
+     * the id of the attribute, with a trailing '=' sign
+     */
+    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
+     */
+    rb_define_method(rb_cATTRASGN, "recv", node_recv, 0);
+    rb_ary_push(members, rb_str_new2("recv"));
   }
 
   /* Document-class: Node::BACK_REF
@@ -3149,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: head
-     * the first expression in the block of code
-     */
-    rb_define_method(rb_cBLOCK, "head", node_head, 0);
-    rb_ary_push(members, rb_str_new2("head"));
-
     /* Document-method: next
      * the second expression in the block of code
      */
     rb_define_method(rb_cBLOCK, "next", node_next, 0);
     rb_ary_push(members, rb_str_new2("next"));
+
+    /* Document-method: head
+     * the first expression in the block of code
+     */
+    rb_define_method(rb_cBLOCK, "head", node_head, 0);
+    rb_ary_push(members, rb_str_new2("head"));
   }
 
   /* Document-class: Node::BLOCK_ARG
@@ -3200,17 +3149,17 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cBLOCK_PASS, "__type__", INT2NUM(NODE_BLOCK_PASS));
     rb_define_singleton_method(rb_cBLOCK_PASS, "members", node_s_members, 0);
 
-    /* Document-method: body
-     * the object to pass as a block
-     */
-    rb_define_method(rb_cBLOCK_PASS, "body", node_body, 0);
-    rb_ary_push(members, rb_str_new2("body"));
-
     /* Document-method: iter
      * an expression which calls a method
      */
     rb_define_method(rb_cBLOCK_PASS, "iter", node_iter, 0);
     rb_ary_push(members, rb_str_new2("iter"));
+
+    /* Document-method: body
+     * the object to pass as a block
+     */
+    rb_define_method(rb_cBLOCK_PASS, "body", node_body, 0);
+    rb_ary_push(members, rb_str_new2("body"));
   }
 
   /* Document-class: Node::BMETHOD
@@ -3300,6 +3249,8 @@ 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
@@ -3313,8 +3264,6 @@ 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
@@ -3329,43 +3278,27 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cCDECL, "__type__", INT2NUM(NODE_CDECL));
     rb_define_singleton_method(rb_cCDECL, "members", node_s_members, 0);
 
-    /* Document-method: value
-     * the value to be assigned to the constant
-     */
-    rb_define_method(rb_cCDECL, "value", node_value, 0);
-    rb_ary_push(members, rb_str_new2("value"));
-
     /* Document-method: vid
      * the name of the constant to be assigned, all uppercase
      */
     rb_define_method(rb_cCDECL, "vid", node_vid, 0);
     rb_ary_push(members, rb_str_new2("vid"));
-  }
 
-  /* Document-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-method: value
+     * the value to be assigned to the constant
+     */
+    rb_define_method(rb_cCDECL, "value", node_value, 0);
+    rb_ary_push(members, rb_str_new2("value"));
   }
 
   /* Document-class: Node::CLASS
    * Represents a class definition, e.g.:
-   *   class cname
+   *   class cpath
    *     body
    *   end
    * 
    * or:
-   *   class cname < super
+   *   class cpath < super
    *     body
    *   end
    * 
@@ -3382,24 +3315,24 @@ 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
-     */
-    rb_define_method(rb_cCLASS, "body", node_body, 0);
-    rb_ary_push(members, rb_str_new2("body"));
-
-    /* Document-method: cname
-     * the name of the class to define
-     */
-    rb_define_method(rb_cCLASS, "cname", node_cname, 0);
-    rb_ary_push(members, rb_str_new2("cname"));
-
     /* Document-method: super
      * an expression returning the base class, or false if there is no
      * base class specified
      */
     rb_define_method(rb_cCLASS, "super", node_super, 0);
     rb_ary_push(members, rb_str_new2("super"));
+
+    /* Document-method: cpath
+     * the name of the class to define
+     */
+    rb_define_method(rb_cCLASS, "cpath", node_cpath, 0);
+    rb_ary_push(members, rb_str_new2("cpath"));
+
+    /* Document-method: body
+     * the body of the class definition
+     */
+    rb_define_method(rb_cCLASS, "body", node_body, 0);
+    rb_ary_push(members, rb_str_new2("body"));
   }
 
   /* Document-class: Node::COLON2
@@ -3471,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: 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
-     */
-    rb_define_method(rb_cCREF, "next", node_next, 0);
-    rb_ary_push(members, rb_str_new2("next"));
-
-    /* Document-method: clss
-     * the new class to use for the cbase.
-     */
-    rb_define_method(rb_cCREF, "clss", node_clss, 0);
-    rb_ary_push(members, rb_str_new2("clss"));
-  }
-
   /* Document-class: Node::CVAR
    * Represents a class variable retrieval.  The result of the expression
    * is the value of the class variable.
@@ -3536,18 +3434,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
@@ -3563,18 +3461,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
@@ -3597,17 +3495,17 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cDASGN, "__type__", INT2NUM(NODE_DASGN));
     rb_define_singleton_method(rb_cDASGN, "members", node_s_members, 0);
 
-    /* Document-method: value
-     * the value to assign to the local variable
-     */
-    rb_define_method(rb_cDASGN, "value", node_value, 0);
-    rb_ary_push(members, rb_str_new2("value"));
-
     /* Document-method: vid
      * the name of the local variable
      */
     rb_define_method(rb_cDASGN, "vid", node_vid, 0);
     rb_ary_push(members, rb_str_new2("vid"));
+
+    /* Document-method: value
+     * the value to assign to the local variable
+     */
+    rb_define_method(rb_cDASGN, "value", node_value, 0);
+    rb_ary_push(members, rb_str_new2("value"));
   }
 
   /* Document-class: Node::DASGN_CURR
@@ -3622,17 +3520,17 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cDASGN_CURR, "__type__", INT2NUM(NODE_DASGN_CURR));
     rb_define_singleton_method(rb_cDASGN_CURR, "members", node_s_members, 0);
 
-    /* Document-method: value
-     * the value to assign to the local variable
-     */
-    rb_define_method(rb_cDASGN_CURR, "value", node_value, 0);
-    rb_ary_push(members, rb_str_new2("value"));
-
     /* Document-method: vid
      * the name of the local variable
      */
     rb_define_method(rb_cDASGN_CURR, "vid", node_vid, 0);
     rb_ary_push(members, rb_str_new2("vid"));
+
+    /* Document-method: value
+     * the value to assign to the local variable
+     */
+    rb_define_method(rb_cDASGN_CURR, "value", node_value, 0);
+    rb_ary_push(members, rb_str_new2("value"));
   }
 
   /* Document-class: Node::DEFINED
@@ -3668,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: 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: defn
      * the body of the method definition
      */
@@ -3679,12 +3583,6 @@ void define_node_subclass_methods()
      */
     rb_define_method(rb_cDEFN, "mid", node_mid, 0);
     rb_ary_push(members, rb_str_new2("mid"));
-
-    /* Document-method: noex
-     * the flags which should be used to define the method
-     */
-    rb_define_method(rb_cDEFN, "noex", node_noex, 0);
-    rb_ary_push(members, rb_str_new2("noex"));
   }
 
   /* Document-class: Node::DEFS
@@ -3716,29 +3614,6 @@ void define_node_subclass_methods()
     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
-     */
-    rb_define_method(rb_cDMETHOD, "cval", node_cval, 0);
-    rb_ary_push(members, rb_str_new2("cval"));
-  }
-
   /* Document-class: Node::DOT2
    * Represents a range created with the form:
    *   beg..end
@@ -3751,6 +3626,8 @@ 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
@@ -3763,8 +3640,6 @@ 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
@@ -3779,6 +3654,8 @@ 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
@@ -3791,8 +3668,6 @@ 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
@@ -3811,11 +3686,11 @@ 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
+    /* Document-method: next
+     * a list of expressions to be appended onto the string
      */
-    rb_define_method(rb_cDREGX, "lit", node_lit, 0);
-    rb_ary_push(members, rb_str_new2("lit"));
+    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
@@ -3834,11 +3709,11 @@ 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
+    /* Document-method: lit
+     * a string
      */
-    rb_define_method(rb_cDREGX, "next", node_next, 0);
-    rb_ary_push(members, rb_str_new2("next"));
+    rb_define_method(rb_cDREGX, "lit", node_lit, 0);
+    rb_ary_push(members, rb_str_new2("lit"));
   }
 
   /* Document-class: Node::DREGX_ONCE
@@ -3854,11 +3729,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: lit
-     * a string
+    /* Document-method: next
+     * a list of expressions to be appended onto the string
      */
-    rb_define_method(rb_cDREGX_ONCE, "lit", node_lit, 0);
-    rb_ary_push(members, rb_str_new2("lit"));
+    rb_define_method(rb_cDREGX_ONCE, "next", node_next, 0);
+    rb_ary_push(members, rb_str_new2("next"));
 
     /* Document-method: cflag
      * a bitfield containing the options used in the regular
@@ -3867,11 +3742,11 @@ void define_node_subclass_methods()
     rb_define_method(rb_cDREGX_ONCE, "cflag", node_cflag, 0);
     rb_ary_push(members, rb_str_new2("cflag"));
 
-    /* Document-method: next
-     * a list of expressions to be appended onto the string
+    /* Document-method: lit
+     * a string
      */
-    rb_define_method(rb_cDREGX_ONCE, "next", node_next, 0);
-    rb_ary_push(members, rb_str_new2("next"));
+    rb_define_method(rb_cDREGX_ONCE, "lit", node_lit, 0);
+    rb_ary_push(members, rb_str_new2("lit"));
   }
 
   /* Document-class: Node::DSTR
@@ -3890,17 +3765,41 @@ 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);
+  /* Document-class: Node::DSYM
+   * Represents a symbol with interpolation, e.g.:
+   *   :"#{next}"
+   * 
+   * The node is evaluated by duplicating the string stored in the 'lit'
+   * element, then iterating over the nodes stored in the 'next' element.
+   * Each node found should evalate to a string, and each resulting
+   * string is appended onto the original string.  The final resulting
+   * string is then converted into a symbol.  Interpolation is
+   * represented with the EVSTR node.
+   */
+  {
+    VALUE rb_cDSYM = rb_define_class_under(rb_cNode, "DSYM", rb_cNode);
+    members = rb_ary_new();
+    rb_cNodeSubclass[NODE_DSYM] = rb_cDSYM;
+    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"));
   }
 
   /* Document-class: Node::DVAR
@@ -3943,17 +3842,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: 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-method: lit
+     * a string
+     */
+    rb_define_method(rb_cDXSTR, "lit", node_lit, 0);
+    rb_ary_push(members, rb_str_new2("lit"));
   }
 
   /* Document-class: Node::ENSURE
@@ -4005,11 +3904,11 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cEVSTR, "__type__", INT2NUM(NODE_EVSTR));
     rb_define_singleton_method(rb_cEVSTR, "members", node_s_members, 0);
 
-    /* Document-method: lit
-     * a string containing an expression to evaluate
+    /* Document-method: body
+     * an expression to evaluate
      */
-    rb_define_method(rb_cEVSTR, "lit", node_lit, 0);
-    rb_ary_push(members, rb_str_new2("lit"));
+    rb_define_method(rb_cEVSTR, "body", node_body, 0);
+    rb_ary_push(members, rb_str_new2("body"));
   }
 
   /* Document-class: Node::FALSE
@@ -4024,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: 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
-     */
-    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-class: Node::FCALL
    * Represents a method call in the form:
    *   mid(args).
@@ -4098,6 +3965,13 @@ 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: cnt
+     * the index into the local variable table of the special variable
+     * to use in the flip-flop expression (usually 2 for $_)
+     */
+    rb_define_method(rb_cFLIP2, "cnt", node_cnt, 0);
+    rb_ary_push(members, rb_str_new2("cnt"));
+
     /* Document-method: beg
      * the beginning of the range
      */
@@ -4109,13 +3983,6 @@ void define_node_subclass_methods()
      */
     rb_define_method(rb_cFLIP2, "end", node_end, 0);
     rb_ary_push(members, rb_str_new2("end"));
-
-    /* Document-method: cnt
-     * the index into the local variable table of the special variable
-     * to use in the flip-flop expression (usually 2 for $_)
-     */
-    rb_define_method(rb_cFLIP2, "cnt", node_cnt, 0);
-    rb_ary_push(members, rb_str_new2("cnt"));
   }
 
   /* Document-class: Node::FLIP3
@@ -4132,6 +3999,13 @@ 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: cnt
+     * the index into the local variable table of the special variable
+     * to use in the flip-flop expression (usually 2 for $_)
+     */
+    rb_define_method(rb_cFLIP3, "cnt", node_cnt, 0);
+    rb_ary_push(members, rb_str_new2("cnt"));
+
     /* Document-method: beg
      * the beginning of the range
      */
@@ -4143,13 +4017,6 @@ void define_node_subclass_methods()
      */
     rb_define_method(rb_cFLIP3, "end", node_end, 0);
     rb_ary_push(members, rb_str_new2("end"));
-
-    /* Document-method: cnt
-     * the index into the local variable table of the special variable
-     * to use in the flip-flop expression (usually 2 for $_)
-     */
-    rb_define_method(rb_cFLIP3, "cnt", node_cnt, 0);
-    rb_ary_push(members, rb_str_new2("cnt"));
   }
 
   /* Document-class: Node::FOR
@@ -4174,12 +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: body
-     * the body of the loop
-     */
-    rb_define_method(rb_cFOR, "body", node_body, 0);
-    rb_ary_push(members, rb_str_new2("body"));
-
     /* Document-method: iter
      * the sequence over which to iterate
      */
@@ -4193,6 +4054,12 @@ void define_node_subclass_methods()
      */
     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
+     */
+    rb_define_method(rb_cFOR, "body", node_body, 0);
+    rb_ary_push(members, rb_str_new2("body"));
   }
 
   /* Document-class: Node::GASGN
@@ -4206,12 +4073,6 @@ 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: 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.
      */
@@ -4219,6 +4080,12 @@ void define_node_subclass_methods()
     rb_ary_push(members, rb_str_new2("vid"));
     rb_define_method(rb_cGASGN, "entry", node_entry, 0);
     rb_ary_push(members, rb_str_new2("entry"));
+
+    /* Document-method: value
+     * an expression whose result is the new value of the global variable
+     */
+    rb_define_method(rb_cGASGN, "value", node_value, 0);
+    rb_ary_push(members, rb_str_new2("value"));
   }
 
   /* Document-class: Node::GVAR
@@ -4271,17 +4138,17 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cIASGN, "__type__", INT2NUM(NODE_IASGN));
     rb_define_singleton_method(rb_cIASGN, "members", node_s_members, 0);
 
-    /* Document-method: value
-     * the value to assign to the instance variable
-     */
-    rb_define_method(rb_cIASGN, "value", node_value, 0);
-    rb_ary_push(members, rb_str_new2("value"));
-
     /* Document-method: vid
      * the name of the instance variable, with a leading '@' sign
      */
     rb_define_method(rb_cIASGN, "vid", node_vid, 0);
     rb_ary_push(members, rb_str_new2("vid"));
+
+    /* Document-method: value
+     * the value to assign to the instance variable
+     */
+    rb_define_method(rb_cIASGN, "value", node_value, 0);
+    rb_ary_push(members, rb_str_new2("value"));
   }
 
   /* Document-class: Node::IF
@@ -4313,6 +4180,13 @@ 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
+     */
+    rb_define_method(rb_cIF, "else", node_else, 0);
+    rb_ary_push(members, rb_str_new2("else"));
+
     /* Document-method: cond
      * the condition to evaluate
      */
@@ -4325,13 +4199,6 @@ void define_node_subclass_methods()
      */
     rb_define_method(rb_cIF, "body", node_body, 0);
     rb_ary_push(members, rb_str_new2("body"));
-
-    /* Document-method: else
-     * the expression to evaluate if the expression is false, or false
-     * if the expression is empty
-     */
-    rb_define_method(rb_cIF, "else", node_else, 0);
-    rb_ary_push(members, rb_str_new2("else"));
   }
 
   /* Document-class: Node::IFUNC
@@ -4345,12 +4212,6 @@ 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: cfnc
-     * a pointer to the C function to which to yield
-     */
-    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
      * cfnc
@@ -4363,6 +4224,12 @@ void define_node_subclass_methods()
      */
     rb_define_method(rb_cIFUNC, "state", node_state, 0);
     rb_ary_push(members, rb_str_new2("state"));
+
+    /* Document-method: cfnc
+     * a pointer to the C function to which to yield
+     */
+    rb_define_method(rb_cIFUNC, "cfnc", node_cfnc, 0);
+    rb_ary_push(members, rb_str_new2("cfnc"));
   }
 
   /* Document-class: Node::ITER
@@ -4386,12 +4253,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: body
-     * the body of the loop
-     */
-    rb_define_method(rb_cITER, "body", node_body, 0);
-    rb_ary_push(members, rb_str_new2("body"));
-
     /* Document-method: iter
      * an expression which calls the desired iteration method, usually
      * recv.each
@@ -4406,6 +4267,12 @@ void define_node_subclass_methods()
      */
     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
+     */
+    rb_define_method(rb_cITER, "body", node_body, 0);
+    rb_ary_push(members, rb_str_new2("body"));
   }
 
   /* Document-class: Node::IVAR
@@ -4440,12 +4307,6 @@ 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: 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
      */
@@ -4453,6 +4314,12 @@ void define_node_subclass_methods()
     rb_ary_push(members, rb_str_new2("vid"));
     rb_define_method(rb_cLASGN, "cnt", node_cnt, 0);
     rb_ary_push(members, rb_str_new2("cnt"));
+
+    /* Document-method: value
+     * the value to assign to the local variable
+     */
+    rb_define_method(rb_cLASGN, "value", node_value, 0);
+    rb_ary_push(members, rb_str_new2("value"));
   }
 
   /* Document-class: Node::LIT
@@ -4546,11 +4413,11 @@ 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: head
+    /* Document-method: lit
      * the regular expression to use in the condition.
      */
-    rb_define_method(rb_cMATCH, "head", node_head, 0);
-    rb_ary_push(members, rb_str_new2("head"));
+    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
@@ -4584,6 +4451,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
@@ -4591,13 +4465,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
@@ -4615,17 +4482,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
@@ -4651,33 +4518,9 @@ 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: 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-class: Node::MODULE
    * Represents a module definition, e.g.:
-   *   module cname
+   *   module cpath
    *     body
    *   end
    * 
@@ -4694,36 +4537,17 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cMODULE, "__type__", INT2NUM(NODE_MODULE));
     rb_define_singleton_method(rb_cMODULE, "members", node_s_members, 0);
 
+    /* Document-method: cpath
+     * the name of the module to define
+     */
+    rb_define_method(rb_cMODULE, "cpath", node_cpath, 0);
+    rb_ary_push(members, rb_str_new2("cpath"));
+
     /* Document-method: body
      * the body of the module definition
      */
     rb_define_method(rb_cMODULE, "body", node_body, 0);
     rb_ary_push(members, rb_str_new2("body"));
-
-    /* Document-method: cname
-     * the name of the module to define
-     */
-    rb_define_method(rb_cMODULE, "cname", node_cname, 0);
-    rb_ary_push(members, rb_str_new2("cname"));
-  }
-
-  /* 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
@@ -4754,24 +4578,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.
    */
@@ -4886,12 +4692,6 @@ 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
-     */
-    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
@@ -4904,6 +4704,12 @@ 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-class: Node::OP_ASGN2_ARG
@@ -4919,12 +4725,6 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cOP_ASGN2_ARG, "__type__", INT2NUM(NODE_OP_ASGN2_ARG));
     rb_define_singleton_method(rb_cOP_ASGN2_ARG, "members", node_s_members, 0);
 
-    /* Document-method: vid
-     * The method to call on the receiver to retrieve the attribute
-     */
-    rb_define_method(rb_cOP_ASGN2_ARG, "vid", node_vid, 0);
-    rb_ary_push(members, rb_str_new2("vid"));
-
     /* Document-method: aid
      * The method to call on the receiver to set the attribute
      */
@@ -4938,6 +4738,12 @@ void define_node_subclass_methods()
      */
     rb_define_method(rb_cOP_ASGN2_ARG, "mid", node_mid, 0);
     rb_ary_push(members, rb_str_new2("mid"));
+
+    /* Document-method: vid
+     * The method to call on the receiver to retrieve the attribute
+     */
+    rb_define_method(rb_cOP_ASGN2_ARG, "vid", node_vid, 0);
+    rb_ary_push(members, rb_str_new2("vid"));
   }
 
   /* Document-class: Node::OP_ASGN_AND
@@ -4956,18 +4762,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
@@ -4994,17 +4800,17 @@ void define_node_subclass_methods()
     rb_define_method(rb_cOP_ASGN_OR, "aid", node_aid, 0);
     rb_ary_push(members, rb_str_new2("aid"));
 
-    /* Document-method: value
-     * the right hand side of the assignment
-     */
-    rb_define_method(rb_cOP_ASGN_OR, "value", node_value, 0);
-    rb_ary_push(members, rb_str_new2("value"));
-
     /* Document-method: recv
      * the receiver of the assignment
      */
     rb_define_method(rb_cOP_ASGN_OR, "recv", node_recv, 0);
     rb_ary_push(members, rb_str_new2("recv"));
+
+    /* Document-method: value
+     * the right hand side of the assignment
+     */
+    rb_define_method(rb_cOP_ASGN_OR, "value", node_value, 0);
+    rb_ary_push(members, rb_str_new2("value"));
   }
 
   /* Document-class: Node::OR
@@ -5022,17 +4828,17 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cOR, "__type__", INT2NUM(NODE_OR));
     rb_define_singleton_method(rb_cOR, "members", node_s_members, 0);
 
-    /* Document-method: first
-     * the expression on the left hand side
-     */
-    rb_define_method(rb_cOR, "first", node_1st, 0);
-    rb_ary_push(members, rb_str_new2("first"));
-
     /* Document-method: second
      * the expression on the right hand side
      */
     rb_define_method(rb_cOR, "second", node_2nd, 0);
     rb_ary_push(members, rb_str_new2("second"));
+
+    /* Document-method: first
+     * the expression on the left hand side
+     */
+    rb_define_method(rb_cOR, "first", node_1st, 0);
+    rb_ary_push(members, rb_str_new2("first"));
   }
 
   /* Document-class: Node::POSTEXE
@@ -5084,18 +4890,18 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cRESBODY, "__type__", INT2NUM(NODE_RESBODY));
     rb_define_singleton_method(rb_cRESBODY, "members", node_s_members, 0);
 
-    /* Document-method: head
-     * the next rescue
-     */
-    rb_define_method(rb_cRESBODY, "head", node_head, 0);
-    rb_ary_push(members, rb_str_new2("head"));
-
     /* Document-method: args
      * the expression type to match against
      */
     rb_define_method(rb_cRESBODY, "args", node_args, 0);
     rb_ary_push(members, rb_str_new2("args"));
 
+    /* Document-method: head
+     * the next rescue
+     */
+    rb_define_method(rb_cRESBODY, "head", node_head, 0);
+    rb_ary_push(members, rb_str_new2("head"));
+
     /* Document-method: body
      * the expresion to evaluate if the exception type matches
      */
@@ -5140,18 +4946,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: 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: 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
+     */
+    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
      */
@@ -5211,17 +5017,17 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cSCLASS, "__type__", INT2NUM(NODE_SCLASS));
     rb_define_singleton_method(rb_cSCLASS, "members", node_s_members, 0);
 
-    /* Document-method: body
-     * the body of the class definition
-     */
-    rb_define_method(rb_cSCLASS, "body", node_body, 0);
-    rb_ary_push(members, rb_str_new2("body"));
-
     /* Document-method: recv
      * the object whose singleton class is to be modified
      */
     rb_define_method(rb_cSCLASS, "recv", node_recv, 0);
     rb_ary_push(members, rb_str_new2("recv"));
+
+    /* Document-method: body
+     * the body of the class definition
+     */
+    rb_define_method(rb_cSCLASS, "body", node_body, 0);
+    rb_ary_push(members, rb_str_new2("body"));
   }
 
   /* Document-class: Node::SCOPE
@@ -5246,6 +5052,12 @@ 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: 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: tbl
      * the names of the local variables* next the first expression in
      * the scope
@@ -5259,12 +5071,6 @@ void define_node_subclass_methods()
      */
     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
@@ -5279,6 +5085,29 @@ void define_node_subclass_methods()
     rb_define_singleton_method(rb_cSELF, "members", node_s_members, 0);
   }
 
+  /* Document-class: Node::SPLAT
+   * Represents the splat (*) operation as an rvalue, e.g.:
+   *   *head
+   * If the argument is an array, returns self.
+   * If the argument is nil, returns [nil].
+   * If the argument is any other value, returns the result of calling #to_a on the
+   * argument.
+   */
+  {
+    VALUE rb_cSPLAT = rb_define_class_under(rb_cNode, "SPLAT", rb_cNode);
+    members = rb_ary_new();
+    rb_cNodeSubclass[NODE_SPLAT] = rb_cSPLAT;
+    rb_iv_set(rb_cSPLAT, "__member__", members);
+    rb_iv_set(rb_cSPLAT, "__type__", INT2NUM(NODE_SPLAT));
+    rb_define_singleton_method(rb_cSPLAT, "members", node_s_members, 0);
+
+    /* Document-method: head
+     * the argument to splat.
+     */
+    rb_define_method(rb_cSPLAT, "head", node_head, 0);
+    rb_ary_push(members, rb_str_new2("head"));
+  }
+
   /* Document-class: Node::STR
    * Represents a string object.  Duplicates the string stored in the
    * node.
@@ -5316,6 +5145,26 @@ void define_node_subclass_methods()
     rb_ary_push(members, rb_str_new2("args"));
   }
 
+  /* 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
+   * \#to_ary on the argument.
+   */
+  {
+    VALUE rb_cTO_ARY = rb_define_class_under(rb_cNode, "TO_ARY", rb_cNode);
+    members = rb_ary_new();
+    rb_cNodeSubclass[NODE_TO_ARY] = rb_cTO_ARY;
+    rb_iv_set(rb_cTO_ARY, "__member__", members);
+    rb_iv_set(rb_cTO_ARY, "__type__", INT2NUM(NODE_TO_ARY));
+    rb_define_singleton_method(rb_cTO_ARY, "members", node_s_members, 0);
+
+    /* Document-method: head
+     * the object to convert to an array
+     */
+    rb_define_method(rb_cTO_ARY, "head", node_head, 0);
+    rb_ary_push(members, rb_str_new2("head"));
+  }
+
   /* Document-class: Node::TRUE
    * Represents the keyword 'true'.
    */
@@ -5343,11 +5192,11 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cUNDEF, "__type__", INT2NUM(NODE_UNDEF));
     rb_define_singleton_method(rb_cUNDEF, "members", node_s_members, 0);
 
-    /* Document-method: mid
-     * the id of the method to undefine
+    /* Document-method: body
+     * an expression returning the id of the method to undefine
      */
-    rb_define_method(rb_cUNDEF, "mid", node_mid, 0);
-    rb_ary_push(members, rb_str_new2("mid"));
+    rb_define_method(rb_cUNDEF, "body", node_body, 0);
+    rb_ary_push(members, rb_str_new2("body"));
   }
 
   /* Document-class: Node::UNTIL
@@ -5363,20 +5212,20 @@ 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);
-
-    /* Document-method: body
-     * the body of the loop
-     */
-    rb_define_method(rb_cUNTIL, "body", node_body, 0);
-    rb_ary_push(members, rb_str_new2("body"));
+    rb_define_method(rb_cUNTIL, "state", node_state, 0);
+    rb_ary_push(members, rb_str_new2("state"));
 
     /* Document-method: cond
      * a condition to terminate the loop when it becomes true
      */
     rb_define_method(rb_cUNTIL, "cond", node_cond, 0);
     rb_ary_push(members, rb_str_new2("cond"));
-    rb_define_method(rb_cUNTIL, "state", node_state, 0);
-    rb_ary_push(members, rb_str_new2("state"));
+
+    /* Document-method: body
+     * the body of the loop
+     */
+    rb_define_method(rb_cUNTIL, "body", node_body, 0);
+    rb_ary_push(members, rb_str_new2("body"));
   }
 
   /* Document-class: Node::VALIAS
@@ -5392,10 +5241,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, "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"));
+    rb_define_method(rb_cVALIAS, "first", node_1st, 0);
+    rb_ary_push(members, rb_str_new2("first"));
   }
 
   /* Document-class: Node::VCALL
@@ -5455,6 +5304,12 @@ 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
      */
@@ -5466,12 +5321,6 @@ 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
@@ -5487,20 +5336,20 @@ 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);
-
-    /* Document-method: body
-     * the body of the loop
-     */
-    rb_define_method(rb_cWHILE, "body", node_body, 0);
-    rb_ary_push(members, rb_str_new2("body"));
+    rb_define_method(rb_cWHILE, "state", node_state, 0);
+    rb_ary_push(members, rb_str_new2("state"));
 
     /* Document-method: cond
      * a condition to terminate the loop when it becomes false
      */
     rb_define_method(rb_cWHILE, "cond", node_cond, 0);
     rb_ary_push(members, rb_str_new2("cond"));
-    rb_define_method(rb_cWHILE, "state", node_state, 0);
-    rb_ary_push(members, rb_str_new2("state"));
+
+    /* Document-method: body
+     * the body of the loop
+     */
+    rb_define_method(rb_cWHILE, "body", node_body, 0);
+    rb_ary_push(members, rb_str_new2("body"));
   }
 
   /* Document-class: Node::XSTR
@@ -5537,17 +5386,17 @@ void define_node_subclass_methods()
     rb_iv_set(rb_cYIELD, "__type__", INT2NUM(NODE_YIELD));
     rb_define_singleton_method(rb_cYIELD, "members", node_s_members, 0);
 
-    /* Document-method: head
-     * the value to yield
-     */
-    rb_define_method(rb_cYIELD, "head", node_head, 0);
-    rb_ary_push(members, rb_str_new2("head"));
-
     /* Document-method: state
      * if nonzero, splats the value before yielding
      */
     rb_define_method(rb_cYIELD, "state", node_state, 0);
     rb_ary_push(members, rb_str_new2("state"));
+
+    /* Document-method: head
+     * the value to yield
+     */
+    rb_define_method(rb_cYIELD, "head", node_head, 0);
+    rb_ary_push(members, rb_str_new2("head"));
   }
 
   /* Document-class: Node::ZARRAY