rubinius-melbourne 3.6 → 3.7

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

@@ -17,4 +17,12 @@
 
 #define RSTRING_NOT_MODIFIED 1
 
+#ifndef native_int
+  typedef intptr_t native_int;
+#endif
+
+#ifndef native_uint
+  typedef uintptr_t native_uint;
+#endif
+
 #include "ruby.h"

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

@@ -208,8 +208,8 @@ namespace MELBOURNE {
 #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(i))
+#define NEW_OP_ASGN2(r,t,i,o,val) NEW_NODE(NODE_OP_ASGN2,r,val,NEW_OP_ASGN22(i,o,t))
+#define NEW_OP_ASGN22(i,o,t)      NEW_NODE(NODE_OP_ASGN2,i,o,t)
 #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_OP_CDECL(v,op,val)  NEW_NODE(NODE_OP_CDECL,v,val,op)
@@ -232,6 +232,9 @@ namespace MELBOURNE {
 #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,convert_op(m),a)
+#define CALL_Q_P(q)             ((q) == tANDDOT)
+#define NODE_CALL_Q(q)          (CALL_Q_P(q) ? NODE_QCALL : NODE_CALL)
+#define NEW_QCALL(q,r,m,a)      NEW_NODE(NODE_CALL_Q(q),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)
@@ -266,6 +269,7 @@ namespace MELBOURNE {
 #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_ANDATTRASGN(r,m,a)  NEW_NODE(NODE_ANDATTRASGN,r,m,a)
 #define NEW_ATTRASGN(r,m,a)     NEW_NODE(NODE_ATTRASGN,r,m,a)
 #define NEW_PRELUDE(p,b)        NEW_NODE(NODE_PRELUDE,p,b,0)
 #define NEW_OPTBLOCK(a)         NEW_NODE(NODE_OPTBLOCK,a,0,0)

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

@@ -45,6 +45,7 @@ namespace MELBOURNE {
     "call\0"
     "fcall\0"
     "vcall\0"
+    "qcall\0"
     "super\0"
     "zsuper\0"
     "array\0"
@@ -109,6 +110,7 @@ namespace MELBOURNE {
     "memo\0"
     "ifunc\0"
     "dsym\0"
+    "andattrasgn\0"
     "attrasgn\0"
     "prelude\0"
     "lambda\0"
@@ -165,86 +167,88 @@ namespace MELBOURNE {
     238,
     244,
     250,
-    257,
+    256,
     263,
-    270,
-    277,
-    282,
-    289,
+    269,
+    276,
+    283,
+    288,
     295,
-    300,
-    305,
-    310,
-    315,
+    301,
+    306,
+    311,
+    316,
     321,
-    326,
-    334,
-    343,
+    327,
+    332,
+    340,
     349,
-    356,
-    363,
-    367,
-    371,
-    376,
-    381,
+    355,
+    362,
+    369,
+    373,
+    377,
+    382,
     387,
     393,
     399,
-    410,
-    415,
-    424,
-    432,
-    439,
-    447,
-    455,
-    464,
+    405,
+    416,
+    421,
+    430,
+    438,
+    445,
+    453,
+    461,
     470,
-    477,
-    487,
-    498,
-    503,
-    508,
+    476,
+    483,
+    493,
+    504,
+    509,
     514,
-    521,
+    520,
     527,
     533,
-    540,
-    547,
-    554,
-    561,
-    566,
-    571,
+    539,
+    546,
+    553,
+    560,
+    567,
+    572,
     577,
     583,
-    588,
-    592,
-    597,
+    589,
+    594,
+    598,
     603,
-    611,
-    619,
-    627,
-    634,
-    642,
-    647,
+    609,
+    617,
+    625,
+    633,
+    640,
+    648,
     653,
-    658,
-    667,
-    675,
-    682,
-    691,
-    696,
-    701,
-    707,
+    659,
+    664,
+    676,
+    685,
+    693,
+    700,
+    709,
     714,
-    720,
-    729,
-    736,
-    745,
-    755
+    719,
+    725,
+    732,
+    738,
+    747,
+    754,
+    763,
+    773
   };
 
   const char *get_node_type_string(enum node_type node) {
-    if(node < 115) {
+    if(node < 117) {
       return node_types + node_types_offsets[node];
     } else {
 #define NODE_STRING_MESSAGE_LEN 20

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

@@ -42,6 +42,7 @@ namespace MELBOURNE {
     NODE_CALL,
     NODE_FCALL,
     NODE_VCALL,
+    NODE_QCALL,
     NODE_SUPER,
     NODE_ZSUPER,
     NODE_ARRAY,
@@ -106,6 +107,7 @@ namespace MELBOURNE {
     NODE_MEMO,
     NODE_IFUNC,
     NODE_DSYM,
+    NODE_ANDATTRASGN,
     NODE_ATTRASGN,
     NODE_PRELUDE,
     NODE_LAMBDA,

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

@@ -37,6 +37,7 @@ node_types = %w[
   call
   fcall
   vcall
+  qcall
   super
   zsuper
   array
@@ -101,6 +102,7 @@ node_types = %w[
   memo
   ifunc
   dsym
+  andattrasgn
   attrasgn
   prelude
   lambda

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

@@ -23,7 +23,9 @@ namespace MELBOURNE {
     EXPR_FNAME_BIT,     /* ignore newline, no reserved words. */
     EXPR_DOT_BIT,       /* right after `.' or `::', no reserved words. */
     EXPR_CLASS_BIT,     /* immediate after `class', no here document. */
-    EXPR_VALUE_BIT,     /* like EXPR_BEG but label is disallowed. */
+    EXPR_LABEL_BIT,     /* flag bit, label is allowed. */
+    EXPR_LABELED_BIT,   /* flag bit, just after a label. */
+    EXPR_FITEM_BIT,     /* symbol literal as FNAME. */
     EXPR_MAX_STATE
   };
 
@@ -39,14 +41,19 @@ namespace MELBOURNE {
     EXPR(FNAME),
     EXPR(DOT),
     EXPR(CLASS),
-    EXPR(VALUE),
-    EXPR_BEG_ANY  = (EXPR_BEG | EXPR_VALUE | EXPR_MID | EXPR_CLASS),
+    EXPR(LABEL),
+    EXPR(LABELED),
+    EXPR(FITEM),
+    EXPR_VALUE    = EXPR_BEG,
+    EXPR_BEG_ANY  = (EXPR_BEG | EXPR_MID | EXPR_CLASS),
     EXPR_ARG_ANY  = (EXPR_ARG | EXPR_CMDARG),
     EXPR_END_ANY  = (EXPR_END | EXPR_ENDARG | EXPR_ENDFN)
   };
 
-#define lex_state_of_p(x, s)  ((x) & (s))
-#define lex_state_p(s)        lex_state_of_p(lex_state, s)
+#define lex_state_of_all_p(x, s)  (((x) & (s)) == (s))
+#define lex_state_of_p(x, s)      ((x) & (s))
+#define lex_state_p(s)            lex_state_of_p(lex_state, s)
+#define lex_state_all_p(s)        lex_state_of_all_p(lex_state, s)
 
 typedef VALUE stack_type;
 
@@ -63,18 +70,22 @@ typedef VALUE stack_type;
   typedef struct rb_parser_state {
     int ruby__end__seen;
     int debug_lines;
-    int heredoc_end;
     int command_start;
     NODE *lex_strterm;
     int paren_nest;
     int lpar_beg;
     int class_nest;
     int in_single;
+    int in_kwarg;
     int in_def;
     int brace_nest;
     int compile_for_eval;
     ID cur_mid;
+    int heredoc_end;
+    int heredoc_indent;
+    int heredoc_line_indent;
     char *token_buffer;
+    int token_seen;
     int tokidx;
     int toksiz;
     int tokline;
@@ -147,6 +158,8 @@ typedef VALUE stack_type;
     char *sourcefile;
     int sourceline;
 
+    ID current_arg;
+
     rb_encoding *enc;
     rb_encoding *utf8;
   } rb_parser_state;
@@ -165,11 +178,16 @@ typedef VALUE stack_type;
 #define lpar_beg            PARSER_VAR(lpar_beg)
 #define class_nest          PARSER_VAR(class_nest)
 #define in_single           PARSER_VAR(in_single)
+#define in_kwarg            PARSER_VAR(in_kwarg)
 #define in_def              PARSER_VAR(in_def)
 #define brace_nest          PARSER_VAR(brace_nest)
 #define compile_for_eval    PARSER_VAR(compile_for_eval)
 #define cur_mid             PARSER_VAR(cur_mid)
+#define heredoc_end         PARSER_VAR(heredoc_end)
+#define heredoc_indent      PARSER_VAR(heredoc_indent)
+#define heredoc_line_indent PARSER_VAR(heredoc_line_indent)
 #define tokenbuf            PARSER_VAR(token_buffer)
+#define token_seen          PARSER_VAR(token_seen)
 #define tokidx              PARSER_VAR(tokidx)
 #define toksiz              PARSER_VAR(toksiz)
 #define tokline             PARSER_VAR(tokline)
@@ -214,6 +232,7 @@ typedef VALUE stack_type;
 #define start_lines         PARSER_VAR(start_lines)
 #define sourcefile          PARSER_VAR(sourcefile)
 #define sourceline          PARSER_VAR(sourceline)
+#define current_arg         PARSER_VAR(current_arg)
 
 #define node_newnode(t, a, b, c)  \
   parser_node_newnode((rb_parser_state*)parser_state, t, a, b, c)

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

@@ -9,6 +9,7 @@ extern "C" {
 namespace MELBOURNE {
   ID rb_sAlias;
   ID rb_sAnd;
+  ID rb_sAndAttrAsgn;
   ID rb_sArgs;
   ID rb_sArgsCat;
   ID rb_sArgsPush;
@@ -86,6 +87,7 @@ namespace MELBOURNE {
   ID rb_sPostExe;
   ID rb_sPostArg;
   ID rb_sPreExe;
+  ID rb_sQCall;
   ID rb_sRational;
   ID rb_sRedo;
   ID rb_sRegex;
@@ -125,6 +127,7 @@ namespace MELBOURNE {
   void init_symbols() {
     rb_sAlias       = rb_intern("process_alias");
     rb_sAnd         = rb_intern("process_and");
+    rb_sAndAttrAsgn = rb_intern("process_andattrasgn");
     rb_sArgs        = rb_intern("process_args");
     rb_sArgsCat     = rb_intern("process_argscat");
     rb_sArgsPush    = rb_intern("process_argspush");
@@ -202,6 +205,7 @@ namespace MELBOURNE {
     rb_sPostExe     = rb_intern("process_postexe");
     rb_sPostArg     = rb_intern("process_postarg");
     rb_sPreExe      = rb_intern("process_preexe");
+    rb_sQCall       = rb_intern("process_qcall");
     rb_sRational    = rb_intern("process_rational");
     rb_sRedo        = rb_intern("process_redo");
     rb_sRegex       = rb_intern("process_regex");

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

@@ -8,6 +8,7 @@ extern "C" {
 namespace MELBOURNE {
   extern ID rb_sAlias;
   extern ID rb_sAnd;
+  extern ID rb_sAndAttrAsgn;
   extern ID rb_sArgs;
   extern ID rb_sArgsCat;
   extern ID rb_sArgsPush;
@@ -85,6 +86,7 @@ namespace MELBOURNE {
   extern ID rb_sPostExe;
   extern ID rb_sPostArg;
   extern ID rb_sPreExe;
+  extern ID rb_sQCall;
   extern ID rb_sRational;
   extern ID rb_sRedo;
   extern ID rb_sRegex;

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

@@ -416,6 +416,16 @@ namespace MELBOURNE {
       tree = rb_funcall(ptp, rb_sCall, 4, line, recv, ID2SYM(node->nd_mid), args);
       break;
     }
+    case NODE_QCALL: {
+      VALUE args = Qnil;
+
+      VALUE recv = process_parse_tree(parser_state, ptp, node->nd_recv, locals);
+      if (node->nd_args) {
+        args = process_parse_tree(parser_state, ptp, node->nd_args, locals);
+      }
+      tree = rb_funcall(ptp, rb_sQCall, 4, line, recv, ID2SYM(node->nd_mid), args);
+      break;
+    }
     case NODE_FCALL: {
       VALUE args = Qnil;
 
@@ -484,8 +494,9 @@ namespace MELBOURNE {
           op = ID2SYM(node->nd_next->nd_mid);
       }
       VALUE value = process_parse_tree(parser_state, ptp, node->nd_value, locals);
-      tree = rb_funcall(ptp, rb_sOpAsgn2, 5, line,
-          recv, ID2SYM(node->nd_next->nd_aid), op, value);
+      tree = rb_funcall(ptp, rb_sOpAsgn2, 6, line,
+          recv, node->nd_next->nd_aid ? Qtrue : Qfalse,
+          ID2SYM(node->nd_next->nd_oid), op, value);
       break;
     }
     case NODE_OP_ASGN_AND: {
@@ -971,6 +982,20 @@ namespace MELBOURNE {
       tree = rb_funcall(ptp, rb_sToAry, 2, line, expr);
       break;
     }
+    case NODE_ANDATTRASGN: {         /* literal.meth = y u1 u2 u3 */
+      VALUE recv;
+
+      /* node id node */
+      if (node->nd_1st == RNODE(1)) {
+        recv = process_parse_tree(parser_state, ptp, NEW_SELF(), locals);
+      } else {
+        recv = process_parse_tree(parser_state, ptp, node->nd_1st, locals);
+      }
+      VALUE value = process_parse_tree(parser_state, ptp, node->nd_3rd, locals);
+      tree = rb_funcall(ptp, rb_sAndAttrAsgn, 4, line,
+          recv, ID2SYM(node->u2.id), value);
+      break;
+    }
     case NODE_ATTRASGN: {         /* literal.meth = y u1 u2 u3 */
       VALUE recv;
 

data/lib/rubinius/code/melbourne/version.rb

@@ -1,5 +1,5 @@
 module CodeTools
   class Melbourne
-    VERSION = "3.6"
+    VERSION = "3.7"
   end
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: rubinius-melbourne
 version: !ruby/object:Gem::Version
-  version: '3.6'
+  version: '3.7'
 platform: ruby
 authors:
 - Brian Shirai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-07 00:00:00.000000000 Z
+date: 2016-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: mspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 description: Ruby parser extracted from MRI.
@@ -92,17 +92,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Rubinius Ruby Parser.