ruby_parser 3.18.0 → 3.19.1

data/lib/ruby3_parser.yy

@@ -2,6 +2,8 @@
 
 #if V == 30
 class Ruby30Parser
+#elif V == 31
+class Ruby31Parser
 #else
 fail "version not specified or supported on code generation"
 #endif
@@ -84,7 +86,7 @@ rule
                 | klBEGIN
                     {
                       if (self.in_def || self.in_single > 0) then
-                        debug 11
+                        debug 1
                         yyerror "BEGIN in method"
                       end
                       self.env.extend
@@ -139,7 +141,7 @@ rule
                 | error stmt
                     {
                       result = val[1]
-                      debug 12
+                      debug 2
                     }
 
    stmt_or_begin: stmt
@@ -211,7 +213,7 @@ rule
                       (_, line), _, stmt, _ = val
 
                       if (self.in_def || self.in_single > 0) then
-                        debug 13
+                        debug 3
                         yyerror "END in method; use at_exit"
                       end
 
@@ -286,6 +288,24 @@ rule
 
                       result = s(:op_asgn, lhs1, rhs, lhs2.to_sym, id.to_sym).line line
                     }
+#if V > 30
+                | defn_head f_opt_paren_args tEQL command
+                    {
+                      result = new_endless_defn val
+                    }
+                | defn_head f_opt_paren_args tEQL command kRESCUE_MOD arg
+                    {
+                      result = new_endless_defn val
+                    }
+                | defs_head f_opt_paren_args tEQL command
+                    {
+                      result = new_endless_defs val
+                    }
+                | defs_head f_opt_paren_args tEQL command kRESCUE_MOD arg
+                    {
+                      result = new_endless_defs val
+                    }
+#endif
                 | backref tOP_ASGN command_rhs
                     {
                       self.backref_assign_error val[0]
@@ -339,7 +359,11 @@ rule
                       self.in_kwarg = true
                       self.env.extend
                     }
+#if V == 30
                     p_expr
+#else
+                    p_top_expr_body
+#endif
                     {
                       lhs, _, in_kwarg, rhs = val
 
@@ -359,7 +383,11 @@ rule
                       self.in_kwarg = true
                       self.env.extend
                     }
+#if V == 30
                     p_expr
+#else
+                    p_top_expr_body
+#endif
                     {
                       self.env.unextend
 
@@ -679,7 +707,7 @@ rule
                 | primary_value tCOLON2 tCONSTANT
                     {
                       if (self.in_def || self.in_single > 0) then
-                        debug 14
+                        debug 4
                         yyerror "dynamic constant assignment"
                       end
 
@@ -691,7 +719,7 @@ rule
                 | tCOLON3 tCONSTANT
                     {
                       if (self.in_def || self.in_single > 0) then
-                        debug 15
+                        debug 5
                         yyerror "dynamic constant assignment"
                       end
 
@@ -718,7 +746,7 @@ rule
 
                       result = self.assignable var
 
-                      debug 16
+                      debug 6
                     }
                 | primary_value tLBRACK2 opt_call_args rbracket
                     {
@@ -749,7 +777,7 @@ rule
                       expr, _, (id, _line) = val
 
                       if (self.in_def || self.in_single > 0) then
-                        debug 17
+                        debug 7
                         yyerror "dynamic constant assignment"
                       end
 
@@ -761,7 +789,7 @@ rule
                       _, (id, l) = val
 
                       if (self.in_def || self.in_single > 0) then
-                        debug 18
+                        debug 8
                         yyerror "dynamic constant assignment"
                       end
 
@@ -780,8 +808,7 @@ rule
 
            cpath: tCOLON3 cname
                     {
-                      _, (name, line) = val
-                      result = s(:colon3, name.to_sym).line line
+                      result = wrap :colon3, val[1]
                     }
                 | cname
                     {
@@ -806,9 +833,7 @@ rule
 
            fitem: fname
                     {
-                      (id, line), = val
-
-                      result = s(:lit, id.to_sym).line line
+                      result = wrap :lit, val[0]
                     }
                 | symbol
 
@@ -877,9 +902,9 @@ rule
                     }
                 | tCOLON3 tCONSTANT tOP_ASGN arg_rhs
                     {
-                      _, (lhs, line), op, rhs = val
+                      _, lhs, op, rhs = val
 
-                      lhs = s(:colon3, lhs.to_sym).line line
+                      lhs = wrap :colon3, lhs
                       result = new_const_op_asgn [lhs, op, rhs]
                     }
                 | backref tOP_ASGN arg_rhs
@@ -962,8 +987,8 @@ rule
                     }
                 | tUMINUS_NUM simple_numeric tPOW arg
                     {
-                      _, (num, line), _, arg = val
-                      lit = s(:lit, num).line line
+                      _, num, _, arg = val
+                      lit = wrap :lit, num
                       result = new_call(new_call(lit, :"**", argl(arg)), :"-@")
 
                     }
@@ -1056,46 +1081,19 @@ rule
                     }
                 | defn_head f_opt_paren_args tEQL arg
                     {
-                      (name, line, in_def), args, _, body = val
-
-                      result = s(:defn, name, args, body).line line
-
-                      local_pop in_def
-                      endless_method_name result
+                      result = new_endless_defn val
                     }
                 | defn_head f_opt_paren_args tEQL arg kRESCUE_MOD arg
                     {
-                      (name, line, in_def), args, _, body, _, resbody = val
-
-                      result = s(:defn, name, args,
-                                 new_rescue(body,
-                                            new_resbody(s(:array).line(line),
-                                                        resbody))).line line
-
-                      local_pop in_def
-                      endless_method_name result
+                      result = new_endless_defn val
                     }
                 | defs_head f_opt_paren_args tEQL arg
                     {
-                      (recv, (name, line, in_def)), args, _, body = val
-
-                      result = s(:defs, recv, name, args, body).line(line)
-
-                      self.in_single -= 1
-                      local_pop in_def
-                      endless_method_name result
+                      result = new_endless_defs val
                     }
                 | defs_head f_opt_paren_args tEQL arg kRESCUE_MOD arg
                     {
-                      (recv, (name, line, in_def)), args, _, body, _, resbody = val
-
-                      result = s(:defs, recv, name, args,
-                                 new_rescue(body,
-                                            new_resbody(s(:array).line(line),
-                                                        resbody))).line line
-
-                      local_pop in_def
-                      endless_method_name result
+                      result = new_endless_defs val
                     }
                 | primary
 
@@ -1251,6 +1249,13 @@ rule
                       _, arg = val
                       result = s(:block_pass, arg).line arg.line
                     }
