rubinius-melbourne 1.2.1.0 → 2.0.0.17

data/ext/rubinius/melbourne/lex.c.blt

@@ -0,0 +1,152 @@
+/* C code produced by gperf version 3.0.4 */
+/* Command-line: gperf -C -p -j1 -i 1 -g -o -t -N rb_reserved_word -k'1,3,$' defs/keywords  */
+
+#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
+      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
+      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
+      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
+      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
+      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
+      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
+      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
+      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
+      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
+      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
+      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
+      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
+      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
+      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
+      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
+      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
+      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
+      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
+      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
+      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
+      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
+      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
+/* The character set is not based on ISO-646.  */
+error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
+#endif
+
+struct kwtable {const char *name; int id[2]; enum lex_state_e state;};
+const struct kwtable *rb_reserved_word(const char *, unsigned int);
+static const struct kwtable *reserved_word(const char *, unsigned int);
+#define rb_reserved_word(str, len) reserved_word(str, len)
+struct kwtable;
+
+#define TOTAL_KEYWORDS 41
+#define MIN_WORD_LENGTH 2
+#define MAX_WORD_LENGTH 12
+#define MIN_HASH_VALUE 8
+#define MAX_HASH_VALUE 50
+/* maximum key range = 43, duplicates = 0 */
+
+static inline unsigned int hash(register const char* str, register unsigned int len)
+{
+  static const unsigned char asso_values[] =
+    {
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 26, 51, 51, 14, 51, 16,  8,
+      11, 13, 51, 51, 51, 51, 10, 51, 13, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 11, 51, 13,  1, 26,
+       4,  1,  8, 28, 51, 23, 51,  1,  1, 27,
+       5, 19, 21, 51,  8,  3,  3, 11, 51, 21,
+      24, 16, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51
+    };
+  register int hval = len;
+
+  switch (hval)
+    {
+      default:
+        hval += asso_values[(unsigned char)str[2]];
+      /*FALLTHROUGH*/
+      case 2:
+      case 1:
+        hval += asso_values[(unsigned char)str[0]];
+        break;
+    }
+  return hval + asso_values[(unsigned char)str[len - 1]];
+}
+
+const struct kwtable* rb_reserved_word(register const char* str, register unsigned int len)
+{
+  static const struct kwtable wordlist[] =
+    {
+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+      {"break", {keyword_break, keyword_break}, EXPR_MID},
+      {"else", {keyword_else, keyword_else}, EXPR_BEG},
+      {"nil", {keyword_nil, keyword_nil}, EXPR_END},
+      {"ensure", {keyword_ensure, keyword_ensure}, EXPR_BEG},
+      {"end", {keyword_end, keyword_end}, EXPR_END},
+      {"then", {keyword_then, keyword_then}, EXPR_BEG},
+      {"not", {keyword_not, keyword_not}, EXPR_ARG},
+      {"false", {keyword_false, keyword_false}, EXPR_END},
+      {"self", {keyword_self, keyword_self}, EXPR_END},
+      {"elsif", {keyword_elsif, keyword_elsif}, EXPR_VALUE},
+      {"rescue", {keyword_rescue, modifier_rescue}, EXPR_MID},
+      {"true", {keyword_true, keyword_true}, EXPR_END},
+      {"until", {keyword_until, modifier_until}, EXPR_VALUE},
+      {"unless", {keyword_unless, modifier_unless}, EXPR_VALUE},
+      {"return", {keyword_return, keyword_return}, EXPR_MID},
+      {"def", {keyword_def, keyword_def}, EXPR_FNAME},
+      {"and", {keyword_and, keyword_and}, EXPR_VALUE},
+      {"do", {keyword_do, keyword_do}, EXPR_BEG},
+      {"yield", {keyword_yield, keyword_yield}, EXPR_ARG},
+      {"for", {keyword_for, keyword_for}, EXPR_VALUE},
+      {"undef", {keyword_undef, keyword_undef}, EXPR_FNAME},
+      {"or", {keyword_or, keyword_or}, EXPR_VALUE},
+      {"in", {keyword_in, keyword_in}, EXPR_VALUE},
+      {"when", {keyword_when, keyword_when}, EXPR_VALUE},
+      {"retry", {keyword_retry, keyword_retry}, EXPR_END},
+      {"if", {keyword_if, modifier_if}, EXPR_VALUE},
+      {"case", {keyword_case, keyword_case}, EXPR_VALUE},
+      {"redo", {keyword_redo, keyword_redo}, EXPR_END},
+      {"next", {keyword_next, keyword_next}, EXPR_MID},
+      {"super", {keyword_super, keyword_super}, EXPR_ARG},
+      {"module", {keyword_module, keyword_module}, EXPR_VALUE},
+      {"begin", {keyword_begin, keyword_begin}, EXPR_BEG},
+      {"__LINE__", {keyword__LINE__, keyword__LINE__}, EXPR_END},
+      {"__FILE__", {keyword__FILE__, keyword__FILE__}, EXPR_END},
+      {"__ENCODING__", {keyword__ENCODING__, keyword__ENCODING__}, EXPR_END},
+      {"END", {keyword_END, keyword_END}, EXPR_END},
+      {"alias", {keyword_alias, keyword_alias}, EXPR_FNAME},
+      {"BEGIN", {keyword_BEGIN, keyword_BEGIN}, EXPR_END},
+      {"defined?", {keyword_defined, keyword_defined}, EXPR_ARG},
+      {"class", {keyword_class, keyword_class}, EXPR_CLASS},
+      {""}, {""},
+      {"while", {keyword_while, modifier_while}, EXPR_VALUE}
+    };
+
+  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+    {
+      register int key = hash(str, len);
+
+      if(key <= MAX_HASH_VALUE && key >= 0)
+        {
+          register const char *s = wordlist[key].name;
+
+          if(*str == *s && !strcmp(str + 1, s + 1))
+            return &wordlist[key];
+        }
+    }
+  return 0;
+}

