brakeman 5.2.1 → 6.1.2

data/bundle/ruby/{2.7.0/gems/ruby_parser-3.18.1/lib/ruby3_parser.yy → 3.3.0/gems/ruby_parser-3.20.3/lib/ruby31_parser.y}

@@ -1,10 +1,6 @@
 # -*- racc -*-
 
-#if V == 30
-class Ruby30Parser
-#else
-fail "version not specified or supported on code generation"
-#endif
+class Ruby31Parser
 
 token kCLASS kMODULE kDEF kUNDEF kBEGIN kRESCUE kENSURE kEND kIF kUNLESS
       kTHEN kELSIF kELSE kCASE kWHEN kWHILE kUNTIL kFOR kBREAK kNEXT
@@ -84,7 +80,7 @@ rule
                 | klBEGIN
                     {
                       if (self.in_def || self.in_single > 0) then
-                        debug 11
+                        debug 1
                         yyerror "BEGIN in method"
                       end
                       self.env.extend
@@ -100,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
                     }
 
@@ -139,7 +135,7 @@ rule
                 | error stmt
                     {
                       result = val[1]
-                      debug 12
+                      debug 2
                     }
 
    stmt_or_begin: stmt
@@ -211,7 +207,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
 
@@ -225,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
@@ -286,6 +283,22 @@ rule
 
                       result = s(:op_asgn, lhs1, rhs, lhs2.to_sym, id.to_sym).line line
                     }
+                | 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
+                    }
                 | backref tOP_ASGN command_rhs
                     {
                       self.backref_assign_error val[0]
@@ -339,7 +352,7 @@ rule
                       self.in_kwarg = true
                       self.env.extend
                     }
-                    p_expr
+                    p_top_expr_body
                     {
                       lhs, _, in_kwarg, rhs = val
 
@@ -359,7 +372,7 @@ rule
                       self.in_kwarg = true
                       self.env.extend
                     }
