ruby_parser 3.21.1 → 3.22.0

data/lib/ruby_parser3.yy

@@ -8,6 +8,8 @@ class Ruby31Parser
 class Ruby32Parser
 #elif V == 33
 class Ruby33Parser
+#elif V == 34
+class Ruby34Parser
 #else
 fail "version not specified or supported on code generation"
 #endif
@@ -84,7 +86,9 @@ rule
                     {
                       result = self.block_append val[0], val[2]
                     }
+#if V < 32
                 | error top_stmt
+#endif
 
         top_stmt: stmt
                 | klBEGIN
@@ -106,7 +110,12 @@ rule
                       result = iter
                     }
 
+#if V < 33
      begin_block: tLCURLY top_compstmt tRCURLY
+#else
+      block_open: tLCURLY
+     begin_block: block_open top_compstmt tRCURLY
+#endif
                     {
                       (_, line), stmt, _ = val
                       result = new_iter s(:preexe).line(line), 0, stmt
@@ -142,11 +151,13 @@ rule
                     {
                       result = self.block_append val[0], val[2]
                     }
+#if V < 32
                 | error stmt
                     {
                       result = val[1]
                       debug 2
                     }
+#endif
 
    stmt_or_begin: stmt
                 | klBEGIN
@@ -158,6 +169,10 @@ rule
                       result = val[2] # wtf?
                     }
 
+#if V >= 33
+     allow_exits: none
+#endif
+
             stmt: kALIAS fitem
                     {
                       lexer.lex_state = EXPR_FNAME
@@ -205,16 +220,30 @@ rule
                       e, _, c = val
                       result = new_until e, c, true
                     }
-                | stmt kRESCUE_MOD stmt
+                | stmt kRESCUE_MOD
+#if V > 32
+                    after_rescue
+#endif
+                    stmt
                     {
+#if V > 32
+                      body, _, _, resbody = val
+#else
                       body, _, resbody = val
+#endif
 
                       resbody = new_resbody s(:array).line(resbody.line), resbody
                       result = new_rescue body, resbody
                     }
+#if V < 33
                 | klEND tLCURLY compstmt tRCURLY
                     {
                       (_, line), _, stmt, _ = val
+#else
+                | klEND allow_exits tLCURLY compstmt tRCURLY
+                    {
+                      (_, line), _, _, stmt, _ = val
+#endif
 
                       if (self.in_def || self.in_single > 0) then
                         debug 3
@@ -234,10 +263,18 @@ rule
 
                       result = new_assign lhs, s(:svalue, rhs).line(rhs.line)
                     }
+#if V > 32
+                | mlhs tEQL mrhs_arg kRESCUE_MOD after_rescue stmt
+#else
                 | mlhs tEQL mrhs_arg kRESCUE_MOD stmt
+#endif
                     {
                       # unwraps s(:to_ary, rhs)
+#if V > 32
+                      lhs, _, (_, rhs), _, _, resbody = val
+#else
                       lhs, _, (_, rhs), _, resbody = val
+#endif
 
                       resbody = new_resbody s(:array).line(resbody.line), resbody
 
@@ -248,6 +285,9 @@ rule
                       result = new_masgn val[0], val[2]
                     }
                 | expr
+#if V >= 32
+                | error
+#endif
 
     command_asgn: lhs tEQL command_rhs
                     {
@@ -321,9 +361,17 @@ rule
                       expr, = val
                       result = value_expr expr
                     }
+#if V > 32
+                | command_call kRESCUE_MOD after_rescue stmt
+#else
                 | command_call kRESCUE_MOD stmt
+#endif
                     {
+#if V > 32
+                      expr, (_, line), _, resbody = val
+#else
                       expr, (_, line), resbody = val
+#endif
 
                       expr = value_expr expr
                       ary  = s(:array).line line
@@ -364,7 +412,7 @@ rule
                       self.in_kwarg = true
                       self.env.extend
                     }
-#if V == 30
+#if V < 31
                     p_expr
 #else
                     p_top_expr_body
@@ -388,7 +436,7 @@ rule
                       self.in_kwarg = true
                       self.env.extend
                     }
