ruby_parser 3.18.0 → 3.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36780d9d3244dd62d13430987076d5e81ae2e536d6d2bfd259f8a612da3d94cc
-  data.tar.gz: bec4b32e7f7a8d9ae8e3202f30230f351a2fedc6e2ac4e984260486dbb7529c6
+  metadata.gz: dad59e40690dfb746fea4399e13d05f97b43cf562c2559c67d1f9b5868da86c5
+  data.tar.gz: 0c14605ecf34929f6d4865c20f085b6ef2a35533a70e530f261f9d04f44998cb
 SHA512:
-  metadata.gz: f28d02d2b14687e365bab3a353348b93a9df993be2d1afd3f2783b5b97ca016a6ca2f834ef61ebb4a4eae3decc38e1351349679f951f901bef09c25f23d44322
-  data.tar.gz: 276ecce4db1f72ed2ce0d276679e65419225a46b885d0050aa7ba6382b45033ccd24b5006a0d382f0aecdbb6c5a5fd93e3e826adeafccc3c47ee051b76772eee
+  metadata.gz: 4fa69e55ac577e55fa2945ef9c135b47359a646e654bc8cf9f2ead973852adb97350cf67ac5da549592ea583f4824cd5f6930a167fa19cf3f914cb6d6888093d
+  data.tar.gz: 0c13eb02ffaf3b3c60ef358be2fa8f70b951e947170d3eeb8a94e5c37bec5dc8282376e4ab3f03de99e49b6e2aac2aa13169b31c30de1067e1a290c1fd65803a

data/History.rdoc

@@ -1,3 +1,15 @@
+=== 3.18.1 / 2021-11-10
+
+* 1 minor enhancement:
+
+  * All parser tests are now explicitly testing line numbers at every level.
+
+* 3 bug fixes:
+
+  * Fixed endless method with noargs. (mitsuru)
+  * Fixed line numbers on some yield forms.
+  * Handle and clearly report if unifdef is missing.
+
 === 3.18.0 / 2021-10-27
 
 Holy crap... 58 commits! 2.7 and 3.0 are feature complete. Strings

data/Rakefile

@@ -75,8 +75,17 @@ def maybe_add_to_top path, string
   File.rename tmp_path, path
 end
 
+def unifdef?
+  @unifdef ||= system("which unifdef") or abort <<~EOM
+    unifdef not found!
+
+    Please install 'unifdef' package on your system or `rake generate` on a mac.
+  EOM
+end
+
 V2.each do |n|
   file "lib/ruby#{n}_parser.y" => "lib/ruby_parser.yy" do |t|
+    unifdef?
     cmd = 'unifdef -tk -DV=%s -UDEAD %s > %s || true' % [n, t.source, t.name]
     sh cmd
   end
@@ -86,6 +95,7 @@ end
 
 V3.each do |n|
   file "lib/ruby#{n}_parser.y" => "lib/ruby3_parser.yy" do |t|
+    unifdef?
     cmd = 'unifdef -tk -DV=%s -UDEAD %s > %s || true' % [n, t.source, t.name]
     sh cmd
   end

data/lib/ruby20_parser.rb

@@ -5131,19 +5131,25 @@ def _reduce_306(val, _values, result)
 end
 
 def _reduce_307(val, _values, result)
-                      result = new_yield val[2]
+                      (_, line), _, args, _ = val
+
+                      result = new_yield(args).line line
 
     result
 end
 
 def _reduce_308(val, _values, result)
-                      result = new_yield
+                      (_, line), _, _ = val
+
+                      result = new_yield.line line
 
     result
 end
 
 def _reduce_309(val, _values, result)
-                      result = new_yield
+                      (_, line), = val
+
+                      result = new_yield.line line
 
     result
 end

data/lib/ruby20_parser.y

