ruby_parser 3.20.0 → 3.20.2

data/lib/ruby32_parser.y

@@ -96,9 +96,9 @@ rule
                       result = iter
                     }
 
-     begin_block: tLCURLY { result = lexer.lineno } top_compstmt tRCURLY
+     begin_block: tLCURLY top_compstmt tRCURLY
                     {
-                      _, line, stmt, _ = val
+                      (_, line), stmt, _ = val
                       result = new_iter s(:preexe).line(line), 0, stmt
                     }
 
@@ -221,6 +221,7 @@ rule
                 | lhs tEQL mrhs
                     {
                       lhs, _, rhs = val
+
                       result = new_assign lhs, s(:svalue, rhs).line(rhs.line)
                     }
                 | mlhs tEQL mrhs_arg kRESCUE_MOD stmt
@@ -620,7 +621,7 @@ rule
                     }
                 | tSTAR
                     {
-                      l = lexer.lineno
+                      (_, l), = val
                       result = s(:masgn, s(:array, s(:splat).line(l)).line(l)).line l
                     }
                 | tSTAR tCOMMA mlhs_post
@@ -1130,8 +1131,10 @@ rule
 
       paren_args: tLPAREN2 opt_call_args rparen
                     {
-                      _, args, _ = val
+                      _, args, (_, line_max) = val
+
                       result = args
+                      result.line_max = line_max if args
                     }
                 | tLPAREN2 args tCOMMA args_forward rparen
                     {
@@ -1248,7 +1251,7 @@ rule
             args: arg_value
                     {
                       arg, = val
-                      lineno = arg.line || lexer.lineno # HACK
+                      lineno = arg.line
 
                       result = s(:array, arg).line lineno
                     }
@@ -1257,6 +1260,11 @@ rule
                       _, arg = val
                       result = s(:array, s(:splat, arg).line(arg.line)).line arg.line
                     }
+                | tSTAR
+                    {
+                      (_, line), = val
+                      result = s(:array, s(:splat).line(line)).line line
+                    }
                 | args tCOMMA arg_value
                     {
                       args, _, id = val
@@ -1264,11 +1272,14 @@ rule
                     }
                 | args tCOMMA tSTAR arg_value
                     {
-                      # TODO: the line number from tSTAR has been dropped
-                      args, _, _, id = val
-                      line = lexer.lineno
+                      args, _, (_, line), id = val
                       result = self.list_append args, s(:splat, id).line(line)
                     }
+                | args tCOMMA tSTAR
+                    {
+                      args, _, (_, line) = val
+                      result = self.list_append args, s(:splat).line(line)
+                    }
 
         mrhs_arg: mrhs
                     {
@@ -1285,7 +1296,6 @@ rule
                     }
                 | args tCOMMA tSTAR arg_value
                     {
-                      # TODO: make all tXXXX terminals include lexer.lineno
                       arg, _, _, splat = val
                       result = self.arg_concat arg, splat
                     }
@@ -1314,7 +1324,6 @@ rule
                 | k_begin
                     {
                       lexer.cmdarg.push false
-                      result = self.lexer.lineno
                     }
                     bodystmt k_end
                     {
@@ -1324,11 +1333,10 @@ rule
                 | tLPAREN_ARG
                     {
                       lexer.lex_state = EXPR_ENDARG
-                      result = lexer.lineno
                     }
                     rparen
                     {
-                      _, line, _ = val
+                      (_, line), _, _ = val
                       result = s(:begin).line line
                     }
                 | tLPAREN_ARG
@@ -1344,9 +1352,8 @@ rule
                     }
                 | tLPAREN compstmt tRPAREN
                     {
-                      _, stmt, _ = val
-                      result = stmt
-                      result ||= s(:nil).line lexer.lineno
+                      (_, line), stmt, _ = val
+                      result = stmt || s(:nil).line(line)
                       result.paren = true
                     }
                 | primary_value tCOLON2 tCONSTANT
@@ -1359,12 +1366,14 @@ rule
                     {
                       result = wrap :colon3, val[1]
                     }
-                | tLBRACK { result = lexer.lineno } aref_args tRBRACK
+                | tLBRACK aref_args rbracket
                     {
-                      _, line, args, _ = val
+                      (_, line), args, (_, line_max) = val
+
                       result = args || s(:array)
                       result.sexp_type = :array # aref_args is :args
                       result.line line
+                      result.line_max = line_max
                     }
                 | tLBRACE
                     {
@@ -1475,9 +1484,6 @@ rule
                       result = new_for iter, var, body
                     }
                 | k_class
-                    {
-                      result = self.lexer.lineno
-                    }
                     cpath superclass
                     {
                       if (self.in_def || self.in_single > 0) then
@@ -1492,9 +1498,6 @@ rule
                       self.lexer.ignore_body_comments
                     }
                 | k_class tLSHFT
