ruby_parser 3.19.1 → 3.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2901404db3548ad6415060c14df20ae11431fff4a97420659187601a534eb256
-  data.tar.gz: 69705481ccbd6a8ffafbb81c25c40890a4683a19440196a19bbcc119f093612a
+  metadata.gz: 1fe94228dc0622091501dfb99f5fe522983b9ac8daa618eaf50e8925ce818aae
+  data.tar.gz: f40651573fa4769fdb77e2bdddc1429aa7b5a02c78753bf762311fac18d37dc7
 SHA512:
-  metadata.gz: 1a5d89ba1fed1a0a49b5eb71eeb8cc6f80a396d6eaf49bec5742d62cd503916b90136ae689de4fa3a5de180544ba3ef6e8fca03e52bd8349b32c65dfa7962a28
-  data.tar.gz: c68ae86de3cbd9a1b86b6c5acbd0ecc8d809a30c42f7b50217d5038f262a6f61a3baa739332285d59158af9d3c9c3c8d8742e2eca499cf41536f14332e9f7eb9
+  metadata.gz: 52eeaa22c91a134e7d61fd11d8ecf366b6634f80940450802460f57dcd2e1483cfdfabc455007b11c3bf468974d24c78641b0c0cd677d366070a11da7da63acc
+  data.tar.gz: f517db6a7e6bb364638a6aa3c81b6304d6b1b90b6e92702675b4a601badb117efdf5254ff753675274d6ed95b9db097f1ef7d82c601b7b664ae35ff76e4d6415

data/History.rdoc

@@ -1,3 +1,27 @@
+=== 3.20.0 / 2023-03-04
+
+* 1 major enhancement:
+
+  * Added tentative 3.2 support.
+
+* 1 minor enhancement:
+
+  * Change minimum ruby version to 2.6. (want higher)
+
+* 1 bug fix:
+
+  * Fix up compare tasks for ruby 3.2 differences.
+
+=== 3.19.2 / 2022-12-03
+
+* 5 bug fixes:
+
+  * Fixed bug parsing array patterns using %w, %i, etc.
+  * Fixed dedenting when heredoc has only empty line and interpolation. (mvz)
+  * Fixed dsym unescaping. (mvz)
+  * Fixed vars in pattern matching that should be lasgn, not lvar.
+  * find_pat mid-patterns are now splatted inline, not wrapped in an array_pat.
+
 === 3.19.1 / 2022-04-05
 
 * 2 bug fixes:

data/Manifest.txt

@@ -31,6 +31,8 @@ lib/ruby30_parser.rb
 lib/ruby30_parser.y
 lib/ruby31_parser.rb
 lib/ruby31_parser.y
+lib/ruby32_parser.rb
+lib/ruby32_parser.y
 lib/ruby3_parser.yy
 lib/ruby_lexer.rb
 lib/ruby_lexer.rex

data/README.rdoc

@@ -68,8 +68,9 @@ To add a new version:
 * New parser should be generated from lib/ruby[3]_parser.yy.
 * Extend lib/ruby[3]_parser.yy with new class name.
 * Add new version number to V2/V3 in Rakefile for rule creation.
-* Add new (full) version to `ruby_parse` section of Rakefile for rake compare
+* Add new `ruby_parse "x.y.z"` line to Rakefile for rake compare (line ~300).
 * Require generated parser in lib/ruby_parser.rb.
+* Add new V## = ::Ruby##Parser; end to ruby_parser.rb (bottom of file).
 * Add empty TestRubyParserShared##Plus module and TestRubyParserV## to test/test_ruby_parser.rb.
 * Extend Manifest.txt with generated file names.
 * Add new version number to sexp_processor's pt_testcase.rb in all_versions

data/Rakefile

@@ -12,9 +12,10 @@ Hoe.add_include_dirs "lib"
 Hoe.add_include_dirs "../../sexp_processor/dev/lib"
 Hoe.add_include_dirs "../../minitest/dev/lib"
 Hoe.add_include_dirs "../../oedipus_lex/dev/lib"
+Hoe.add_include_dirs "../../ruby2ruby/dev/lib"
 
 V2   = %w[20 21 22 23 24 25 26 27]
-V3   = %w[30 31]
+V3   = %w[30 31 32]
 
 VERS = V2 + V3
 
@@ -37,7 +38,7 @@ Hoe.spec "ruby_parser" do
 
   dependency "racc", "~> 1.5", :developer
 
-  require_ruby_version [">= 2.1", "< 4"]
+  require_ruby_version [">= 2.6", "< 4"]
 
   if plugin? :perforce then     # generated files
     VERS.each do |n|
@@ -185,6 +186,9 @@ def ruby_parse version
   file c_parse_y => c_tarball do
     in_compare do
       extract_glob = case