-#if V == 30
+#if V < 31
                     p_expr
 #else
                     p_top_expr_body
@@ -446,6 +494,9 @@ rule
                     {
                       result = value_expr(val[0])
                     }
+#if V >= 32
+                | error
+#endif
 
    expr_value_do:   {
                       lexer.cond.push true
@@ -1072,9 +1123,17 @@ rule
                     {
                       result = logical_op :or, val[0], val[2]
                     }
-                | kDEFINED opt_nl arg
+                | kDEFINED opt_nl
+#if V > 32
+                    begin_defined
+#endif
+                    arg
                     {
+#if V > 32
+                      (_, line), _, _, arg = val
+#else
                       (_, line), _, arg = val
+#endif
                       result = s(:defined, arg).line line
                     }
                 | arg tEH arg opt_nl tCOLON arg
@@ -1117,6 +1176,12 @@ rule
                       result = new_call lhs, op.to_sym, argl(rhs)
                     }
 
+#if V > 32
+        lex_ctxt: none
+   begin_defined: lex_ctxt
+    after_rescue: lex_ctxt
+#endif
+
        arg_value: arg
                     {
                       result = value_expr(val[0])
@@ -1137,9 +1202,17 @@ rule
                     }
 
          arg_rhs: arg                   =tOP_ASGN