data/ext/rubinius/melbourne/melbourne.cpp

@@ -10,10 +10,7 @@ extern "C" {
 VALUE MELBOURNE_STRING_TO_AST(VALUE self, VALUE source, VALUE name, VALUE line) {
   StringValue(source);
   StringValue(name);
-  bstring b_str = blk2bstr(RSTRING_PTR(source), (int)RSTRING_LEN(source));
-  VALUE result = MELBOURNE::string_to_ast(self,
-      RSTRING_PTR(name), b_str, FIX2INT(line));
-  bdestroy(b_str);
+  VALUE result = MELBOURNE::string_to_ast(self, name, source, line);
 
   return result;
 }
@@ -21,28 +18,32 @@ VALUE MELBOURNE_STRING_TO_AST(VALUE self, VALUE source, VALUE name, VALUE line)
 VALUE MELBOURNE_FILE_TO_AST(VALUE self, VALUE fname, VALUE start) {
   StringValue(fname);
 
-  char* c_name = RSTRING_PTR(fname);
-
-  FILE *file = fopen(c_name, "r");
-  if(file) {
+  int fd = open(RSTRING_PTR(fname), O_RDONLY);
+  if(fd != -1) {
     VALUE result = MELBOURNE::file_to_ast(self,
-        RSTRING_PTR(fname), file, FIX2INT(start));
-    fclose(file);
+        RSTRING_PTR(fname), fd, FIX2INT(start));
+    close(fd);
 
     return result;
   } else {
-    rb_raise(rb_eLoadError, "%s -- %s", strerror(errno), c_name);
+    rb_raise(rb_eLoadError, "no such file to load -- %s", RSTRING_PTR(fname));
     return Qnil;
   }
 }
 
 void Init_melbourne(void) {
-  VALUE rb_mCodeTools, rb_cMelbourne;
+  VALUE rb_cMelbourne, rb_mToolSet, rb_mTScurrent, rb_mTS;
 
   MELBOURNE::init_symbols();
 
-  rb_mCodeTools = rb_const_get(rb_cObject, rb_intern("CodeTools"));
-  rb_cMelbourne = rb_define_class_under(rb_mCodeTools, "Melbourne", rb_cObject);
+#ifndef RUBINIUS
+  VALUE rb_mRubinius = rb_const_get(rb_cObject, rb_intern("Rubinius"));
+#endif
+
+  rb_mToolSet = rb_const_get(rb_mRubinius, rb_intern("ToolSet"));
+  rb_mTScurrent = rb_funcall(rb_mToolSet, rb_intern("current"), 0);
+  rb_mTS = rb_define_module_under(rb_mTScurrent, "TS");
+  rb_cMelbourne = rb_define_class_under(rb_mTS, "Melbourne", rb_cObject);
   rb_define_method(rb_cMelbourne, "string_to_ast",
       RUBY_METHOD_FUNC(MELBOURNE_STRING_TO_AST), 3);
   rb_define_method(rb_cMelbourne, "file_to_ast",

data/ext/rubinius/melbourne/melbourne.hpp

@@ -5,6 +5,7 @@
 #include <strings.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include <stdarg.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <unistd.h>

data/ext/rubinius/melbourne/node.hpp

@@ -14,55 +14,50 @@
 #define MEL_NODE_HPP
 
 #include "namespace.h"
-#include "bstrlib.h"
 #include "melbourne.hpp"
-#include "quark.hpp"
 
 namespace MELBOURNE {
 
-#define QUID    quark
-
   typedef struct RNode {
     unsigned long flags;
     char *nd_file;
     union {
       RNode *node;
-      QUID id;
+      ID id;
       VALUE value;
-      QUID *tbl;
-      bstring string;
+      ID *tbl;
     } u1;
     union {
       struct RNode *node;
-      QUID id;
+      ID id;
       long argc;
       VALUE value;
     } u2;
     union {
       struct RNode *node;
-      QUID id;
+      ID id;
       long state;
       long cnt;
       VALUE value;
-      bstring string;
     } u3;
   } NODE;
 
 #define RNODE(obj)  ((NODE*)(obj))
 
-#ifndef FL_USHIFT
-#define FL_USHIFT 11
-#endif
+/* 0..4:T_TYPES, 5:FL_MARK, 6:reserved, 7:NODE_FL_NEWLINE */
+#define NODE_FL_NEWLINE (((VALUE)1)<<7)
+#define NODE_FL_CREF_PUSHED_BY_EVAL NODE_FL_NEWLINE
 
-#define FL_UMASK (0xff<<FL_USHIFT)
+#define NODE_TYPESHIFT 8
+#define NODE_TYPEMASK  (((VALUE)0x7f)<<NODE_TYPESHIFT)
 
-#define nd_type(n) ((int)(((RNODE(n))->flags>>FL_USHIFT)&0xff))
+#define nd_type(n) ((int) (((RNODE(n))->flags & NODE_TYPEMASK)>>NODE_TYPESHIFT))
 #define nd_set_type(n,t) \
-    RNODE(n)->flags=((RNODE(n)->flags&~FL_UMASK)|(((t)<<FL_USHIFT)&FL_UMASK))
+    RNODE(n)->flags=((RNODE(n)->flags&~NODE_TYPEMASK)|((((unsigned long)t)<<NODE_TYPESHIFT)&NODE_TYPEMASK))
 
-#define NODE_LSHIFT (FL_USHIFT+8)
-#define NODE_LMASK  (((long)1<<(sizeof(NODE*)*CHAR_BIT-NODE_LSHIFT))-1)
-#define nd_line(n) ((unsigned int)(((RNODE(n))->flags>>NODE_LSHIFT)&NODE_LMASK))
+#define NODE_LSHIFT (NODE_TYPESHIFT+7)
+#define NODE_LMASK  (((intptr_t)1<<(sizeof(VALUE)*CHAR_BIT-NODE_LSHIFT))-1)
+#define nd_line(n) (int)(RNODE(n)->flags>>NODE_LSHIFT)
 #define nd_set_line(n,l) \
     RNODE(n)->flags=((RNODE(n)->flags&~(-1<<NODE_LSHIFT))|(((l)&NODE_LMASK)<<NODE_LSHIFT))
 
@@ -74,7 +69,7 @@ namespace MELBOURNE {
 #define nd_body  u2.node
 #define nd_else  u3.node
 
-#define nd_orig  u3.string
+#define nd_orig  u3.value
 
 #define nd_resq  u2.node
 #define nd_ensr  u3.node
@@ -89,21 +84,20 @@ namespace MELBOURNE {
 #define nd_cflag u2.id
 #define nd_cval  u3.value
 
+#define nd_oid   u1.id
 #define nd_cnt   u3.cnt
 #define nd_tbl   u1.tbl
 
 #define nd_var   u1.node
-#define nd_ibdy  u2.node
 #define nd_iter  u3.node
 
 #define nd_value u2.node
 #define nd_aid   u3.id
 
-#define nd_str   u1.string
 #define nd_lit   u1.value
 
-#define nd_frml  u1.node
-#define nd_rest  u2.argc
+#define nd_frml  u2.argc
+#define nd_rest  u1.id
 #define nd_opt   u1.node
 #define nd_pid   u1.id
 #define nd_plen  u2.argc
@@ -112,12 +106,9 @@ namespace MELBOURNE {
 #define nd_mid   u2.id
 #define nd_args  u3.node
 
-#define nd_noex  u1.id
+#define nd_noex  u3.id
 #define nd_defn  u3.node
 
-#define nd_old   u1.id
-#define nd_new   u2.id
-
 #define nd_cfnc  u1.cfunc
 #define nd_argc  u2.argc
 
@@ -137,14 +128,30 @@ namespace MELBOURNE {
 #define nd_tag   u1.id
 #define nd_tval  u2.value
 
+#define nd_visi  u2.argc
+
+#undef NEW_NODE
+#undef REF
+
 #define NEW_NODE(t,a0,a1,a2)    node_newnode((t),(VALUE)(a0),(VALUE)(a1),(VALUE)(a2))
 
-#define NEW_METHOD(n,x)         NEW_NODE(NODE_METHOD,x,n,0)
-#define NEW_FBODY(n,i,o)        NEW_NODE(NODE_FBODY,n,i,o)
-#define NEW_DEFN(i,a,d,p)       NEW_NODE(NODE_DEFN,p,i,NEW_RFUNC(a,d))
-#define NEW_DEFS(r,i,a,d)       NEW_NODE(NODE_DEFS,r,i,NEW_RFUNC(a,d))
-#define NEW_RFUNC(b1,b2)        NEW_SCOPE(block_append(vps, b1,b2))
-#define NEW_SCOPE(b)            NEW_NODE(NODE_SCOPE,mel_local_tbl(vps),0,(b))
+#ifdef RUBINIUS
+/* In Rubinius, the object references are handles and the handle
+ * in the native method frame keeps the object from being collected.
+ */
+#define REF(n)                  (n)
+#else
+/* In MRI, we are holding references to objects in memory that the
+ * MRI GC does not see. To keep these objects from being collected,
+ * we add a reference to them to an Array that MRI GC does see.
+ */
+#define REF(n)                  node_add_reference(n)
+#endif
+
+#define NEW_DEFN(i,a,d,p)       NEW_NODE(NODE_DEFN,0,i,NEW_SCOPE(a,d))
+#define NEW_DEFS(r,i,a,d)       NEW_NODE(NODE_DEFS,r,i,NEW_SCOPE(a,d))
+#define NEW_IFUNC(f,c)          NEW_NODE(NODE_IFUNC,f,c,0)
+#define NEW_SCOPE(a,b)          NEW_NODE(NODE_SCOPE,local_tbl(),b,a)
 #define NEW_BLOCK(a)            NEW_NODE(NODE_BLOCK,a,0,0)
 #define NEW_IF(c,t,e)           NEW_NODE(NODE_IF,c,t,e)
 #define NEW_UNLESS(c,t,e)       NEW_IF(c,e,t)
@@ -154,7 +161,8 @@ namespace MELBOURNE {
 #define NEW_WHILE(c,b,n)        NEW_NODE(NODE_WHILE,c,b,n)
 #define NEW_UNTIL(c,b,n)        NEW_NODE(NODE_UNTIL,c,b,n)
 #define NEW_FOR(v,i,b)          NEW_NODE(NODE_FOR,v,b,i)
-#define NEW_ITER(v,i,b)         NEW_NODE(NODE_ITER,v,b,i)
+#define NEW_ITER(a,b)           NEW_NODE(NODE_ITER,0,NEW_SCOPE(a,b),0)
+#define NEW_LAMBDA(a)           NEW_NODE(NODE_LAMBDA,a,0,0)
 #define NEW_BREAK(s)            NEW_NODE(NODE_BREAK,s,0,0)
 #define NEW_NEXT(s)             NEW_NODE(NODE_NEXT,s,0,0)
 #define NEW_REDO()              NEW_NODE(NODE_REDO,0,0,0)
@@ -169,92 +177,93 @@ namespace MELBOURNE {
 #define NEW_ARRAY(a)            NEW_NODE(NODE_ARRAY,a,1,0)
 #define NEW_ZARRAY()            NEW_NODE(NODE_ZARRAY,0,0,0)
 #define NEW_HASH(a)             NEW_NODE(NODE_HASH,a,0,0)
-#define NEW_POSITIONAL(a)       NEW_NODE(NODE_HASH,a,1,0)
-#define NEW_NOT(a)              NEW_NODE(NODE_NOT,0,a,0)
 #define NEW_MASGN(l,r)          NEW_NODE(NODE_MASGN,l,0,r)
 #define NEW_GASGN(v,val)        NEW_NODE(NODE_GASGN,v,val,0)
-#define NEW_LASGN(v,val)        NEW_NODE(NODE_LASGN,v,val,local_cnt(v))
+#define NEW_LASGN(v,val)        NEW_NODE(NODE_LASGN,v,val,0)
 #define NEW_DASGN(v,val)        NEW_NODE(NODE_DASGN,v,val,0)
 #define NEW_DASGN_CURR(v,val)   NEW_NODE(NODE_DASGN_CURR,v,val,0)
 #define NEW_IASGN(v,val)        NEW_NODE(NODE_IASGN,v,val,0)
+#define NEW_IASGN2(v,val)       NEW_NODE(NODE_IASGN2,v,val,0)
 #define NEW_CDECL(v,val,path)   NEW_NODE(NODE_CDECL,v,val,path)
 #define NEW_CVASGN(v,val)       NEW_NODE(NODE_CVASGN,v,val,0)
 #define NEW_CVDECL(v,val)       NEW_NODE(NODE_CVDECL,v,val,0)
 #define NEW_OP_ASGN1(p,id,a)    NEW_NODE(NODE_OP_ASGN1,p,id,a)
 #define NEW_OP_ASGN2(r,i,o,val) NEW_NODE(NODE_OP_ASGN2,r,val,NEW_OP_ASGN22(i,o))
-#define NEW_OP_ASGN22(i,o)      NEW_NODE(NODE_OP_ASGN2,i,o,rb_id_attrset((rb_parser_state*) parser_state, i))
+#define NEW_OP_ASGN22(i,o)      NEW_NODE(NODE_OP_ASGN2,i,o,rb_id_attrset(i))
 #define NEW_OP_ASGN_OR(i,val)   NEW_NODE(NODE_OP_ASGN_OR,i,val,0)
 #define NEW_OP_ASGN_AND(i,val)  NEW_NODE(NODE_OP_ASGN_AND,i,val,0)
 #define NEW_GVAR(v)             NEW_NODE(NODE_GVAR,v,0,0)
-#define NEW_LVAR(v)             NEW_NODE(NODE_LVAR,v,0,local_cnt(v))
+#define NEW_LVAR(v)             NEW_NODE(NODE_LVAR,v,0,0)
 #define NEW_DVAR(v)             NEW_NODE(NODE_DVAR,v,0,0)
 #define NEW_IVAR(v)             NEW_NODE(NODE_IVAR,v,0,0)
 #define NEW_CONST(v)            NEW_NODE(NODE_CONST,v,0,0)
 #define NEW_CVAR(v)             NEW_NODE(NODE_CVAR,v,0,0)
-#define NEW_NTH_REF(n)          NEW_NODE(NODE_NTH_REF,0,n,local_cnt('~'))
-#define NEW_BACK_REF(n)         NEW_NODE(NODE_BACK_REF,0,n,local_cnt('~'))
+#define NEW_NTH_REF(n)          NEW_NODE(NODE_NTH_REF,0,n,0)
+#define NEW_BACK_REF(n)         NEW_NODE(NODE_BACK_REF,0,n,0)
 #define NEW_MATCH(c)            NEW_NODE(NODE_MATCH,c,0,0)
 #define NEW_MATCH2(n1,n2)       NEW_NODE(NODE_MATCH2,n1,n2,0)
 #define NEW_MATCH3(r,n2)        NEW_NODE(NODE_MATCH3,r,n2,0)
 #define NEW_LIT(l)              NEW_NODE(NODE_LIT,l,0,0)
-#define NEW_STR(s)              NEW_NODE(NODE_STR,s,0,0)
-#define NEW_DSTR(s)             NEW_NODE(NODE_DSTR,s,1,0)
-#define NEW_XSTR(s)             NEW_NODE(NODE_XSTR,s,0,0)
-#define NEW_DXSTR(s)            NEW_NODE(NODE_DXSTR,s,0,0)
-#define NEW_DSYM(s)             NEW_NODE(NODE_DSYM,s,0,0)
+#define NEW_STR(s)              NEW_NODE(NODE_STR,REF(s),0,0)
+#define NEW_DSTR(s)             NEW_NODE(NODE_DSTR,REF(s),1,0)
+#define NEW_XSTR(s)             NEW_NODE(NODE_XSTR,REF(s),0,0)
+#define NEW_DXSTR(s)            NEW_NODE(NODE_DXSTR,REF(s),0,0)
+#define NEW_DSYM(s)             NEW_NODE(NODE_DSYM,REF(s),0,0)
 #define NEW_EVSTR(n)            NEW_NODE(NODE_EVSTR,0,(n),0)
-#define NEW_CALL(r,m,a)         NEW_NODE(NODE_CALL,r,m,a)
-#define NEW_FCALL(m,a)          NEW_NODE(NODE_FCALL,0,m,a)
-#define NEW_VCALL(m)            NEW_NODE(NODE_VCALL,0,m,0)
+#define NEW_CALL(r,m,a)         NEW_NODE(NODE_CALL,r,convert_op(m),a)
+#define NEW_FCALL(m,a)          NEW_NODE(NODE_FCALL,0,convert_op(m),a)
+#define NEW_VCALL(m)            NEW_NODE(NODE_VCALL,0,convert_op(m),0)
 #define NEW_SUPER(a)            NEW_NODE(NODE_SUPER,0,0,a)
 #define NEW_ZSUPER()            NEW_NODE(NODE_ZSUPER,0,0,0)
-#define NEW_ARGS(f,o,r)         NEW_NODE(NODE_ARGS,o,r,f)
+#define NEW_ARGS(m,o)           NEW_NODE(NODE_ARGS,o,m,0)
+#define NEW_ARGS_AUX(r,b)       NEW_NODE(NODE_ARGS_AUX,r,b,0)
+#define NEW_OPT_ARG(i,v)        NEW_NODE(NODE_OPT_ARG,i,v,0)
+#define NEW_POSTARG(i,v)        NEW_NODE(NODE_POSTARG,i,v,0)
 #define NEW_ARGSCAT(a,b)        NEW_NODE(NODE_ARGSCAT,a,b,0)
 #define NEW_ARGSPUSH(a,b)       NEW_NODE(NODE_ARGSPUSH,a,b,0)
 #define NEW_SPLAT(a)            NEW_NODE(NODE_SPLAT,a,0,0)
 #define NEW_TO_ARY(a)           NEW_NODE(NODE_TO_ARY,a,0,0)
-#define NEW_SVALUE(a)           NEW_NODE(NODE_SVALUE,a,0,0)
 #define NEW_BLOCK_ARG(v)        NEW_NODE(NODE_BLOCK_ARG,v,0,local_cnt(v))
 #define NEW_BLOCK_PASS(b)       NEW_NODE(NODE_BLOCK_PASS,0,b,0)
-#define NEW_ALIAS(n,o)          NEW_NODE(NODE_ALIAS,o,n,0)
-#define NEW_VALIAS(n,o)         NEW_NODE(NODE_VALIAS,o,n,0)
+#define NEW_ALIAS(n,o)          NEW_NODE(NODE_ALIAS,n,o,0)
+#define NEW_VALIAS(n,o)         NEW_NODE(NODE_VALIAS,n,o,0)
 #define NEW_UNDEF(i)            NEW_NODE(NODE_UNDEF,0,i,0)
-#define NEW_CLASS(n,b,s)        NEW_NODE(NODE_CLASS,n,NEW_SCOPE(b),(s))
-#define NEW_SCLASS(r,b)         NEW_NODE(NODE_SCLASS,r,NEW_SCOPE(b),0)
-#define NEW_MODULE(n,b)         NEW_NODE(NODE_MODULE,n,NEW_SCOPE(b),0)
+#define NEW_CLASS(n,b,s)        NEW_NODE(NODE_CLASS,n,NEW_SCOPE(0,b),(s))
+#define NEW_SCLASS(r,b)         NEW_NODE(NODE_SCLASS,r,NEW_SCOPE(0,b),0)
+#define NEW_MODULE(n,b)         NEW_NODE(NODE_MODULE,n,NEW_SCOPE(0,b),0)
 #define NEW_COLON2(c,i)         NEW_NODE(NODE_COLON2,c,i,0)
 #define NEW_COLON3(i)           NEW_NODE(NODE_COLON3,0,i,0)
-#define NEW_CREF(c)             (NEW_NODE(NODE_CREF,0,0,c))
 #define NEW_DOT2(b,e)           NEW_NODE(NODE_DOT2,b,e,0)
 #define NEW_DOT3(b,e)           NEW_NODE(NODE_DOT3,b,e,0)
-#define NEW_ATTRSET(a)          NEW_NODE(NODE_ATTRSET,a,0,0)
 #define NEW_SELF()              NEW_NODE(NODE_SELF,0,0,0)
 #define NEW_NIL()               NEW_NODE(NODE_NIL,0,0,0)
 #define NEW_TRUE()              NEW_NODE(NODE_TRUE,0,0,0)
 #define NEW_FALSE()             NEW_NODE(NODE_FALSE,0,0,0)
+#define NEW_ERRINFO()           NEW_NODE(NODE_ERRINFO,0,0,0)
 #define NEW_DEFINED(e)          NEW_NODE(NODE_DEFINED,e,0,0)
-#define NEW_NEWLINE(n)          NEW_NODE(NODE_NEWLINE,0,0,n)
-#define NEW_PREEXE(b)           NEW_NODE(NODE_PREEXE,0,0,0)
-#define NEW_POSTEXE()           NEW_NODE(NODE_POSTEXE,0,0,0)
-#define NEW_DMETHOD(b)          NEW_NODE(NODE_DMETHOD,0,0,b)
+#define NEW_PREEXE(b)           NEW_NODE(NODE_PREEXE,0,b,0)
+#define NEW_POSTEXE(b)          NEW_NODE(NODE_POSTEXE,0,b,0)
 #define NEW_BMETHOD(b)          NEW_NODE(NODE_BMETHOD,0,0,b)
 #define NEW_ATTRASGN(r,m,a)     NEW_NODE(NODE_ATTRASGN,r,m,a)
-#define NEW_FIXNUM(l)           NEW_NODE(NODE_FIXNUM,0,0,l)
-#define NEW_NUMBER(l)           NEW_NODE(NODE_NUMBER,l,0,0)
-#define NEW_HEXNUM(l)           NEW_NODE(NODE_HEXNUM,l,0,0)
-#define NEW_OCTNUM(l)           NEW_NODE(NODE_OCTNUM,l,0,0)
-#define NEW_BINNUM(l)           NEW_NODE(NODE_BINNUM,l,0,0)
-#define NEW_FLOAT(l)            NEW_NODE(NODE_FLOAT,l,0,0)
-#define NEW_NEGATE(l)           NEW_NODE(NODE_NEGATE,l,0,0)
-#define NEW_REGEX(l,o)          NEW_NODE(NODE_REGEX,l,0,o)
+#define NEW_PRELUDE(p,b)        NEW_NODE(NODE_PRELUDE,p,b,0)
+#define NEW_OPTBLOCK(a)         NEW_NODE(NODE_OPTBLOCK,a,0,0)
+#define NEW_REGEX(l,o)          NEW_NODE(NODE_REGEX,REF(l),0,o)
 #define NEW_FILE()              NEW_NODE(NODE_FILE,0,0,0)
-#define NOEX_PUBLIC             0
-#define NOEX_NOSUPER            1
-#define NOEX_PRIVATE            2
-#define NOEX_PROTECTED          4
-#define NOEX_MASK               6
-
-#define NOEX_UNDEF              NOEX_NOSUPER
+#define NEW_NUMBER(l)           NEW_NODE(NODE_NUMBER,REF(l),0,0)
+#define NEW_FLOAT(l)            NEW_NODE(NODE_FLOAT,REF(l),0,0)
+#define NEW_ENCODING(n)         NEW_NODE(NODE_ENCODING,REF(n),0,0)
+
+#define NOEX_PUBLIC             0x00,
+#define NOEX_NOSUPER            0x01,
+#define NOEX_PRIVATE            0x02,
+#define NOEX_PROTECTED          0x04,
+#define NOEX_MASK               0x06,
+#define NOEX_BASIC              0x08,
+#define NOEX_UNDEF              NOEX_NOSUPER,
+#define NOEX_MODFUNC            0x12,
+#define NOEX_SUPER              0x20,
+#define NOEX_VCALL              0x40,
+#define NOEX_RESPONDS           0x80
 
 };