@@ -1208,15 +1208,21 @@ rule
                     }
                 | kYIELD tLPAREN2 call_args rparen
                     {
-                      result = new_yield val[2]
+                      (_, line), _, args, _ = val
+
+                      result = new_yield(args).line line
                     }
                 | kYIELD tLPAREN2 rparen
                     {
-                      result = new_yield
+                      (_, line), _, _ = val
+
+                      result = new_yield.line line
                     }
                 | kYIELD
                     {
-                      result = new_yield
+                      (_, line), = val
+
+                      result = new_yield.line line
                     }
                 | kDEFINED opt_nl tLPAREN2 expr rparen
                     {

data/lib/ruby21_parser.rb

@@ -5162,19 +5162,25 @@ def _reduce_306(val, _values, result)
 end
 
 def _reduce_307(val, _values, result)
-                      result = new_yield val[2]
+                      (_, line), _, args, _ = val
+
+                      result = new_yield(args).line line
 
     result
 end
 
 def _reduce_308(val, _values, result)
-                      result = new_yield
+                      (_, line), _, _ = val
+
+                      result = new_yield.line line
 
     result
 end
 
 def _reduce_309(val, _values, result)
-                      result = new_yield
+                      (_, line), = val
+
+                      result = new_yield.line line
 
     result
 end

data/lib/ruby21_parser.y

@@ -1206,15 +1206,21 @@ rule
                     }
                 | kYIELD tLPAREN2 call_args rparen
                     {
-                      result = new_yield val[2]
+                      (_, line), _, args, _ = val
+
+                      result = new_yield(args).line line
                     }
                 | kYIELD tLPAREN2 rparen
                     {
-                      result = new_yield
+                      (_, line), _, _ = val
+
+                      result = new_yield.line line
                     }
                 | kYIELD
                     {
-                      result = new_yield
+                      (_, line), = val
+
+                      result = new_yield.line line
                     }
                 | kDEFINED opt_nl tLPAREN2 expr rparen
                     {

data/lib/ruby22_parser.rb

@@ -5196,19 +5196,25 @@ def _reduce_306(val, _values, result)
 end
 
 def _reduce_307(val, _values, result)
-                      result = new_yield val[2]
+                      (_, line), _, args, _ = val
+
+                      result = new_yield(args).line line
 
     result
 end
 
 def _reduce_308(val, _values, result)
-                      result = new_yield
+                      (_, line), _, _ = val
+
+                      result = new_yield.line line
 
     result
 end
 
 def _reduce_309(val, _values, result)
-                      result = new_yield
+                      (_, line), = val
+
+                      result = new_yield.line line
 
     result
 end

data/lib/ruby22_parser.y

@@ -1207,15 +1207,21 @@ rule
                     }
                 | kYIELD tLPAREN2 call_args rparen
                     {
-                      result = new_yield val[2]
+                      (_, line), _, args, _ = val
+
+                      result = new_yield(args).line line
                     }
                 | kYIELD tLPAREN2 rparen
                     {
-                      result = new_yield
+                      (_, line), _, _ = val
+
+                      result = new_yield.line line
                     }
                 | kYIELD
                     {
-                      result = new_yield
+                      (_, line), = val
+
+                      result = new_yield.line line
                     }
                 | kDEFINED opt_nl tLPAREN2 expr rparen
                     {

data/lib/ruby23_parser.rb

@@ -5203,19 +5203,25 @@ def _reduce_306(val, _values, result)
 end
 
 def _reduce_307(val, _values, result)
-                      result = new_yield val[2]
+                      (_, line), _, args, _ = val
+
+                      result = new_yield(args).line line
 
     result
 end
 
 def _reduce_308(val, _values, result)
-                      result = new_yield
+                      (_, line), _, _ = val
+
+                      result = new_yield.line line
 
     result
 end
 
 def _reduce_309(val, _values, result)
-                      result = new_yield
+                      (_, line), = val
+
+                      result = new_yield.line line
 
     result
 end

data/lib/ruby23_parser.y

@@ -1208,15 +1208,21 @@ rule
                     }
                 | kYIELD tLPAREN2 call_args rparen
                     {
-                      result = new_yield val[2]
+                      (_, line), _, args, _ = val
+
+                      result = new_yield(args).line line
                     }
                 | kYIELD tLPAREN2 rparen
                     {
-                      result = new_yield
+                      (_, line), _, _ = val
+
+                      result = new_yield.line line
                     }
                 | kYIELD
                     {
-                      result = new_yield
+                      (_, line), = val
+
+                      result = new_yield.line line
                     }
                 | kDEFINED opt_nl tLPAREN2 expr rparen
                     {

data/lib/ruby24_parser.rb

@@ -5234,19 +5234,25 @@ def _reduce_307(val, _values, result)
 end
 
 def _reduce_308(val, _values, result)
-                      result = new_yield val[2]
+                      (_, line), _, args, _ = val
+
+                      result = new_yield(args).line line
 
     result
 end
 
 def _reduce_309(val, _values, result)
-                      result = new_yield
+                      (_, line), _, _ = val
+
+                      result = new_yield.line line
 
     result
 end
 
 def _reduce_310(val, _values, result)
-                      result = new_yield
+                      (_, line), = val
+
+                      result = new_yield.line line
 
     result
 end

data/lib/ruby24_parser.y

@@ -1216,15 +1216,21 @@ rule
                     }
                 | kYIELD tLPAREN2 call_args rparen
                     {
-                      result = new_yield val[2]
+                      (_, line), _, args, _ = val
+
+                      result = new_yield(args).line line
                     }
                 | kYIELD tLPAREN2 rparen
                     {
-                      result = new_yield
+                      (_, line), _, _ = val
+
+                      result = new_yield.line line
                     }
                 | kYIELD
                     {
-                      result = new_yield
+                      (_, line), = val
+
+                      result = new_yield.line line
                     }
                 | kDEFINED opt_nl tLPAREN2 expr rparen
                     {

data/lib/ruby25_parser.rb

@@ -5234,19 +5234,25 @@ def _reduce_307(val, _values, result)
 end
 
 def _reduce_308(val, _values, result)
-                      result = new_yield val[2]
+                      (_, line), _, args, _ = val
+
+                      result = new_yield(args).line line
 
     result
 end
 
 def _reduce_309(val, _values, result)
-                      result = new_yield
+                      (_, line), _, _ = val
+
+                      result = new_yield.line line
 
     result
 end
 
 def _reduce_310(val, _values, result)
-                      result = new_yield
+                      (_, line), = val
+
+                      result = new_yield.line line
 
     result
 end

data/lib/ruby25_parser.y

@@ -1216,15 +1216,21 @@ rule
                     }
                 | kYIELD tLPAREN2 call_args rparen
                     {
-                      result = new_yield val[2]
+                      (_, line), _, args, _ = val
+
+                      result = new_yield(args).line line
                     }
                 | kYIELD tLPAREN2 rparen
                     {
-                      result = new_yield
+                      (_, line), _, _ = val
+
+                      result = new_yield.line line
                     }
                 | kYIELD
                     {
-                      result = new_yield
+                      (_, line), = val
+
+                      result = new_yield.line line
                     }
                 | kDEFINED opt_nl tLPAREN2 expr rparen
                     {

data/lib/ruby26_parser.rb

@@ -5253,19 +5253,25 @@ def _reduce_309(val, _values, result)
 end
 
 def _reduce_310(val, _values, result)
-                      result = new_yield val[2]
+                      (_, line), _, args, _ = val
+
+                      result = new_yield(args).line line
 
     result
 end
 
 def _reduce_311(val, _values, result)
-                      result = new_yield
+                      (_, line), _, _ = val
+
+                      result = new_yield.line line
 
     result
 end
 
 def _reduce_312(val, _values, result)
-                      result = new_yield
+                      (_, line), = val
+
+                      result = new_yield.line line
 
     result
 end

data/lib/ruby26_parser.y

@@ -1231,15 +1231,21 @@ rule
                     }
                 | kYIELD tLPAREN2 call_args rparen
                     {
-                      result = new_yield val[2]
+                      (_, line), _, args, _ = val
+
+                      result = new_yield(args).line line
                     }
                 | kYIELD tLPAREN2 rparen
                     {
-                      result = new_yield
+                      (_, line), _, _ = val
+
+                      result = new_yield.line line
                     }
                 | kYIELD
                     {
-                      result = new_yield
+                      (_, line), = val
+
+                      result = new_yield.line line
                     }
                 | kDEFINED opt_nl tLPAREN2 expr rparen
                     {

data/lib/ruby27_parser.rb

@@ -5794,19 +5794,25 @@ def _reduce_316(val, _values, result)
 end
 
 def _reduce_317(val, _values, result)
-                      result = new_yield val[2]
+                      (_, line), _, args, _ = val
+
+                      result = new_yield(args).line line
 
     result
 end
 
 def _reduce_318(val, _values, result)
-                      result = new_yield
+                      (_, line), _, _ = val
+
+                      result = new_yield.line line
 
     result
 end
 
 def _reduce_319(val, _values, result)
-                      result = new_yield
+                      (_, line), = val
+
+                      result = new_yield.line line
 
     result
 end

data/lib/ruby27_parser.y

@@ -1294,15 +1294,21 @@ rule
                     }
                 | kYIELD tLPAREN2 call_args rparen
                     {
-                      result = new_yield val[2]
+                      (_, line), _, args, _ = val
+
+                      result = new_yield(args).line line
                     }
                 | kYIELD tLPAREN2 rparen
                     {
-                      result = new_yield
+                      (_, line), _, _ = val
+
+                      result = new_yield.line line
                     }
                 | kYIELD
                     {
-                      result = new_yield
+                      (_, line), = val
+
+                      result = new_yield.line line
                     }
                 | kDEFINED opt_nl tLPAREN2 expr rparen
                     {

data/lib/ruby30_parser.rb

@@ -3424,7 +3424,7 @@ racc_reduce_table = [
   4, 277, :_reduce_658,
   1, 277, :_reduce_659,
   1, 235, :_reduce_none,
-  1, 235, :_reduce_none,
+  1, 235, :_reduce_661,
   3, 394, :_reduce_662,
   5, 394, :_reduce_663,
   3, 394, :_reduce_664,
@@ -6008,19 +6008,25 @@ def _reduce_326(val, _values, result)
 end
 
 def _reduce_327(val, _values, result)
-                      result = new_yield val[2]
+                      (_, line), _, args, _ = val
+
+                      result = new_yield(args).line line
 
     result
 end
 
 def _reduce_328(val, _values, result)
-                      result = new_yield
+                      (_, line), _, _ = val
+
+                      result = new_yield.line line
 
     result
 end
 
 def _reduce_329(val, _values, result)
-                      result = new_yield
+                      (_, line), = val
+
+                      result = new_yield.line line
 
     result
 end
@@ -8164,7 +8170,11 @@ end
 
 # reduce 660 omitted
 
-# reduce 661 omitted
+def _reduce_661(val, _values, result)
+                      result = end_args val
+
+    result
+end
 
 def _reduce_662(val, _values, result)
                       result = end_args val

data/lib/ruby30_parser.y

@@ -1392,15 +1392,21 @@ rule
                     }
                 | kYIELD tLPAREN2 call_args rparen
                     {
-                      result = new_yield val[2]
+                      (_, line), _, args, _ = val
+
+                      result = new_yield(args).line line
                     }
                 | kYIELD tLPAREN2 rparen
                     {
-                      result = new_yield
+                      (_, line), _, _ = val
+
+                      result = new_yield.line line
                     }
                 | kYIELD
                     {
-                      result = new_yield
+                      (_, line), = val
+
+                      result = new_yield.line line
                     }
                 | kDEFINED opt_nl tLPAREN2 expr rparen
                     {
@@ -3035,6 +3041,9 @@ keyword_variable: kNIL      { result = s(:nil).line lexer.lineno }
 
 f_opt_paren_args: f_paren_args
                 | none
+                    {
+                      result = end_args val
+                    }
 
     f_paren_args: tLPAREN2 f_args rparen
                     {

data/lib/ruby3_parser.yy

@@ -1396,15 +1396,21 @@ rule
                     }
                 | kYIELD tLPAREN2 call_args rparen
                     {
-                      result = new_yield val[2]
+                      (_, line), _, args, _ = val
+
+                      result = new_yield(args).line line
                     }
                 | kYIELD tLPAREN2 rparen
                     {
-                      result = new_yield
+                      (_, line), _, _ = val
+
+                      result = new_yield.line line
                     }
                 | kYIELD
                     {
-                      result = new_yield
+                      (_, line), = val
+
+                      result = new_yield.line line
                     }
                 | kDEFINED opt_nl tLPAREN2 expr rparen
                     {
@@ -3039,6 +3045,9 @@ keyword_variable: kNIL      { result = s(:nil).line lexer.lineno }
 
 f_opt_paren_args: f_paren_args
                 | none
+                    {
+                      result = end_args val
+                    }
 
     f_paren_args: tLPAREN2 f_args rparen
                     {

data/lib/ruby_parser.yy

@@ -1362,15 +1362,21 @@ rule
                     }
                 | kYIELD tLPAREN2 call_args rparen
                     {
-                      result = new_yield val[2]
+                      (_, line), _, args, _ = val
+
+                      result = new_yield(args).line line
                     }
                 | kYIELD tLPAREN2 rparen
                     {
-                      result = new_yield
+                      (_, line), _, _ = val
+
+                      result = new_yield.line line
                     }
                 | kYIELD
                     {
-                      result = new_yield
+                      (_, line), = val
+
+                      result = new_yield.line line
                     }
                 | kDEFINED opt_nl tLPAREN2 expr rparen
                     {

data/lib/ruby_parser_extras.rb

@@ -30,7 +30,7 @@ class Sexp
 end
 
 module RubyParserStuff
-  VERSION = "3.18.0"
+  VERSION = "3.18.1"
 
   attr_accessor :lexer, :in_def, :in_single, :file
   attr_accessor :in_kwarg