-                | arg kRESCUE_MOD arg
+                | arg kRESCUE_MOD
+#if V > 32
+                    after_rescue
+#endif
+                    arg
                     {
+#if V > 32
+                      body, (_, line), _, resbody = val
+#else
                       body, (_, line), resbody = val
+#endif
                       body    = value_expr body
                       resbody = remove_begin resbody
 
@@ -1390,10 +1463,11 @@ rule
                     {
                       result = wrap :colon3, val[1]
                     }
-                | tLBRACK aref_args rbracket
+                | tLBRACK aref_args tRBRACK
                     {
-                      (_, line), args, (_, line_max) = val
+                      (_, line), args, _ = val
 
+                      line_max = lexer.lineno
                       result = args || s(:array)
                       result.sexp_type = :array # aref_args is :args
                       result.line line
@@ -1521,7 +1595,11 @@ rule
                       self.env.unextend
                     }
                 | k_class tLSHFT
+#if V > 32
+                    expr_value
+#else
                     expr
+#endif
                     {
                       result = self.in_def
                       self.in_def = false
@@ -1604,9 +1682,18 @@ rule
             k_if: kIF
         k_unless: kUNLESS
          k_while: kWHILE
+#if V > 32
+                    allow_exits
+#endif
          k_until: kUNTIL
+#if V > 32
+                    allow_exits
+#endif
           k_case: kCASE
            k_for: kFOR
+#if V > 32
+                    allow_exits
+#endif
          k_class: kCLASS
                     {
                       result << self.lexer.comment
@@ -1630,6 +1717,10 @@ rule
            k_end: kEND
         k_return: kRETURN
 
+#if V > 32
+         k_yield: kYIELD
+#endif
+
             then: term
                 | kTHEN
                 | term kTHEN
@@ -1876,6 +1967,11 @@ opt_block_args_tail: tCOMMA block_args_tail
                     }
                 | f_bad_arg
 
+#if V > 32
+    max_numparam: none
+        numparam: none
+#endif
+
           lambda: tLAMBDA
                     {
                       self.env.extend :dynamic
@@ -1883,13 +1979,20 @@ opt_block_args_tail: tCOMMA block_args_tail
                       lexer.paren_nest += 1
                       lexer.lpar_beg = lexer.paren_nest
                     }
+#if V > 32
+                    max_numparam numparam allow_exits
+#endif
                     f_larglist
                     {
                       lexer.cmdarg.push false
                     }
                     lambda_body
                     {
+#if V > 32
+                      (_, line), _, _, _, lpar, args, _cmdarg, body = val
+#else
                       (_, line), lpar, args, _cmdarg, body = val
+#endif
                       lexer.lpar_beg = lpar
 
                       lexer.cmdarg.pop
@@ -2052,11 +2155,20 @@ opt_block_args_tail: tCOMMA block_args_tail
                       self.env.unextend
                     }
 
-      brace_body:   { self.env.extend :dynamic; result = self.lexer.lineno }
+      brace_body:
+#if V > 32
+                    max_numparam numparam allow_exits
+#endif
+
+                    { self.env.extend :dynamic; result = self.lexer.lineno }
                     { result = lexer.cmdarg.store(false) }
                     opt_block_param compstmt
                     {
+#if V > 32
+                      _, _, _, line, cmdarg, param, cmpstmt = val
+#else
                       line, cmdarg, param, cmpstmt = val
+#endif
 
                       result = new_brace_body param, cmpstmt, line
                       self.env.unextend
@@ -2064,12 +2176,20 @@ opt_block_args_tail: tCOMMA block_args_tail
                       lexer.cmdarg.pop # because of: cmdarg_stack >> 1 ?
                     }
 
-         do_body:   { self.env.extend :dynamic; result = self.lexer.lineno }
+         do_body:
+#if V > 32
+                    max_numparam numparam allow_exits
+#endif
+                    { self.env.extend :dynamic; result = self.lexer.lineno }
                     { lexer.cmdarg.push false }
                     opt_block_param
                     bodystmt
                     {
+#if V > 32
+                      _, _, _, line, _cmdarg, param, cmpstmt = val
+#else
                       line, _cmdarg, param, cmpstmt = val
+#endif
 
                       result = new_do_body param, cmpstmt, line
                       lexer.cmdarg.pop
@@ -2509,7 +2629,7 @@ opt_block_args_tail: tCOMMA block_args_tail
 
                       case lhs.sexp_type
                       when :lit then
-                        assignable [lhs.value, lhs.line]
+                        assignable lhs # [lhs.value, lhs.line]
                       else
                         # TODO or done?
                         debug 10
@@ -2536,7 +2656,7 @@ opt_block_args_tail: tCOMMA block_args_tail
                       _, (id, line) = val
 
                       name = id.to_sym
-                      self.assignable [name, line]
+                      self.assignable s(:bogus, name).line line # [name, line]
                       result = s(:kwrest, :"**#{name}").line line
                     }
                 | kwrest_mark
@@ -2588,11 +2708,11 @@ opt_block_args_tail: tCOMMA block_args_tail
 
                       result = s(:dot3, v1, nil).line v1.line
                     }
-#if V == 30
+#if V < 31
                 | p_variable
 #endif
                 | p_var_ref
-#if V > 30
+#if V >= 31
                 | p_expr_ref
 #endif
                 | p_const
@@ -2770,6 +2890,10 @@ opt_block_args_tail: tCOMMA block_args_tail
                       result = new_regexp val
                     }
 