-                    {
-                      result = self.lexer.lineno
-                    }
                     expr
                     {
                       result = self.in_def
@@ -1506,16 +1509,14 @@ rule
                       self.in_single = 0
                       self.env.extend
                     }
-                    bodystmt k_end
+                    bodystmt
+                    k_end
                     {
                       result = new_sclass val
                       self.env.unextend
                       self.lexer.ignore_body_comments
                     }
                 | k_module
-                    {
-                      result = self.lexer.lineno
-                    }
                     cpath
                     {
                       yyerror "module definition in method body" if
@@ -1657,20 +1658,33 @@ rule
                     }
 
           f_marg: f_norm_arg
+                    {
+                      (sym, line), = val
+
+                      result = s(:dummy, sym).line line
+                    }
                 | tLPAREN f_margs rparen
                     {
-                      result = val[1]
+                      _, args, _ = val
+                      result = args
                     }
 
      f_marg_list: f_marg
                     {
-                      sym, = val
+                      arg, = val
+                      line = arg.line
 
-                      result = s(:array, sym).line lexer.lineno
+                      arg = arg.last if arg.sexp_type == :dummy
+
+                      result = s(:array, arg).line line
                     }
                 | f_marg_list tCOMMA f_marg
                     {
-                      result = list_append val[0], val[2]
+                      args, _, arg = val
+
+                      arg = arg.last if arg.sexp_type == :dummy
+
+                      result = list_append args, arg
                     }
 
          f_margs: f_marg_list
@@ -1713,8 +1727,8 @@ rule
                     }
                 | tSTAR
                     {
-                      result = args [:*]
-                      result.line lexer.lineno # FIX: tSTAR -> line
+                      (_, line), = val
+                      result = args([:*]).line line
                     }
 
     f_any_kwrest: f_kwrest