-                    p_expr
+                    p_top_expr_body
                     {
                       self.env.unextend
 
@@ -395,6 +408,7 @@ rule
        defs_head: k_def singleton dot_or_colon
                     {
                       lexer.lex_state = EXPR_FNAME
+                      self.in_argdef = true
                     }
                     def_name
                     {
@@ -608,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
@@ -679,7 +693,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 +705,7 @@ rule
                 | tCOLON3 tCONSTANT
                     {
                       if (self.in_def || self.in_single > 0) then
-                        debug 15
+                        debug 5
                         yyerror "dynamic constant assignment"
                       end
 
@@ -718,7 +732,7 @@ rule
 
                       result = self.assignable var
 
-                      debug 16
+                      debug 6
                     }
                 | primary_value tLBRACK2 opt_call_args rbracket
                     {
@@ -749,7 +763,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 +775,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 +794,7 @@ rule
 
            cpath: tCOLON3 cname
                     {
-                      _, (name, line) = val
-                      result = s(:colon3, name.to_sym).line line
+                      result = wrap :colon3, val[1]
                     }
                 | cname
                     {
@@ -806,9 +819,7 @@ rule
 
            fitem: fname
                     {
-                      (id, line), = val
-
-                      result = s(:lit, id.to_sym).line line
+                      result = wrap :lit, val[0]
                     }
                 | symbol
 
@@ -877,9 +888,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 +973,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 +1067,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
 
@@ -1148,8 +1132,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
                     {
@@ -1251,6 +1237,11 @@ rule
                       _, arg = val
                       result = s(:block_pass, arg).line arg.line
                     }
+                | tAMPER
+                    {
+                      (_, line), = val
+                      result = s(:block_pass).line line
+                    }
 
    opt_block_arg: tCOMMA block_arg
                     {
@@ -1261,7 +1252,7 @@ rule
             args: arg_value
                     {
                       arg, = val
-                      lineno = arg.line || lexer.lineno # HACK
+                      lineno = arg.line
 
                       result = s(:array, arg).line lineno
                     }
@@ -1277,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)
                     }
 
@@ -1298,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
                     }
@@ -1327,7 +1315,6 @@ rule
                 | k_begin
                     {
                       lexer.cmdarg.push false
-                      result = self.lexer.lineno
                     }
                     bodystmt k_end
                     {
@@ -1337,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
@@ -1357,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
@@ -1370,16 +1355,16 @@ 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
+                | 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
                     {
@@ -1425,7 +1410,7 @@ rule
                     }
                 | kNOT tLPAREN2 rparen
                     {
-                      debug 19
+                      debug 9
                     }
                 | fcall brace_block
                     {
@@ -1490,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
@@ -1507,9 +1489,6 @@ rule
                       self.lexer.ignore_body_comments
                     }
                 | k_class tLSHFT
-                    {
-                      result = self.lexer.lineno
-                    }
                     expr
                     {
                       result = self.in_def
@@ -1521,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
@@ -1633,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
@@ -1672,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
@@ -1728,13 +1719,15 @@ 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: { self.in_argdef = false } tEQL
+
  block_args_tail: f_block_kwarg tCOMMA f_kwrest opt_f_block_arg
                     {
                       result = call_args val
@@ -1837,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
@@ -1865,15 +1862,14 @@ 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
 
           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
                     }
@@ -1883,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
@@ -1896,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)
                     }
@@ -1967,13 +1965,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
                     {
@@ -2001,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
                     {
@@ -2011,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
@@ -2025,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
@@ -2087,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
@@ -2205,6 +2209,7 @@ opt_block_args_tail: tCOMMA block_args_tail
       p_lbracket: tLBRACK2 { push_pktbl }
 
     p_expr_basic: p_value
+                | p_variable
                 | p_const p_lparen p_args tRPAREN
                     {
                       lhs, _, args, _ = val
@@ -2480,7 +2485,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 ?
@@ -2489,9 +2494,12 @@ 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]
+                    }
+                | tSTRING_BEG string_contents tLABEL_END
+                    {
+                      # you can't actually get here the way I lex labels
+                      debug 11
                     }
 
         p_kwrest: kwrest_mark tIDENTIFIER
@@ -2551,8 +2559,8 @@ opt_block_args_tail: tCOMMA block_args_tail
 
                       result = s(:dot3, v1, nil).line v1.line
                     }
-                | p_variable
                 | p_var_ref
+                | p_expr_ref
                 | p_const
                 | tBDOT2 p_primitive
                     {
@@ -2572,9 +2580,21 @@ opt_block_args_tail: tCOMMA block_args_tail
                 | xstring
                 | regexp
                 | words
+                    {
+                      result = ary_to_pat val[0]
+                    }
                 | qwords
+                    {
+                      result = ary_to_pat val[0]
+                    }
                 | symbols
+                    {
+                      result = ary_to_pat val[0]
+                    }
                 | qsymbols
+                    {
+                      result = ary_to_pat val[0]
+                    }
                 | keyword_variable
                     {
                       # TODO? if (!($$ = gettable(p, $1, &@$))) $$ = NEW_BEGIN(0, &@$);
@@ -2586,26 +2606,31 @@ 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 :lasgn, val[0]
                     }
 
        p_var_ref: tCARET tIDENTIFIER
                     {
-                      _, (id, line) = val
-
                       # TODO: check id against env for lvar or dvar
+                      result = wrap :lvar, val[1]
+                    }
+                | tCARET nonlocal_var
+                    {
+                      _, var = val
+                      result = var
+                    }
 
-                      result = s(:lvar, id.to_sym).line line
+      p_expr_ref: tCARET tLPAREN expr_value rparen
+                    {
+                      _, _, expr, _ = val
+                      result = expr # TODO? s(:begin, expr).line expr.line
                     }
 
          p_const: tCOLON3 cname
                     {
-                      _, (id, line) = val
-                      result = s(:colon3, id.to_sym).line line
+                      result = wrap :colon3, val[1]
                     }
                 | p_const tCOLON2 cname
                     {
@@ -2617,8 +2642,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]
                     }
 ######################################################################
 
@@ -2676,7 +2700,7 @@ opt_block_args_tail: tCOMMA block_args_tail
 
           string: tCHAR
                     {
-                      debug 36
+                      debug 12
                     }
                 | string1
                 | string string1
@@ -2710,15 +2734,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
@@ -2738,15 +2764,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
@@ -2761,28 +2789,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
@@ -2857,7 +2889,6 @@ regexp_contents: none
                                 lexer.brace_nest,
                                 lexer.string_nest, # TODO: remove
                                 lexer.lex_state,
-                                lexer.lineno,
                                ]
 
                       lexer.cmdarg.push false
@@ -2872,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
@@ -2897,25 +2928,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
 
@@ -2924,28 +2952,24 @@ 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
 
             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
@@ -2955,7 +2979,7 @@ regexp_contents: none
                       when :evstr then
                         result = s(:dsym, "", result).line result.line
                       else
-                        debug 38
+                        debug 14
                       end
                     }
 
