ruby_parser 3.20.1 → 3.20.3

data/lib/ruby31_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
                     }
 
@@ -408,6 +408,7 @@ rule
        defs_head: k_def singleton dot_or_colon
                     {
                       lexer.lex_state = EXPR_FNAME
+                      self.in_argdef = true
                     }
                     def_name
                     {
@@ -621,7 +622,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
@@ -1251,7 +1252,7 @@ rule
             args: arg_value
                     {
                       arg, = val
-                      lineno = arg.line || lexer.lineno # HACK
+                      lineno = arg.line
 
                       result = s(:array, arg).line lineno
                     }
@@ -1267,9 +1268,7 @@ 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)
                     }
 
@@ -1288,7 +1287,6 @@ rule
                     }
                 | args tCOMMA tSTAR arg_value
                     {
-                      # TODO: make all tXXXX terminals include lexer.lineno
                       arg, _, _, splat = val
                       result = self.arg_concat arg, splat
                     }
@@ -1317,7 +1315,6 @@ rule
                 | k_begin
                     {
                       lexer.cmdarg.push false
-                      result = self.lexer.lineno
                     }
                     bodystmt k_end
                     {
@@ -1327,11 +1324,10 @@ rule
                 | tLPAREN_ARG
                     {
                       lexer.lex_state = EXPR_ENDARG
-                      result = lexer.lineno
                     }
                     rparen
                     {
-                      _, line, _ = val
+                      (_, line), _, _ = val
                       result = s(:begin).line line
                     }
                 | tLPAREN_ARG
@@ -1347,9 +1343,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
@@ -1362,9 +1357,9 @@ rule
                     {
                       result = wrap :colon3, val[1]
                     }
-                | tLBRACK { result = lexer.lineno } aref_args rbracket
+                | tLBRACK aref_args rbracket
                     {
-                      _, line, args, (_, line_max) = val
+                      (_, line), args, (_, line_max) = val
 
                       result = args || s(:array)
                       result.sexp_type = :array # aref_args is :args
@@ -1480,9 +1475,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
@@ -1497,9 +1489,6 @@ rule
                       self.lexer.ignore_body_comments
                     }
                 | k_class tLSHFT
-                    {
-                      result = self.lexer.lineno
-                    }
                     expr
                     {
                       result = self.in_def
@@ -1511,16 +1500,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
@@ -1623,6 +1610,7 @@ rule
            k_def: kDEF
                     {
                       self.comments.push self.lexer.comments
+                      self.in_argdef = true
                     }
             k_do: kDO
       k_do_block: kDO_BLOCK
@@ -1662,20 +1650,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
+
+                      arg = arg.last if arg.sexp_type == :dummy
 
-                      result = s(:array, sym).line lexer.lineno
+                      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
@@ -1718,14 +1719,14 @@ rule
                     }
                 | tSTAR
                     {
-                      result = args [:*]
-                      result.line lexer.lineno # FIX: tSTAR -> line
+                      (_, line), = val
+                      result = args([:*]).line line
                     }
 
     f_any_kwrest: f_kwrest
                 | f_no_kwarg
 
-            f_eq: tEQL # TODO: self.in_argdef = false
+            f_eq: { self.in_argdef = false } tEQL
 
  block_args_tail: f_block_kwarg tCOMMA f_kwrest opt_f_block_arg
                     {
@@ -1829,15 +1830,19 @@ opt_block_args_tail: tCOMMA block_args_tail
                     {
                       # TODO: current_arg = 0
                       result = args val
+                      self.in_argdef = false
                     }
                 | tOROP
                     {
-                      result = s(:args).line lexer.lineno
+                      (_, line), = val
+
+                      result = s(:args).line line
                     }
                 | tPIPE block_param opt_bv_decl tPIPE
                     {
                       # TODO: current_arg = 0
                       result = args val
+                      self.in_argdef = false
                     }
 
      opt_bv_decl: opt_nl
@@ -1864,7 +1869,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
                     }
@@ -1874,7 +1879,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
@@ -1887,10 +1892,12 @@ opt_block_args_tail: tCOMMA block_args_tail
 
      f_larglist: tLPAREN2 f_args opt_bv_decl rparen
                     {
+                      self.in_argdef = false
                       result = args val
                     }
                 | f_args
                     {
+                      self.in_argdef = false
                       result = val[0]
                       result = 0 if result == s(:args)
                     }
@@ -1998,7 +2005,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
                     {
@@ -2008,11 +2016,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
@@ -2022,11 +2030,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
@@ -2084,14 +2092,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
@@ -2882,7 +2889,6 @@ regexp_contents: none
                                 lexer.brace_nest,
                                 lexer.string_nest, # TODO: remove
                                 lexer.lex_state,
-                                lexer.lineno,
                                ]
 
                       lexer.cmdarg.push false
@@ -2897,9 +2903,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
@@ -2959,11 +2965,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
@@ -2999,15 +3005,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
@@ -3068,11 +3074,13 @@ keyword_variable: kNIL      { result = s(:nil).line lexer.lineno }
 f_opt_paren_args: f_paren_args
                 | none
                     {
+                      self.in_argdef = false
                       result = end_args val
                     }
 
     f_paren_args: tLPAREN2 f_args rparen
                     {
+                      self.in_argdef = false
                       result = end_args val
                     }
 
@@ -3080,10 +3088,12 @@ f_opt_paren_args: f_paren_args
                 |   {
                       result = self.in_kwarg
                       self.in_kwarg = true
+                      self.in_argdef = true
                       self.lexer.lex_state |= EXPR_LABEL
                     }
                     f_args term
                     {
+                      self.in_argdef = false
                       result = end_args val
                     }
 
@@ -3170,12 +3180,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
@@ -3240,6 +3250,14 @@ f_opt_paren_args: f_paren_args
                     }
 
          f_label: tLABEL
