ruby_parser 3.20.2 → 3.20.3

data/lib/ruby31_parser.y

@@ -408,6 +408,7 @@ rule
        defs_head: k_def singleton dot_or_colon
                     {
                       lexer.lex_state = EXPR_FNAME
+                      self.in_argdef = true
                     }
                     def_name
                     {
@@ -1609,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
@@ -1724,7 +1726,7 @@ rule
     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
                     {
@@ -1828,6 +1830,7 @@ opt_block_args_tail: tCOMMA block_args_tail
                     {
                       # TODO: current_arg = 0
                       result = args val
+                      self.in_argdef = false
                     }
                 | tOROP
                     {
@@ -1839,6 +1842,7 @@ opt_block_args_tail: tCOMMA block_args_tail
                     {
                       # TODO: current_arg = 0
                       result = args val
+                      self.in_argdef = false
                     }
 
      opt_bv_decl: opt_nl
@@ -1888,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)
                     }
@@ -3068,11 +3074,13 @@ keyword_variable: kNIL      { (_, line), = val; result = s(:nil).line line }
 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
                     }
 
@@ -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
                     }
@@ -3324,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
@@ -3335,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