ruby_parser 3.20.2 → 3.20.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ecb31322a35ef752328921f895d350d220a56e7ed6fb36462742fefc7962f55
-  data.tar.gz: aac07b5fa420c5d9c86c8b32c9d0232f1760c16354a9765530a6a1a87a209cfa
+  metadata.gz: 4c0c3e107b8953bdbaf64c24c32d5428696fa648398c4fdc896cba560547341b
+  data.tar.gz: b268454b6584eee700d5d90e37c7986e252a024b89422d47db69d5c0cfd7f917
 SHA512:
-  metadata.gz: 51239eb0334a8fbc60f6e7a8011853a126f3c6db1889bc5204652a7f0d33791f7d704ed0334a5061deb08e4a82fd10a299565e71cc2861b6a869a718dd87057c
-  data.tar.gz: acfd8ce38fdbea35fbb89664e445deee0c2ab686e0fb5e4db3cc151f42ef6305c412939ce2e77a95e66d9bd2856e33d1098c0d12cb05eb99b82616bda5f444d2
+  metadata.gz: f466e027ad5467b7a799a44378756fb082cd86d59c7696815347af2be9360b21f2ff9f5f5e8687b7073cc9ab2432330808a07eaee57e8802783ffe6b6a16b602
+  data.tar.gz: 8eb1af21a6936f44bcc8ea42b8dae4773e1a86a8e4815c67a536e1d10363e5c95123d77c04402f156e8f9e7b786b21ff382d3134a650c6428f903552a61ec495

data/History.rdoc

@@ -1,3 +1,15 @@
+=== 3.20.3 / 2023-07-11
+
+* 2 minor enhancements:
+
+  * Added Parser#in_argdef and integrated into 3.x parsers.
+  * Improved tools/munge.rb to handler MRI 3.2 output
+
+* 2 bug fixes:
+
+  * Fixed process_dots to properly deal with paren-less forward_args. (eric1234)
+  * Fixed tools/ripper.rb to properly print ripper sexp at the end
+
 === 3.20.2 / 2023-06-06
 
 * 1 bug fix:

data/lib/ruby30_parser.rb

@@ -8013,7 +8013,7 @@ racc_reduce_table = [
   3, 395, :_reduce_692,
   1, 309, :_reduce_693,
   3, 309, :_reduce_694,
-  1, 396, :_reduce_none,
+  1, 396, :_reduce_695,
   2, 397, :_reduce_696,
   1, 397, :_reduce_697,
   2, 398, :_reduce_698,
@@ -9109,6 +9109,7 @@ end
 
 def _reduce_64(val, _values, result)
                       lexer.lex_state = EXPR_FNAME
+                      self.in_argdef = true
 
     result
 end
@@ -10806,6 +10807,7 @@ end
 
 def _reduce_366(val, _values, result)
                       self.comments.push self.lexer.comments
+                      self.in_argdef = true
 
     result
 end
@@ -11105,6 +11107,7 @@ end
 def _reduce_424(val, _values, result)
                       # TODO: current_arg = 0
                       result = args val
+                      self.in_argdef = false
 
     result
 end
@@ -11120,6 +11123,7 @@ end
 def _reduce_426(val, _values, result)
                       # TODO: current_arg = 0
                       result = args val
+                      self.in_argdef = false
 
     result
 end
@@ -11182,12 +11186,14 @@ def _reduce_435(val, _values, result)
 end
 
 def _reduce_436(val, _values, result)
+                      self.in_argdef = false
                       result = args val
 
     result
 end
 
 def _reduce_437(val, _values, result)
+                      self.in_argdef = false
                       result = val[0]
                       result = 0 if result == s(:args)
 
@@ -12678,12 +12684,14 @@ end
 # reduce 654 omitted
 
 def _reduce_655(val, _values, result)
+                      self.in_argdef = false
                       result = end_args val
 
     result
 end
 
 def _reduce_656(val, _values, result)
+                      self.in_argdef = false
                       result = end_args val
 
     result
@@ -12706,12 +12714,14 @@ end
 def _reduce_660(val, _values, result)
                       result = self.in_kwarg
                       self.in_kwarg = true
+                      self.in_argdef = true
                       self.lexer.lex_state |= EXPR_LABEL
 
     result
 end
 
 def _reduce_661(val, _values, result)
+                      self.in_argdef = false
                       result = end_args val
 
     result
@@ -12921,7 +12931,16 @@ def _reduce_694(val, _values, result)
     result
 end
 
-# reduce 695 omitted
+def _reduce_695(val, _values, result)
+                      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
+
+    result
+end
 
 def _reduce_696(val, _values, result)
                       # TODO: new_kw_arg
@@ -12929,6 +12948,7 @@ def _reduce_696(val, _values, result)
 
                       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
@@ -12941,6 +12961,7 @@ def _reduce_697(val, _values, result)
 
                       id = label.to_sym
                       self.env[id] = :lvar
+                      self.in_argdef = true
 
                       result = s(:array, s(:kwarg, id).line(line)).line line
 
@@ -12952,6 +12973,7 @@ def _reduce_698(val, _values, result)
                       (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
 
@@ -12963,6 +12985,7 @@ def _reduce_699(val, _values, result)
                       (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
 
@@ -13018,19 +13041,19 @@ end
 
 def _reduce_709(val, _values, result)
                       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;
 
     result
 end
 
 def _reduce_710(val, _values, result)
                       lhs, _, rhs = val
+                      self.in_argdef = true
                       result = self.assignable lhs, rhs
                       # TODO? p->cur_arg = 0;
-                      # TODO? p->ctxt.in_argdef = 1;
 
     result
 end

data/lib/ruby30_parser.y

@@ -392,6 +392,7 @@ rule
        defs_head: k_def singleton dot_or_colon
                     {
                       lexer.lex_state = EXPR_FNAME
+                      self.in_argdef = true
                     }
                     def_name
                     {
@@ -1588,6 +1589,7 @@ rule
            k_def: kDEF
                     {
                       self.comments.push self.lexer.comments
+                      self.in_argdef = true
                     }
             k_do: kDO
       k_do_block: kDO_BLOCK
@@ -1806,6 +1808,7 @@ opt_block_args_tail: tCOMMA block_args_tail
                     {
                       # TODO: current_arg = 0
                       result = args val
+                      self.in_argdef = false
                     }
                 | tOROP
                     {
@@ -1817,6 +1820,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
@@ -1866,10 +1870,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)
                     }
@@ -3027,11 +3033,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
                     }
                 | tLPAREN2 f_arg tCOMMA args_forward rparen
@@ -3047,10 +3055,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
                     }
 
@@ -3206,6 +3216,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
                     {
@@ -3214,6 +3232,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
@@ -3224,6 +3243,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
                     }
@@ -3234,6 +3254,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
                     }
@@ -3243,6 +3264,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
                     }
@@ -3290,10 +3312,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
@@ -3301,9 +3323,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