+                    {
+                      label, = val
+                      # arg_var(p, formal_argument(p, $1));
+                      # p->cur_arg = get_id($1);
+                      # p->max_numparam = ORDINAL_PARAM;
+                      self.in_argdef = false
+                      result = label
+                    }
 
             f_kw: f_label arg_value
                     {
@@ -3248,6 +3266,7 @@ f_opt_paren_args: f_paren_args
 
                       identifier = label.to_sym
                       self.env[identifier] = :lvar
+                      self.in_argdef = true
 
                       kwarg  = s(:kwarg, identifier, arg).line line
                       result = s(:array, kwarg).line line
@@ -3258,6 +3277,7 @@ f_opt_paren_args: f_paren_args
 
                       id = label.to_sym
                       self.env[id] = :lvar
+                      self.in_argdef = true
 
                       result = s(:array, s(:kwarg, id).line(line)).line line
                     }
@@ -3268,6 +3288,7 @@ f_opt_paren_args: f_paren_args
                       (label, line), expr = val
                       id = label.to_sym
                       self.env[id] = :lvar
+                      self.in_argdef = true
 
                       result = s(:array, s(:kwarg, id, expr).line(line)).line line
                     }
@@ -3277,6 +3298,7 @@ f_opt_paren_args: f_paren_args
                       (label, line), = val
                       id = label.to_sym
                       self.env[id] = :lvar
+                      self.in_argdef = true
 
                       result = s(:array, s(:kwarg, id).line(line)).line line
                     }
@@ -3313,9 +3335,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
@@ -3323,10 +3346,10 @@ f_opt_paren_args: f_paren_args
                     arg_value
                     {
                       lhs, _, rhs = val
+                      self.in_argdef = true
                       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
@@ -3334,9 +3357,9 @@ f_opt_paren_args: f_paren_args
                     primary_value
                     {
                       lhs, _, rhs = val
+                      self.in_argdef = true
                       result = self.assignable lhs, rhs
                       # TODO? p->cur_arg = 0;
-                      # TODO? p->ctxt.in_argdef = 1;
                     }
 
   f_block_optarg: f_block_opt
@@ -3373,9 +3396,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
@@ -3480,11 +3504,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