rubinius-melbourne 3.10 → 3.11

data/ext/rubinius/code/melbourne/grammar.y

@@ -390,6 +390,10 @@ static int scan_hex(const char *start, size_t len, size_t *retlen);
 #define RE_OPTION_MULTILINE          (4)
 #endif
 
+#ifndef RE_OPTION_PEG
+#define RE_OPTION_PEG                (8)
+#endif
+
 /* Must match up with options/kcode definitions in regexp.rb and regexp.cpp */
 #define RE_OPTION_DONT_CAPTURE_GROUP (128)
 #define RE_OPTION_CAPTURE_GROUP      (256)
@@ -451,9 +455,7 @@ static int scan_hex(const char *start, size_t len, size_t *retlen);
   keyword_class
   keyword_module
   keyword_def
-  keyword_defm
   keyword_fun
-  keyword_funm
   keyword_undef
   keyword_begin
   keyword_rescue
@@ -1253,8 +1255,7 @@ op              : '|'           { $$ = '|'; }
 reswords        : keyword__LINE__ | keyword__FILE__ | keyword__ENCODING__
                 | keyword_BEGIN | keyword_END
                 | keyword_alias | keyword_and | keyword_begin
-                | keyword_break | keyword_case | keyword_class | keyword_def
-                | keyword_defm | keyword_fun | keyword_funm
+                | keyword_break | keyword_case | keyword_class | keyword_def | keyword_fun
                 | keyword_defined | keyword_do | keyword_else | keyword_elsif
                 | keyword_end | keyword_ensure | keyword_false
                 | keyword_for | keyword_in | keyword_module | keyword_next
@@ -1891,27 +1892,6 @@ primary         : literal
                     in_def = $<num>4 & 1;
                     cur_mid = $<id>3;
                   }
-                | k_defm fname
-                  {
-                    $<id>$ = cur_mid;
-                    cur_mid = $2;
-                    local_push(0);
-                  }
-                  {
-                    $<num>$ = in_def;
-                    in_def = 1;
-                  }
-                  f_arglist
-                  bodystmt
-                  k_end
-                  {
-                    NODE* body = remove_begin($6);
-                    $$ = NEW_DEFNM($2, $5, body, NOEX_PRIVATE);
-                    nd_set_line($$, $<num>1);
-                    local_pop();
-                    in_def = $<num>4 & 1;
-                    cur_mid = $<id>3;
-                  }
                 | k_fun fname
                   {
                     $<id>$ = cur_mid;
@@ -1933,27 +1913,6 @@ primary         : literal
                     in_def = $<num>4 & 1;
                     cur_mid = $<id>3;
                   }
-                | k_funm fname
-                  {
-                    $<id>$ = cur_mid;
-                    cur_mid = $2;
-                    local_push(0);
-                  }
-                  {
-                    $<num>$ = in_def;
-                    in_def = 1;
-                  }
-                  f_arglist
-                  bodystmt
-                  k_end
-                  {
-                    NODE* body = remove_begin($6);
-                    $$ = NEW_FUNM($2, $5, body, NOEX_PRIVATE);
-                    nd_set_line($$, $<num>1);
-                    local_pop();
-                    in_def = $<num>4 & 1;
-                    cur_mid = $<id>3;
-                  }
                 | k_def singleton dot_or_colon {SET_LEX_STATE(EXPR_FNAME);} fname
                   {
                     $<num>4 = in_single;
@@ -1971,23 +1930,6 @@ primary         : literal
                     local_pop();
                     in_single = $<num>4 & 1;
                   }
-                | k_defm singleton dot_or_colon {SET_LEX_STATE(EXPR_FNAME);} fname
-                  {
-                    $<num>4 = in_single;
-                    in_single = 1;
-                    SET_LEX_STATE(EXPR_ENDFN | EXPR_LABEL); /* force for args */
-                    local_push(0);
-                  }
-                  f_arglist
-                  bodystmt
-                  k_end
-                  {
-                    NODE* body = remove_begin($8);
-                    $$ = NEW_DEFSM($2, $5, $7, body);
-                    nd_set_line($$, $<num>1);
-                    local_pop();
-                    in_single = $<num>4 & 1;
-                  }
                 | keyword_break
                   {
                     $$ = NEW_BREAK(0);
@@ -2075,13 +2017,6 @@ k_def           : keyword_def
                   }
                 ;
 