+#if V > 32
+       words_sep: tSPACE
+                | words_sep tSPACE
+#endif
            words: tWORDS_BEG tSPACE tSTRING_END
                     {
                       (_, line), _, (_, line_max) = val
@@ -2789,7 +2913,11 @@ opt_block_args_tail: tCOMMA block_args_tail
                     {
                       result = new_word_list
                     }
+#if V < 33
                 | word_list word tSPACE
+#else
+                | word_list word words_sep
+#endif
                     {
                       result = val[0].dup << new_word_list_entry(val)
                     }
@@ -2819,7 +2947,11 @@ opt_block_args_tail: tCOMMA block_args_tail
                     {
                       result = new_symbol_list
                     }
+#if V < 33
                 | symbol_list word tSPACE
+#else
+                | symbol_list word words_sep
+#endif
                     {
                       list, * = val
                       result = list.dup << new_symbol_list_entry(val)
@@ -2859,7 +2991,11 @@ opt_block_args_tail: tCOMMA block_args_tail
                     {
                       result = new_qword_list
                     }
+#if V < 33
                 | qword_list tSTRING_CONTENT tSPACE
+#else
+                | qword_list tSTRING_CONTENT words_sep
+#endif
                     {
                       result = val[0].dup << new_qword_list_entry(val)
                     }
@@ -2868,7 +3004,11 @@ opt_block_args_tail: tCOMMA block_args_tail
                     {
                       result = new_qsym_list
                     }
+#if V < 33
                 | qsym_list tSTRING_CONTENT tSPACE
+#else
+                | qsym_list tSTRING_CONTENT words_sep
+#endif
                     {
                       result = val[0].dup << new_qsym_list_entry(val)
                     }
@@ -2939,7 +3079,11 @@ regexp_contents: none
                       lexer.lex_state   = EXPR_BEG
                     }
                     compstmt
+#if V > 32
+                    string_dend
+#else
                     tSTRING_DEND
+#endif
                     {
                       (_, line), memo, stmt, _ = val
 
@@ -2971,6 +3115,12 @@ regexp_contents: none
                       end
                     }
 
+#if V > 32
+     string_dend: tSTRING_DEND
+                | "end-of-input" /* wtf? */
+#endif
+
+#if V < 33
      string_dvar: tGVAR
                     {
                       result = wrap :gvar, val[0]
@@ -2984,6 +3134,10 @@ regexp_contents: none
                       result = wrap :cvar, val[0]
                     }
                 | backref
+#else
+     string_dvar: nonlocal_var
+                | backref
+#endif
 
           symbol: ssym
                 | dsym
@@ -2991,7 +3145,14 @@ regexp_contents: none
             ssym: tSYMBEG sym
                     {
                       lexer.lex_state = EXPR_END
-                      result = wrap :lit, val[1]
+                      _, sym = val
+                      result =
+                        if sym.is_a? Sexp then
+                          sym.sexp_type = :lit
+                          sym
+                        else
+                          wrap :lit, sym
+                        end
                     }
                 | tSYMBOL
                     {
@@ -2999,7 +3160,11 @@ regexp_contents: none
                       result = wrap :lit, val[0]
                     }
 
+#if V < 31
              sym: fname | tIVAR | tGVAR | tCVAR
+#else
+             sym: fname | nonlocal_var
+#endif
 
             dsym: tSYMBEG string_contents tSTRING_END
                     {
@@ -3039,11 +3204,17 @@ regexp_contents: none
                 | tCVAR { result = wrap :cvar, val[0] }
 #endif
 
-   user_variable: tIDENTIFIER
-                | tIVAR
-                | tGVAR
-                | tCONSTANT
-                | tCVAR
+#if V < 32
+   user_variable: tIDENTIFIER { (var, line), = val; result = gettable(var).line line }
+                | tIVAR { result = wrap :ivar, val[0] }
+                | tGVAR { result = wrap :gvar, val[0] }
+                | tCONSTANT { (var, line), = val; result = gettable(var).line line }
+                | tCVAR { result = wrap :cvar, val[0] }
+#else
+   user_variable: tIDENTIFIER { (var, line), = val; result = gettable(var).line line }
+                | tCONSTANT { (var, line), = val; result = gettable(var).line line }
+                | nonlocal_var
+#endif
 
 keyword_variable: kNIL      { (_, line), = val; result = s(:nil).line line }
                 | kSELF     { (_, line), = val; result = s(:self).line line }
@@ -3063,18 +3234,7 @@ keyword_variable: kNIL      { (_, line), = val; result = s(:nil).line line }
                     }
 
          var_ref: user_variable
-                    {
-                      raise "NO: #{val.inspect}" if Sexp === val.first
-                      (var, line), = val
-                      result = Sexp === var ? var : self.gettable(var)
-
-                      result.line line
-                    }
                 | keyword_variable
-                    {
-                      var = val[0]
-                      result = Sexp === var ? var : self.gettable(var)
-                    }
 
          var_lhs: user_variable
                     {
@@ -3123,7 +3283,7 @@ f_opt_paren_args: f_paren_args
                       self.in_argdef = false
                       result = end_args val
                     }
-#if V == 30
+#if V < 31
                 | tLPAREN2 f_arg tCOMMA args_forward rparen
                     {
                       result = end_args val
@@ -3264,6 +3424,7 @@ f_opt_paren_args: f_paren_args
                       identifier = id.to_sym
                       self.env[identifier] = :lvar
 
+                      # TODO: result = s(:args, identifier).line line
                       result = [identifier, line]
                     }
 
@@ -3371,10 +3532,10 @@ f_opt_paren_args: f_paren_args
      kwrest_mark: tPOW
                 | tDSTAR
 
-      f_no_kwarg: kwrest_mark kNIL
+      f_no_kwarg: p_kwnorest
                     {
-                      (_, line), _ = val
-                      result = [:"**nil", line]
+                      sexp, _ = val
+                      result = [:"**nil", sexp.line] # HACK!
                     }
 
         f_kwrest: kwrest_mark tIDENTIFIER
@@ -3382,7 +3543,7 @@ f_opt_paren_args: f_paren_args
                       _, (id, line) = val
 
                       name = id.to_sym
-                      self.assignable [name, line]
+                      self.assignable s(:bogus, name).line line # [name, line]
                       result = [:"**#{name}", line]
                     }
                 | kwrest_mark