+                     # defs/id.def
+                     when version > "3.2" then
+                       "{id.h,parse.y,tool/{id2token.rb,lib/vpath.rb},defs/id.def}"
                      when version > "2.7" then
                        "{id.h,parse.y,tool/{id2token.rb,lib/vpath.rb}}"
                      else
@@ -194,7 +198,8 @@ def ruby_parse version
 
       Dir.chdir ruby_dir do
         if File.exist? "tool/id2token.rb" then
-          sh "ruby tool/id2token.rb --path-separator=.:./ id.h parse.y | expand > ../#{parse_y}"
+          args = version < "3.2" ? "--path-separator=.:./ id.h" : ""
+          sh "ruby tool/id2token.rb #{args} parse.y | expand > ../#{parse_y}"
         else
           sh "expand parse.y > ../#{parse_y}"
         end
@@ -249,7 +254,7 @@ def ruby_parse version
   end
 
   task :realclean do
-    rm_f Dir[c_parse_y, tarball]
+    rm_f Dir[c_parse_y, c_tarball]
   end
 end
 
@@ -291,10 +296,11 @@ ruby_parse "2.2.10"
 ruby_parse "2.3.8"
 ruby_parse "2.4.10"
 ruby_parse "2.5.9"
-ruby_parse "2.6.9"
-ruby_parse "2.7.5"
-ruby_parse "3.0.3"
-ruby_parse "3.1.1"
+ruby_parse "2.6.10"
+ruby_parse "2.7.7"
+ruby_parse "3.0.5"
+ruby_parse "3.1.3"
+ruby_parse "3.2.1"
 
 task :debug => :isolate do
   ENV["V"] ||= VERS.last

data/lib/ruby20_parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.6.0
+# This file is automatically generated by Racc 1.6.2
 # from Racc grammar file "".
 #
 

data/lib/ruby21_parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.6.0
+# This file is automatically generated by Racc 1.6.2
 # from Racc grammar file "".
 #
 

data/lib/ruby22_parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.6.0
+# This file is automatically generated by Racc 1.6.2
 # from Racc grammar file "".
 #
 

data/lib/ruby23_parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.6.0
+# This file is automatically generated by Racc 1.6.2
 # from Racc grammar file "".
 #
 

data/lib/ruby24_parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.6.0
+# This file is automatically generated by Racc 1.6.2
 # from Racc grammar file "".
 #
 

data/lib/ruby25_parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.6.0
+# This file is automatically generated by Racc 1.6.2
 # from Racc grammar file "".
 #
 

data/lib/ruby26_parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.6.0
+# This file is automatically generated by Racc 1.6.2
 # from Racc grammar file "".
 #
 

data/lib/ruby27_parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.6.0
+# This file is automatically generated by Racc 1.6.2
 # from Racc grammar file "".
 #
 
@@ -7722,10 +7722,10 @@ racc_reduce_table = [
   1, 364, :_reduce_none,
   1, 364, :_reduce_none,
   1, 364, :_reduce_none,
-  1, 364, :_reduce_none,
-  1, 364, :_reduce_none,
-  1, 364, :_reduce_none,
-  1, 364, :_reduce_none,
+  1, 364, :_reduce_548,
+  1, 364, :_reduce_549,
+  1, 364, :_reduce_550,
+  1, 364, :_reduce_551,
   1, 364, :_reduce_552,
   1, 364, :_reduce_none,
   1, 344, :_reduce_554,
@@ -11813,13 +11813,29 @@ end
 
 # reduce 547 omitted
 
-# reduce 548 omitted
+def _reduce_548(val, _values, result)
+                      result = ary_to_pat val[0]
+
+    result
+end
+
+def _reduce_549(val, _values, result)
+                      result = ary_to_pat val[0]
 
-# reduce 549 omitted
+    result
+end
+
+def _reduce_550(val, _values, result)
+                      result = ary_to_pat val[0]
+
+    result
+end
 
-# reduce 550 omitted
+def _reduce_551(val, _values, result)
+                      result = ary_to_pat val[0]
 
-# reduce 551 omitted
+    result
+end
 
 def _reduce_552(val, _values, result)
                       # TODO? if (!($$ = gettable(p, $1, &@$))) $$ = NEW_BEGIN(0, &@$);
@@ -11835,7 +11851,7 @@ end
 def _reduce_554(val, _values, result)
                       # TODO: error_duplicate_pattern_variable(p, $1, &@1);
                       # TODO: assignable(p, $1, 0, &@$);
-                      result = wrap :lvar, val[0]
+                      result = wrap :lasgn, val[0]
 
     result
 end

data/lib/ruby27_parser.y

@@ -2453,9 +2453,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, &@$);
@@ -2469,7 +2481,7 @@ opt_block_args_tail: tCOMMA block_args_tail
                     {
                       # TODO: error_duplicate_pattern_variable(p, $1, &@1);
                       # TODO: assignable(p, $1, 0, &@$);
-                      result = wrap :lvar, val[0]
+                      result = wrap :lasgn, val[0]
                     }
 
        p_var_ref: tCARET tIDENTIFIER