-k_defm          : keyword_defm
-                  {
-                    token_info_push("defm");
-                    $<num>$ = sourceline;
-                  }
-                ;
-
 k_fun           : keyword_fun
                   {
                     token_info_push("fun");
@@ -2089,13 +2024,6 @@ k_fun           : keyword_fun
                   }
                 ;
 
-k_funm          : keyword_funm
-                  {
-                    token_info_push("funm");
-                    $<num>$ = sourceline;
-                  }
-                ;
-
 k_end           : keyword_end
                   {
                     token_info_pop("end");
@@ -4141,6 +4069,9 @@ static int parser_regx_options(rb_parser_state* parser_state) {
       case 'o':
         options |= RE_OPTION_ONCE;
         break;
+      case 'p':
+        options |= RE_OPTION_PEG;
+        break;
       case 'G':
         options |= RE_OPTION_CAPTURE_GROUP;
         break;

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

@@ -34,43 +34,43 @@ 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 44
+#define TOTAL_KEYWORDS 42
 #define MIN_WORD_LENGTH 2
 #define MAX_WORD_LENGTH 12
-#define MIN_HASH_VALUE 7
-#define MAX_HASH_VALUE 50
-/* maximum key range = 44, duplicates = 0 */
+#define MIN_HASH_VALUE 4
+#define MAX_HASH_VALUE 46
+/* maximum key range = 43, duplicates = 0 */
 
 static inline unsigned int hash(const char* str, 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, 30, 51, 51, 15, 51, 18, 10,
-      12, 14, 51, 51, 51, 51, 11, 51, 14, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 12, 51,  6,  4, 35,
-      11,  1,  1, 29, 51, 27, 51,  3,  4, 20,
-       4, 10, 16, 51, 12,  1,  5,  8, 51, 12,
-      19, 18, 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
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 19, 47, 47, 14, 47, 16,  9,
+      11, 13, 47, 47, 47, 47, 10, 47, 13, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 11, 47,  9, 16, 19,
+      15,  1,  4, 17, 47,  1, 47, 16,  1, 14,
+       1,  1, 21, 47,  5,  4,  9,  9, 47, 24,
+      18,  8, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47
     };
   int hval = len;
 
@@ -91,60 +91,59 @@ const struct kwtable* rb_reserved_word(const char* str, unsigned int len)
 {
   static const struct kwtable wordlist[] =
     {
-      {""}, {""}, {""}, {""}, {""}, {""}, {""},
+      {""}, {""}, {""}, {""},
+      {"in", {keyword_in, keyword_in}, EXPR_VALUE},
+      {""},
+      {"nil", {keyword_nil, keyword_nil}, EXPR_END},
+      {"if", {keyword_if, modifier_if}, EXPR_VALUE},
+      {"or", {keyword_or, keyword_or}, EXPR_VALUE},
+      {"fun", {keyword_fun, keyword_fun}, EXPR_FNAME},
       {"else", {keyword_else, keyword_else}, EXPR_BEG},
-      {"elsif", {keyword_elsif, keyword_elsif}, EXPR_VALUE},
+      {"false", {keyword_false, keyword_false}, EXPR_END},
       {"ensure", {keyword_ensure, keyword_ensure}, EXPR_BEG},
       {"self", {keyword_self, keyword_self}, EXPR_END},
-      {"false", {keyword_false, keyword_false}, EXPR_END},
-      {"fun", {keyword_fun, keyword_fun}, EXPR_FNAME},
-      {"break", {keyword_break, keyword_break}, EXPR_MID},
+      {"elsif", {keyword_elsif, keyword_elsif}, EXPR_VALUE},
       {"then", {keyword_then, keyword_then}, EXPR_BEG},
-      {"nil", {keyword_nil, keyword_nil}, EXPR_END},
-      {"def", {keyword_def, keyword_def}, EXPR_FNAME},
+      {"rescue", {keyword_rescue, modifier_rescue}, EXPR_MID},
+      {"for", {keyword_for, keyword_for}, EXPR_VALUE},
+      {"do", {keyword_do, keyword_do}, EXPR_BEG},
+      {"alias", {keyword_alias, keyword_alias}, EXPR_FNAME},
+      {"unless", {keyword_unless, modifier_unless}, EXPR_VALUE},
+      {"return", {keyword_return, keyword_return}, EXPR_MID},
       {"not", {keyword_not, keyword_not}, EXPR_ARG},
       {"true", {keyword_true, keyword_true}, EXPR_END},
-      {"unless", {keyword_unless, modifier_unless}, EXPR_VALUE},
-      {"rescue", {keyword_rescue, modifier_rescue}, EXPR_MID},
-      {"when", {keyword_when, keyword_when}, EXPR_VALUE},
       {"until", {keyword_until, modifier_until}, EXPR_VALUE},
-      {"do", {keyword_do, keyword_do}, EXPR_BEG},
-      {"or", {keyword_or, keyword_or}, EXPR_VALUE},
+      {"redo", {keyword_redo, keyword_redo}, EXPR_END},
+      {"def", {keyword_def, keyword_def}, EXPR_FNAME},
+      {"retry", {keyword_retry, keyword_retry}, EXPR_END},
+      {"case", {keyword_case, keyword_case}, EXPR_VALUE},
+      {"yield", {keyword_yield, keyword_yield}, EXPR_ARG},
+      {"when", {keyword_when, keyword_when}, EXPR_VALUE},
+      {"while", {keyword_while, modifier_while}, EXPR_VALUE},
+      {"next", {keyword_next, keyword_next}, EXPR_MID},
       {"undef", {keyword_undef, keyword_undef}, EXPR_FNAME},
       {"end", {keyword_end, keyword_end}, EXPR_END},
-      {"return", {keyword_return, keyword_return}, EXPR_MID},
-      {"for", {keyword_for, keyword_for}, EXPR_VALUE},
-      {"funm", {keyword_funm, keyword_funm}, EXPR_FNAME},
-      {"if", {keyword_if, modifier_if}, EXPR_VALUE},
-      {"and", {keyword_and, keyword_and}, EXPR_VALUE},
-      {"next", {keyword_next, keyword_next}, EXPR_MID},
-      {"in", {keyword_in, keyword_in}, EXPR_VALUE},
       {"super", {keyword_super, keyword_super}, EXPR_ARG},
-      {"yield", {keyword_yield, keyword_yield}, EXPR_ARG},
-      {"defm", {keyword_defm, keyword_defm}, EXPR_FNAME},
-      {"redo", {keyword_redo, keyword_redo}, EXPR_END},
       {"module", {keyword_module, keyword_module}, EXPR_VALUE},
-      {"alias", {keyword_alias, keyword_alias}, EXPR_FNAME},
-      {"retry", {keyword_retry, keyword_retry}, EXPR_END},
-      {"case", {keyword_case, keyword_case}, EXPR_VALUE},
+      {"class", {keyword_class, keyword_class}, EXPR_CLASS},
+      {"break", {keyword_break, keyword_break}, EXPR_MID},
       {"begin", {keyword_begin, keyword_begin}, EXPR_BEG},
       {"__LINE__", {keyword__LINE__, keyword__LINE__}, EXPR_END},
       {"__FILE__", {keyword__FILE__, keyword__FILE__}, EXPR_END},
-      {"while", {keyword_while, modifier_while}, EXPR_VALUE},
+      {"and", {keyword_and, keyword_and}, EXPR_VALUE},
       {"__ENCODING__", {keyword__ENCODING__, keyword__ENCODING__}, EXPR_END},
-      {"class", {keyword_class, keyword_class}, EXPR_CLASS},
-      {"BEGIN", {keyword_BEGIN, keyword_BEGIN}, EXPR_END},
       {"END", {keyword_END, keyword_END}, EXPR_END},
+      {"BEGIN", {keyword_BEGIN, keyword_BEGIN}, EXPR_END},
       {"defined?", {keyword_defined, keyword_defined}, EXPR_ARG}
     };
 
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) {
+  if(len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) {
     int key = hash(str, len);
 
     if(key <= MAX_HASH_VALUE && key >= 0) {
       const char *s = wordlist[key].name;
 
-      if(*str == *s && !strcmp (str + 1, s + 1))
+      if (*str == *s && !strcmp (str + 1, s + 1))
         return &wordlist[key];
     }
   }

data/ext/rubinius/code/melbourne/node.hpp

@@ -170,10 +170,7 @@ namespace MELBOURNE {
 
 #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_DEFNM(i,a,d,p)      NEW_NODE(NODE_DEFNM,0,i,NEW_SCOPE(a,d))
-#define NEW_DEFSM(r,i,a,d)      NEW_NODE(NODE_DEFSM,r,i,NEW_SCOPE(a,d))
 #define NEW_FUN(i,a,d,p)        NEW_NODE(NODE_FUN,0,i,NEW_SCOPE(a,d))
-#define NEW_FUNM(i,a,d,p)       NEW_NODE(NODE_FUNM,0,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)

data/ext/rubinius/code/melbourne/node_types.cpp

@@ -86,10 +86,7 @@ namespace MELBOURNE {
     "block_pass\0"
     "defn\0"
     "defs\0"
-    "defnm\0"
-    "defsm\0"
     "fun\0"
-    "funm\0"
     "alias\0"
     "valias\0"
     "undef\0"
@@ -211,52 +208,49 @@ namespace MELBOURNE {
     504,
     509,
     514,
-    520,
-    526,
-    530,
-    535,
-    541,
-    548,
-    554,
-    560,
-    567,
-    574,
+    518,
+    524,
+    531,
+    537,
+    543,
+    550,
+    557,
+    564,
+    571,
+    576,
     581,
-    588,
+    587,
     593,
     598,
-    604,
-    610,
-    615,
-    619,
-    624,
-    630,
-    638,
-    646,
-    654,
-    661,
-    669,
-    674,
+    602,
+    607,
+    613,
+    621,
+    629,
+    637,
+    644,
+    652,
+    657,
+    663,
+    668,
     680,
-    685,
+    689,
     697,
-    706,
-    714,
-    721,
-    730,
-    735,
-    740,
-    746,
-    753,
-    759,
-    768,
-    775,
-    784,
-    794
+    704,
+    713,
+    718,
+    723,
+    729,
+    736,
+    742,
+    751,
+    758,
+    767,
+    777
   };
 
   const char *get_node_type_string(enum node_type node) {
-    if(node < 121) {
+    if(node < 118) {
       return node_types + node_types_offsets[node];
     } else {
 #define NODE_STRING_MESSAGE_LEN 20

data/ext/rubinius/code/melbourne/node_types.hpp

@@ -83,10 +83,7 @@ namespace MELBOURNE {
     NODE_BLOCK_PASS,
     NODE_DEFN,
     NODE_DEFS,
-    NODE_DEFNM,
-    NODE_DEFSM,
     NODE_FUN,
-    NODE_FUNM,
     NODE_ALIAS,
     NODE_VALIAS,
     NODE_UNDEF,

data/ext/rubinius/code/melbourne/node_types.rb

@@ -78,10 +78,7 @@ node_types = %w[
   block_pass
   defn
   defs
-  defnm
-  defsm
   fun
-  funm
   alias
   valias
   undef

data/ext/rubinius/code/melbourne/symbols.cpp

@@ -34,9 +34,7 @@ namespace MELBOURNE {
   ID rb_sData;
   ID rb_sDefined;
   ID rb_sDefn;
-  ID rb_sDefnm;
   ID rb_sDefs;
-  ID rb_sDefsm;
   ID rb_sDot2;
   ID rb_sDot3;
   ID rb_sDRegx;
@@ -56,7 +54,6 @@ namespace MELBOURNE {
   ID rb_sFloat;
   ID rb_sFor;
   ID rb_sFun;
-  ID rb_sFunm;
   ID rb_sGAsgn;
   ID rb_sGVar;
   ID rb_sHash;
@@ -156,9 +153,7 @@ namespace MELBOURNE {
     rb_sData        = rb_intern("process_data");
     rb_sDefined     = rb_intern("process_defined");
     rb_sDefn        = rb_intern("process_defn");
-    rb_sDefnm       = rb_intern("process_defnm");
     rb_sDefs        = rb_intern("process_defs");
-    rb_sDefsm       = rb_intern("process_defsm");
     rb_sDot2        = rb_intern("process_dot2");
     rb_sDot3        = rb_intern("process_dot3");
     rb_sDRegx       = rb_intern("process_dregx");
@@ -178,7 +173,6 @@ namespace MELBOURNE {
     rb_sFloat       = rb_intern("process_float");
     rb_sFor         = rb_intern("process_for");
     rb_sFun         = rb_intern("process_fun");
-    rb_sFunm        = rb_intern("process_funm");
     rb_sGAsgn       = rb_intern("process_gasgn");
     rb_sGVar        = rb_intern("process_gvar");
     rb_sHash        = rb_intern("process_hash");