@@ -2971,21 +2995,25 @@ regexp_contents: none
                 | tRATIONAL
                 | tIMAGINARY
 
+    nonlocal_var: tIVAR { result = wrap :ivar, val[0] }
+                | tGVAR { result = wrap :gvar, val[0] }
+                | tCVAR { result = wrap :cvar, val[0] }
+
    user_variable: tIDENTIFIER
                 | tIVAR
                 | tGVAR
                 | 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
@@ -3015,7 +3043,7 @@ keyword_variable: kNIL      { result = s(:nil).line lexer.lineno }
                 | keyword_variable
                     {
                       result = self.assignable val[0]
-                      debug 39
+                      debug 15
                     }
 
          backref: tNTH_REF
@@ -3046,19 +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
                     {
-                      result = end_args val
-                    }
-                | tLPAREN2 f_arg tCOMMA args_forward rparen
-                    {
-                      result = end_args val
-                    }
-                | tLPAREN2 args_forward rparen
-                    {
+                      self.in_argdef = false
                       result = end_args val
                     }
 
@@ -3066,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
                     }
 
@@ -3086,6 +3110,7 @@ f_opt_paren_args: f_paren_args
                       result = args val
                     }
                 | f_block_arg
+                | args_forward
 
    opt_args_tail: tCOMMA args_tail
                     {
@@ -3155,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
@@ -3214,10 +3239,25 @@ 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
+                    {
+                      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
                     {
@@ -3226,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
@@ -3236,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
                     }
@@ -3246,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
                     }
@@ -3255,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
                     }
@@ -3291,22 +3335,31 @@ 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 tEQL arg_value
+           f_opt: f_arg_asgn
+                    f_eq
+                    arg_value
                     {
                       lhs, _, rhs = val
+                      self.in_argdef = true
                       result = self.assignable lhs, rhs
                       # TODO: detect duplicate names
+                      # TODO? p->cur_arg = 0;
                     }
 
-     f_block_opt: f_arg_asgn tEQL primary_value
+     f_block_opt: f_arg_asgn
+                    f_eq
+                    primary_value
                     {
                       lhs, _, rhs = val
+                      self.in_argdef = true
                       result = self.assignable lhs, rhs
+                      # TODO? p->cur_arg = 0;
                     }
 
   f_block_optarg: f_block_opt
@@ -3343,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
@@ -3358,6 +3412,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
                     {
@@ -3404,10 +3464,17 @@ f_opt_paren_args: f_paren_args
                     }
                 | tLABEL arg_value
                     {
-                      (label, line), arg = val
+                      label, arg = val
 
-                      lit = s(:lit, label.to_sym).line line
-                      result = s(:array, lit, arg).line line
+                      lit = wrap :lit, label
+                      result = s(:array, lit, arg).line lit.line
+                    }
+                | tLABEL
+                    {
+                      lit = wrap :lit, val[0]
+                      arg = nil
+
+                      result = s(:array, lit, arg).line lit.line
                     }
                 | tSTRING_BEG string_contents tLABEL_END arg_value
                     {
@@ -3437,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