data/lib/ruby30_parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.6.0
+# This file is automatically generated by Racc 1.6.2
 # from Racc grammar file "".
 #
 
@@ -7841,10 +7841,10 @@ racc_reduce_table = [
   1, 371, :_reduce_none,
   1, 371, :_reduce_none,
   1, 371, :_reduce_none,
-  1, 371, :_reduce_none,
-  1, 371, :_reduce_none,
-  1, 371, :_reduce_none,
-  1, 371, :_reduce_none,
+  1, 371, :_reduce_561,
+  1, 371, :_reduce_562,
+  1, 371, :_reduce_563,
+  1, 371, :_reduce_564,
   1, 371, :_reduce_565,
   1, 371, :_reduce_none,
   1, 350, :_reduce_567,
@@ -12038,13 +12038,29 @@ end
 
 # reduce 560 omitted
 
-# reduce 561 omitted
+def _reduce_561(val, _values, result)
+                      result = ary_to_pat val[0]
+
+    result
+end
+
+def _reduce_562(val, _values, result)
+                      result = ary_to_pat val[0]
 
-# reduce 562 omitted
+    result
+end
+
+def _reduce_563(val, _values, result)
+                      result = ary_to_pat val[0]
+
+    result
+end
 
-# reduce 563 omitted
+def _reduce_564(val, _values, result)
+                      result = ary_to_pat val[0]
 
-# reduce 564 omitted
+    result
+end
 
 def _reduce_565(val, _values, result)
                       # TODO? if (!($$ = gettable(p, $1, &@$))) $$ = NEW_BEGIN(0, &@$);
@@ -12060,7 +12076,7 @@ end
 def _reduce_567(val, _values, result)
                       # TODO: error_duplicate_pattern_variable(p, $1, &@1);
                       # TODO: assignable(p, $1, 0, &@$);
-                      result = wrap :lvar, val[0]
+                      result = wrap :lasgn, val[0]
 
     result
 end

data/lib/ruby30_parser.y

@@ -2534,9 +2534,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, &@$);
@@ -2550,7 +2562,7 @@ opt_block_args_tail: tCOMMA block_args_tail
                     {
                       # TODO: error_duplicate_pattern_variable(p, $1, &@1);
                       # TODO: assignable(p, $1, 0, &@$);
-                      result = wrap :lvar, val[0]
+                      result = wrap :lasgn, val[0]
                     }
 
        p_var_ref: tCARET tIDENTIFIER

data/lib/ruby31_parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.6.0
+# This file is automatically generated by Racc 1.6.2
 # from Racc grammar file "".
 #
 
@@ -8153,10 +8153,10 @@ racc_reduce_table = [
   1, 373, :_reduce_none,
   1, 373, :_reduce_none,
   1, 373, :_reduce_none,
-  1, 373, :_reduce_none,
-  1, 373, :_reduce_none,
-  1, 373, :_reduce_none,
-  1, 373, :_reduce_none,
+  1, 373, :_reduce_569,
+  1, 373, :_reduce_570,
+  1, 373, :_reduce_571,
+  1, 373, :_reduce_572,
   1, 373, :_reduce_573,
   1, 373, :_reduce_none,
   1, 351, :_reduce_575,
@@ -12399,13 +12399,29 @@ end
 
 # reduce 568 omitted
 
-# reduce 569 omitted
+def _reduce_569(val, _values, result)
+                      result = ary_to_pat val[0]
+
+    result
+end
+
+def _reduce_570(val, _values, result)
+                      result = ary_to_pat val[0]
 
-# reduce 570 omitted
+    result
+end
+
+def _reduce_571(val, _values, result)
+                      result = ary_to_pat val[0]
+
+    result
+end
 
-# reduce 571 omitted
+def _reduce_572(val, _values, result)
+                      result = ary_to_pat val[0]
 
-# reduce 572 omitted
+    result
+end
 
 def _reduce_573(val, _values, result)
                       # TODO? if (!($$ = gettable(p, $1, &@$))) $$ = NEW_BEGIN(0, &@$);
@@ -12421,7 +12437,7 @@ end
 def _reduce_575(val, _values, result)
                       # TODO: error_duplicate_pattern_variable(p, $1, &@1);
                       # TODO: assignable(p, $1, 0, &@$);
-                      result = wrap :lvar, val[0]
+                      result = wrap :lasgn, val[0]
 
     result
 end

data/lib/ruby31_parser.y

@@ -2562,9 +2562,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, &@$);
@@ -2578,7 +2590,7 @@ opt_block_args_tail: tCOMMA block_args_tail
                     {
                       # TODO: error_duplicate_pattern_variable(p, $1, &@1);
                       # TODO: assignable(p, $1, 0, &@$);
-                      result = wrap :lvar, val[0]
+                      result = wrap :lasgn, val[0]
                     }
 
        p_var_ref: tCARET tIDENTIFIER