@@ -1827,7 +1841,9 @@ opt_block_args_tail: tCOMMA block_args_tail
                     }
                 | tOROP
                     {
-                      result = s(:args).line lexer.lineno
+                      (_, line), = val
+
+                      result = s(:args).line line
                     }
                 | tPIPE block_param opt_bv_decl tPIPE
                     {
@@ -1859,7 +1875,7 @@ opt_block_args_tail: tCOMMA block_args_tail
           lambda: tLAMBDA
                     {
                       self.env.extend :dynamic
-                      result = [lexer.lineno, lexer.lpar_beg]
+                      result = lexer.lpar_beg
                       lexer.paren_nest += 1
                       lexer.lpar_beg = lexer.paren_nest
                     }
@@ -1869,7 +1885,7 @@ opt_block_args_tail: tCOMMA block_args_tail
                     }
                     lambda_body
                     {
-                      _, (line, lpar), args, _cmdarg, body = val
+                      (_, line), lpar, args, _cmdarg, body = val
                       lexer.lpar_beg = lpar
 
                       lexer.cmdarg.pop
@@ -1953,13 +1969,19 @@ opt_block_args_tail: tCOMMA block_args_tail
                     {
                       call, args = val
 
-                      result = call.concat args.sexp_body if args
+                      result = call
+
+                      if args then
+                        call.concat args.sexp_body
+                        result.line_max = args.line_max
+                      end
                     }
                 | primary_value call_op operation2 opt_paren_args
                     {
-                      recv, call_op, (op, _line), args = val
+                      recv, call_op, (op, op_line), args = val
 
                       result = new_call recv, op.to_sym, args, call_op
+                      result.line_max = op_line unless args
                     }
                 | primary_value tCOLON2 operation2 paren_args
                     {
@@ -1987,7 +2009,8 @@ opt_block_args_tail: tCOMMA block_args_tail
                     }
                 | kSUPER
                     {
-                      result = s(:zsuper).line lexer.lineno
+                      (_, line), = val
+                      result = s(:zsuper).line line
                     }
                 | primary_value tLBRACK2 opt_call_args rbracket
                     {
@@ -1997,11 +2020,11 @@ opt_block_args_tail: tCOMMA block_args_tail
      brace_block: tLCURLY
                     {
                       self.env.extend :dynamic
-                      result = self.lexer.lineno
                     }
-                    brace_body tRCURLY
+                    brace_body
+                    tRCURLY
                     {
-                      _, line, body, _ = val
+                      (_, line), _, body, _ = val
 
                       result = body
                       result.line line
@@ -2011,11 +2034,11 @@ opt_block_args_tail: tCOMMA block_args_tail
                 | k_do
                     {
                       self.env.extend :dynamic
-                      result = self.lexer.lineno
                     }
-                    do_body kEND
+                    do_body
+                    kEND
                     {
-                      _, line, body, _ = val
+                      (_, line), _, body, _ = val
 
                       result = body
                       result.line line
@@ -2073,14 +2096,13 @@ opt_block_args_tail: tCOMMA block_args_tail
                     }
 
        case_body: k_when
-                    {
-                      result = self.lexer.lineno
-                    }
                     case_args then compstmt cases
                     {
-                      result = new_when(val[2], val[4])
-                      result.line val[1]
-                      result << val[5] if val[5]
+                      (_, line), case_args, _then, body, cases = val
+
+                      result = new_when case_args, body
+                      result.line line
+                      result << cases if cases
                     }
 
            cases: opt_else | case_body
@@ -2317,31 +2339,17 @@ opt_block_args_tail: tCOMMA block_args_tail
                       result = new_array_pattern_tail both, nil, nil, nil
                       result.line head.line
                     }
-                | p_args_head tSTAR tIDENTIFIER
-                    {
-                      head, _, (id, _line) = val
-
-                      result = new_array_pattern_tail head, true, id.to_sym, nil
-                      result.line head.line
-                    }
-                | p_args_head tSTAR tIDENTIFIER tCOMMA p_args_post
+                | p_args_head p_rest
                     {
-                      head, _, (id, _line), _, post = val
+                      head, (rest, _) = val
 
-                      result = new_array_pattern_tail head, true, id.to_sym, post
-                      result.line head.line
+                      result = new_array_pattern_tail(head, true, rest, nil).line head.line
                     }
-                | p_args_head tSTAR
+                | p_args_head p_rest tCOMMA p_args_post
                     {
-                      expr, _ = val
-
-                      result = new_array_pattern_tail(expr, true, nil, nil).line expr.line
-                    }
-                | p_args_head tSTAR tCOMMA p_args_post
-                    {
-                      head, _, _, post = val
+                      head, (rest, _), _, post = val
 
-                      result = new_array_pattern_tail(head, true, nil, post).line head.line
+                      result = new_array_pattern_tail(head, true, rest, post).line head.line
                     }
                 | p_args_tail
 
@@ -2716,15 +2724,17 @@ opt_block_args_tail: tCOMMA block_args_tail
 
            words: tWORDS_BEG tSPACE tSTRING_END
                     {
-                      (_, line), _, _ = val
+                      (_, line), _, (_, line_max) = val
 
                       result = s(:array).line line
+                      result.line_max = line_max
                     }
                 | tWORDS_BEG word_list tSTRING_END
                     {
-                      (_, line), list, _ = val
+                      (_, line), list, (_, line_max) = val
 
                       result = list.line line
+                      result.line_max = line_max
                     }
 
        word_list: none
@@ -2744,15 +2754,17 @@ opt_block_args_tail: tCOMMA block_args_tail
 
          symbols: tSYMBOLS_BEG tSPACE tSTRING_END
                     {
-                      (_, line), _, _ = val
+                      (_, line), _, (_, line_max) = val
 
                       result = s(:array).line line
+                      result.line_max = line_max
                     }
                 | tSYMBOLS_BEG symbol_list tSTRING_END
                     {
-                      (_, line), list, _, = val
-                      list.line line
-                      result = list
+                      (_, line), list, (_, line_max), = val
+
+                      result = list.line line
+                      result.line_max = line_max
                     }
 
      symbol_list: none
@@ -2767,28 +2779,32 @@ opt_block_args_tail: tCOMMA block_args_tail
 
           qwords: tQWORDS_BEG tSPACE tSTRING_END
                     {
-                      (_, line), _, _ = val
+                      (_, line), _, (_, line_max) = val
 
                       result = s(:array).line line
+                      result.line_max = line_max
                     }
                 | tQWORDS_BEG qword_list tSTRING_END
                     {
-                      (_, line), list, _ = val
+                      (_, line), list, (_, line_max) = val
 
                       result = list.line line
+                      result.line_max = line_max
                     }
 
         qsymbols: tQSYMBOLS_BEG tSPACE tSTRING_END
                     {
-                      (_, line), _, _ = val
+                      (_, line), _, (_, line_max) = val
 
                       result = s(:array).line line
+                      result.line_max = line_max
                     }
                 | tQSYMBOLS_BEG qsym_list tSTRING_END
                     {
-                      (_, line), list, _ = val
+                      (_, line), list, (_, line_max) = val
 
                       result = list.line line
+                      result.line_max = line_max
                     }
 
       qword_list: none
@@ -2863,7 +2879,6 @@ regexp_contents: none
                                 lexer.brace_nest,
                                 lexer.string_nest, # TODO: remove
                                 lexer.lex_state,
-                                lexer.lineno,
                                ]
 
                       lexer.cmdarg.push false
@@ -2878,9 +2893,9 @@ regexp_contents: none
                     compstmt
                     tSTRING_DEND
                     {
-                      _, memo, stmt, _ = val
+                      (_, line), memo, stmt, _ = val
 
-                      lex_strterm, brace_nest, string_nest, oldlex_state, line = memo
+                      lex_strterm, brace_nest, string_nest, oldlex_state = memo
                       # TODO: heredoc_indent
 
                       lexer.lex_strterm = lex_strterm
@@ -2940,11 +2955,11 @@ regexp_contents: none
 
             dsym: tSYMBEG string_contents tSTRING_END
                     {
-                      _, result, _ = val
+                      (_, line), result, _ = val
 
                       lexer.lex_state = EXPR_END
 
-                      result ||= s(:str, "").line lexer.lineno
+                      result ||= s(:str, "").line line
 
                       case result.sexp_type
                       when :dstr then
@@ -2980,15 +2995,15 @@ regexp_contents: none
                 | tCONSTANT
                 | tCVAR
 
-keyword_variable: kNIL      { result = s(:nil).line lexer.lineno }
-                | kSELF     { result = s(:self).line lexer.lineno }
-                | kTRUE     { result = s(:true).line lexer.lineno }
-                | kFALSE    { result = s(:false).line lexer.lineno }
-                | k__FILE__ { result = s(:str, self.file).line lexer.lineno }
-                | k__LINE__ { result = s(:lit, lexer.lineno).line lexer.lineno }
+keyword_variable: kNIL      { (_, line), = val; result = s(:nil).line line }
+                | kSELF     { (_, line), = val; result = s(:self).line line }
+                | kTRUE     { (_, line), = val; result = s(:true).line line }
+                | kFALSE    { (_, line), = val; result = s(:false).line line }
+                | k__FILE__ { (_, line), = val; result = s(:str, self.file).line line }
+                | k__LINE__ { (_, line), = val; result = s(:lit, line).line line }
                 | k__ENCODING__
                     {
-                      l = lexer.lineno
+                      (_, l), = val
                       result =
                         if defined? Encoding then
                           s(:colon2, s(:const, :Encoding).line(l), :UTF_8).line l
@@ -3151,12 +3166,12 @@ f_opt_paren_args: f_paren_args
                 |
                     {
                       result = args val
-                      # result.line lexer.lineno
                     }
 
     args_forward: tBDOT3
                     {
-                      result = s(:forward_args).line lexer.lineno
+                      (_, line), = val
+                      result = s(:forward_args).line line
                     }
 
        f_bad_arg: tCONSTANT
@@ -3210,7 +3225,14 @@ f_opt_paren_args: f_paren_args
                         result = s(:args, list).line list.line
                       end
 
-                      result << (Sexp === item ? item : item.first)
+                      if Sexp === item then
+                        line_max = item.line_max
+                      else
+                        item, line_max = item
+                      end
+
+                      result << item
+                      result.line_max = line_max
                     }
 
          f_label: tLABEL
@@ -3287,9 +3309,10 @@ f_opt_paren_args: f_paren_args
                     }
                 | kwrest_mark
                     {
+                      (_, line), = val
                       id = :"**"
-                      self.env[id] = :lvar # TODO: needed?!?
-                      result = [id, lexer.lineno] # TODO: tPOW/tDSTAR include lineno
+                      self.env[id] = :lvar
+                      result = [id, line]
                     }
 
            f_opt: f_arg_asgn
@@ -3347,9 +3370,10 @@ f_opt_paren_args: f_paren_args
                     }
                 | restarg_mark
                     {
+                      (_, line), = val
                       name = :"*"
                       self.env[name] = :lvar
-                      result = [name, lexer.lineno] # FIX: tSTAR to include lineno
+                      result = [name, line]
                     }
 
      blkarg_mark: tAMPER2 | tAMPER
@@ -3440,6 +3464,11 @@ f_opt_paren_args: f_paren_args
                       line = arg.line
                       result = s(:array, s(:kwsplat, arg).line(line)).line line
                     }
+                | tDSTAR
+                    {
+                      (_, line), = val
+                      result = s(:array, s(:kwsplat).line(line)).line line
+                    }
 
        operation: tIDENTIFIER | tCONSTANT | tFID
       operation2: tIDENTIFIER | tCONSTANT | tFID | op
@@ -3454,11 +3483,10 @@ f_opt_paren_args: f_paren_args
        opt_terms:  | terms
           opt_nl:  | tNL
           rparen: opt_nl tRPAREN
-                    # TODO:
-                    # {
-                    #   _, close = val
-                    #   result = [close, lexer.lineno]
-                    # }
+                    {
+                      _, close = val # TODO: include lineno in close?
+                      result = [close, lexer.lineno]
+                    }
         rbracket: opt_nl tRBRACK
                     {
                       _, close = val