@@ -3394,31 +3555,31 @@ f_opt_paren_args: f_paren_args
                     }
 
            f_opt: f_arg_asgn
-#if V > 30
-                    f_eq
-#else
+#if V < 31
                     tEQL
+#else
+                    f_eq
 #endif
                     arg_value
                     {
                       lhs, _, rhs = val
                       self.in_argdef = true
-                      result = self.assignable lhs, rhs
+                      result = self.old_assignable lhs, rhs
                       # TODO: detect duplicate names
                       # TODO? p->cur_arg = 0;
                     }
 
      f_block_opt: f_arg_asgn
-#if V > 30
-                    f_eq
-#else
+#if V < 31
                     tEQL
+#else
+                    f_eq
 #endif
                     primary_value
                     {
                       lhs, _, rhs = val
                       self.in_argdef = true
-                      result = self.assignable lhs, rhs
+                      result = self.old_assignable lhs, rhs
                       # TODO? p->cur_arg = 0;
                     }
 
@@ -3451,7 +3612,7 @@ f_opt_paren_args: f_paren_args
                       # TODO: differs from parse.y - needs tests
                       _, (id, line) = val
                       name = id.to_sym
-                      self.assignable [name, line]
+                      self.assignable s(:lvar, name).line(line)
                       result = [:"*#{name}", line]
                     }
                 | restarg_mark
@@ -3559,7 +3720,7 @@ f_opt_paren_args: f_paren_args
 #endif
 
        operation: tIDENTIFIER | tCONSTANT | tFID
-      operation2: tIDENTIFIER | tCONSTANT | tFID | op
+      operation2: operation | op
       operation3: tIDENTIFIER | tFID | op
     dot_or_colon: tDOT | tCOLON2
          call_op: tDOT
@@ -3585,7 +3746,7 @@ f_opt_paren_args: f_paren_args
                       _, close = val
                       result = [close, lexer.lineno]
                     }
-         trailer:  | tNL | tCOMMA
+         trailer: opt_nl | tCOMMA
 
             term: tSEMI { yyerrok }
                 | tNL