+#if V > 30
+                | tAMPER
+                    {
+                      (_, line), = val
+                      result = s(:block_pass).line line
+                    }
+#endif
 
    opt_block_arg: tCOMMA block_arg
                     {
@@ -1370,9 +1375,7 @@ rule
                     }
                 | tCOLON3 tCONSTANT
                     {
-                      _, (id, line) = val
-
-                      result = s(:colon3, id.to_sym).line line
+                      result = wrap :colon3, val[1]
                     }
                 | tLBRACK { result = lexer.lineno } aref_args tRBRACK
                     {
@@ -1396,15 +1399,21 @@ rule
                     }
                 | kYIELD tLPAREN2 call_args rparen
                     {
-                      result = new_yield val[2]
+                      (_, line), _, args, _ = val
+
+                      result = new_yield(args).line line
                     }
                 | kYIELD tLPAREN2 rparen
                     {
-                      result = new_yield
+                      (_, line), _, _ = val
+
+                      result = new_yield.line line
                     }
                 | kYIELD
                     {
-                      result = new_yield
+                      (_, line), = val
+
+                      result = new_yield.line line
                     }
                 | kDEFINED opt_nl tLPAREN2 expr rparen
                     {
@@ -1419,7 +1428,7 @@ rule
                     }
                 | kNOT tLPAREN2 rparen
                     {
-                      debug 19
+                      debug 9
                     }
                 | fcall brace_block
                     {
@@ -1729,6 +1738,10 @@ rule
     f_any_kwrest: f_kwrest
                 | f_no_kwarg
 
+#if V > 30
+            f_eq: tEQL # TODO: self.in_argdef = false
+#endif
+
  block_args_tail: f_block_kwarg tCOMMA f_kwrest opt_f_block_arg
                     {
                       result = call_args val
@@ -1859,8 +1872,7 @@ opt_block_args_tail: tCOMMA block_args_tail
 
             bvar: tIDENTIFIER
                     {
-                      (id, line), = val
-                      result = s(:shadow, id.to_sym).line line
+                      result = wrap :shadow, val[0]
                     }
                 | f_bad_arg
 
@@ -2199,6 +2211,9 @@ opt_block_args_tail: tCOMMA block_args_tail
       p_lbracket: tLBRACK2 { push_pktbl }
 
     p_expr_basic: p_value
+#if V > 30
+                | p_variable
+#endif
                 | p_const p_lparen p_args tRPAREN
                     {
                       lhs, _, args, _ = val
@@ -2474,7 +2489,7 @@ opt_block_args_tail: tCOMMA block_args_tail
                         assignable [lhs.value, lhs.line]
                       else
                         # TODO or done?
-                        debug 666
+                        debug 10
                       end
 
                       # TODO PAIR -> LIST ?
@@ -2483,10 +2498,15 @@ opt_block_args_tail: tCOMMA block_args_tail
 
       p_kw_label: tLABEL
                     {
-                      (id, line), = val
-
-                      result = s(:lit, id.to_sym).line line
+                      result = wrap :lit, val[0]
+                    }
+#if V > 30
+                | tSTRING_BEG string_contents tLABEL_END
+                    {
+                      # you can't actually get here the way I lex labels
+                      debug 11
                     }
+#endif
 
         p_kwrest: kwrest_mark tIDENTIFIER
                     {
@@ -2545,8 +2565,13 @@ opt_block_args_tail: tCOMMA block_args_tail
 
                       result = s(:dot3, v1, nil).line v1.line
                     }
+#if V == 30
                 | p_variable
+#endif
                 | p_var_ref
+#if V > 30
+                | p_expr_ref
+#endif
                 | p_const
                 | tBDOT2 p_primitive
                     {
@@ -2580,26 +2605,35 @@ opt_block_args_tail: tCOMMA block_args_tail
 
       p_variable: tIDENTIFIER
                     {
-                      (id, line), = val
-
                       # TODO: error_duplicate_pattern_variable(p, $1, &@1);
                       # TODO: assignable(p, $1, 0, &@$);
-                      result = s(:lvar, id.to_sym).line line
+                      result = wrap :lvar, val[0]
                     }
 
        p_var_ref: tCARET tIDENTIFIER
                     {
-                      _, (id, line) = val
-
                       # TODO: check id against env for lvar or dvar
+                      result = wrap :lvar, val[1]
+                    }
+#if V > 30
+                | tCARET nonlocal_var
+                    {
+                      _, var = val
+                      result = var
+                    }
+#endif
 
-                      result = s(:lvar, id.to_sym).line line
+#if V > 30
+      p_expr_ref: tCARET tLPAREN expr_value rparen
+                    {
+                      _, _, expr, _ = val
+                      result = expr # TODO? s(:begin, expr).line expr.line
                     }
+#endif
 
          p_const: tCOLON3 cname
                     {
-                      _, (id, line) = val
-                      result = s(:colon3, id.to_sym).line line
+                      result = wrap :colon3, val[1]
                     }
                 | p_const tCOLON2 cname
                     {
@@ -2611,8 +2645,7 @@ opt_block_args_tail: tCOMMA block_args_tail
                 | tCONSTANT
                     {
                       # TODO $$ = gettable(p, $1, &@$);
-                      (id, line), = val
-                      result = s(:const, id.to_sym).line line
+                      result = wrap :const, val[0]
                     }
 ######################################################################
 
@@ -2670,7 +2703,7 @@ opt_block_args_tail: tCOMMA block_args_tail
 
           string: tCHAR
                     {
-                      debug 36
+                      debug 12
                     }
                 | string1
                 | string string1
@@ -2891,25 +2924,22 @@ regexp_contents: none
                       when nil then
                         result = s(:evstr).line line
                       else
-                        debug 37
+                        debug 13
                         raise "unknown string body: #{stmt.inspect}"
                       end
                     }
 
      string_dvar: tGVAR
                     {
-                      (id, line), = val
-                      result = s(:gvar, id.to_sym).line line
+                      result = wrap :gvar, val[0]
                     }
                 | tIVAR
                     {
-                      (id, line), = val
-                      result = s(:ivar, id.to_sym).line line
+                      result = wrap :ivar, val[0]
                     }
                 | tCVAR
                     {
-                      (id, line), = val
-                      result = s(:cvar, id.to_sym).line line
+                      result = wrap :cvar, val[0]
                     }
                 | backref
 
@@ -2918,17 +2948,13 @@ regexp_contents: none
 
             ssym: tSYMBEG sym
                     {
-                      _, (id, line) = val
-
                       lexer.lex_state = EXPR_END
-                      result = s(:lit, id.to_sym).line line
+                      result = wrap :lit, val[1]
                     }
                 | tSYMBOL
                     {
-                      (id, line), = val
-
                       lexer.lex_state = EXPR_END
-                      result = s(:lit, id.to_sym).line line
+                      result = wrap :lit, val[0]
                     }
 
              sym: fname | tIVAR | tGVAR | tCVAR
@@ -2949,7 +2975,7 @@ regexp_contents: none
                       when :evstr then
                         result = s(:dsym, "", result).line result.line
                       else
-                        debug 38
+                        debug 14
                       end
                     }
 
@@ -2965,6 +2991,12 @@ regexp_contents: none
                 | tRATIONAL
                 | tIMAGINARY
 
+#if V > 30
+    nonlocal_var: tIVAR { result = wrap :ivar, val[0] }
+                | tGVAR { result = wrap :gvar, val[0] }
+                | tCVAR { result = wrap :cvar, val[0] }
+#endif
+
    user_variable: tIDENTIFIER
                 | tIVAR
                 | tGVAR
@@ -3009,7 +3041,7 @@ keyword_variable: kNIL      { result = s(:nil).line lexer.lineno }
                 | keyword_variable
                     {
                       result = self.assignable val[0]
-                      debug 39
+                      debug 15
                     }
 
          backref: tNTH_REF
@@ -3039,11 +3071,15 @@ keyword_variable: kNIL      { result = s(:nil).line lexer.lineno }
 
 f_opt_paren_args: f_paren_args
                 | none
+                    {
+                      result = end_args val
+                    }
 
     f_paren_args: tLPAREN2 f_args rparen
                     {
                       result = end_args val
                     }
+#if V == 30
                 | tLPAREN2 f_arg tCOMMA args_forward rparen
                     {
                       result = end_args val
@@ -3052,6 +3088,7 @@ f_opt_paren_args: f_paren_args
                     {
                       result = end_args val
                     }
+#endif
 
        f_arglist: f_paren_args
                 |   {
@@ -3077,6 +3114,9 @@ f_opt_paren_args: f_paren_args
                       result = args val
                     }
                 | f_block_arg
+#if V > 30
+                | args_forward
+#endif
 
    opt_args_tail: tCOMMA args_tail
                     {
@@ -3287,17 +3327,33 @@ f_opt_paren_args: f_paren_args
                       result = [id, lexer.lineno] # TODO: tPOW/tDSTAR include lineno
                     }
 
-           f_opt: f_arg_asgn tEQL arg_value
+           f_opt: f_arg_asgn
+#if V > 30
+                    f_eq
+#else
+                    tEQL
+#endif
+                    arg_value
                     {
                       lhs, _, rhs = val
                       result = self.assignable lhs, rhs
                       # TODO: detect duplicate names
+                      # TODO? p->cur_arg = 0;
+                      # TODO? p->ctxt.in_argdef = 1;
                     }
 
-     f_block_opt: f_arg_asgn tEQL primary_value
+     f_block_opt: f_arg_asgn
+#if V > 30
+                    f_eq
+#else
+                    tEQL
+#endif
+                    primary_value
                     {
                       lhs, _, rhs = val
                       result = self.assignable lhs, rhs
+                      # TODO? p->cur_arg = 0;
+                      # TODO? p->ctxt.in_argdef = 1;
                     }
 
   f_block_optarg: f_block_opt
@@ -3349,6 +3405,12 @@ f_opt_paren_args: f_paren_args
                       self.env[identifier] = :lvar
                       result = ["&#{identifier}".to_sym, line]
                     }
+                | blkarg_mark
+                    {
+                      (_, line), = val
+
+                      result = [:&, line]
+                    }
 
  opt_f_block_arg: tCOMMA f_block_arg
                     {
@@ -3395,10 +3457,17 @@ f_opt_paren_args: f_paren_args
                     }
                 | tLABEL arg_value
                     {
-                      (label, line), arg = val
+                      label, arg = val
+
+                      lit = wrap :lit, label
+                      result = s(:array, lit, arg).line lit.line
+                    }
+                | tLABEL
+                    {
+                      lit = wrap :lit, val[0]
+                      arg = nil
 
-                      lit = s(:lit, label.to_sym).line line
-                      result = s(:array, lit, arg).line line
+                      result = s(:array, lit, arg).line lit.line
                     }
                 | tSTRING_BEG string_contents tLABEL_END arg_value
                     {

data/lib/ruby_parser.rb

@@ -80,10 +80,12 @@ require "ruby25_parser"
 require "ruby26_parser"
 require "ruby27_parser"
 require "ruby30_parser"
+require "ruby31_parser"
 
 class RubyParser # HACK
   VERSIONS.clear # also a HACK caused by racc namespace issues
 
+  class V31 < ::Ruby31Parser; end
   class V30 < ::Ruby30Parser; end
   class V27 < ::Ruby27Parser; end
   class V26 < ::Ruby26Parser; end