- ruby32.y: fix using p_kwnorest in f_no_kwarg (#848)

whitequark · Apr 5, 2022 · 1d275fc · 1d275fc
1 parent 934bd00
commit 1d275fc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/lib/parser/ruby32.y b/lib/parser/ruby32.y
@@ -2252,11 +2252,14 @@ opt_block_args_tail:
 
       p_kwnorest: kwrest_mark kNIL
                     {
-                      result = [ @builder.match_nil_pattern(val[0], val[1]) ]
+                      result = val
                     }
 
     p_any_kwrest: p_kwrest
                 | p_kwnorest
+                    {
+                      result = [ @builder.match_nil_pattern(val[0][0], val[0][1]) ]
+                    }
 
          p_value: p_primitive
                 | p_primitive tDOT2 p_primitive
@@ -2969,7 +2972,7 @@ f_opt_paren_args: f_paren_args
 
       f_no_kwarg: p_kwnorest
                     {
-                      result = [ @builder.kwnilarg(val[0], val[1]) ]
+                      result = [ @builder.kwnilarg(val[0][0], val[0][1]) ]
                     }
 
         f_kwrest: kwrest_mark tIDENTIFIER

diff --git a/test/parse_helper.rb b/test/parse_helper.rb
@@ -7,7 +7,7 @@ module ParseHelper
   require 'parser/macruby'
   require 'parser/rubymotion'
 
-  ALL_VERSIONS = %w(1.8 1.9 2.0 2.1 2.2 2.3 2.4 2.5 2.6 2.7 3.0 3.1 mac ios)
+  ALL_VERSIONS = %w(1.8 1.9 2.0 2.1 2.2 2.3 2.4 2.5 2.6 2.7 3.0 3.1 3.2 mac ios)
 
   def setup
     @diagnostics = []