[ruby/yarp] Constant on block parameter node

ruby/prism@2cd9a67150
ruby · Sep 6, 2023 · 746eede · 746eede
1 parent 08929b3
commit 746eede
Show file tree

Hide file tree

Showing 33 changed files with 119 additions and 76 deletions.
diff --git a/test/yarp/errors_test.rb b/test/yarp/errors_test.rb
@@ -644,7 +644,7 @@ def test_method_parameters_after_block
           nil,
           [],
           nil,
-          BlockParameterNode(Location(), Location())
+          BlockParameterNode(:block, Location(), Location())
         ),
         nil,
         [:block, :a],
@@ -664,7 +664,7 @@ def test_method_with_arguments_after_anonymous_block
       expected = DefNode(
         Location(),
         nil,
-        ParametersNode([], [], [RequiredParameterNode(:a)], nil, [], nil, BlockParameterNode(nil, Location())),
+        ParametersNode([], [], [RequiredParameterNode(:a)], nil, [], nil, BlockParameterNode(nil, nil, Location())),
         nil,
         [:&, :a],
         Location(),
@@ -1087,7 +1087,7 @@ def test_duplicated_parameter_names
       expected = DefNode(
         Location(),
         nil,
-        ParametersNode([RequiredParameterNode(:a), RequiredParameterNode(:b)], [], [], nil, [], nil, BlockParameterNode(Location(), Location())),
+        ParametersNode([RequiredParameterNode(:a), RequiredParameterNode(:b)], [], [], nil, [], nil, BlockParameterNode(:a, Location(), Location())),
         nil,
         [:a, :b],
         Location(),

diff --git a/test/yarp/snapshots/methods.txt b/test/yarp/snapshots/methods.txt
@@ -876,7 +876,7 @@ ProgramNode(0...1194)(
          nil,
          [],
          nil,
-         BlockParameterNode(789...791)((790...791), (789...790))
+         BlockParameterNode(789...791)(:b, (790...791), (789...790))
        ),
        nil,
        [:b],
@@ -897,7 +897,7 @@ ProgramNode(0...1194)(
          nil,
          [],
          nil,
-         BlockParameterNode(803...804)(nil, (803...804))
+         BlockParameterNode(803...804)(nil, nil, (803...804))
        ),
        nil,
        [:&],

diff --git a/test/yarp/snapshots/procs.txt b/test/yarp/snapshots/procs.txt
@@ -93,7 +93,7 @@ ProgramNode(0...266)(
            [KeywordParameterNode(113...115)((113...115), nil),
             KeywordParameterNode(117...119)((117...119), nil)],
            nil,
-           BlockParameterNode(121...123)((122...123), (121...122))
+           BlockParameterNode(121...123)(:e, (122...123), (121...122))
          ),
          [],
          nil,
@@ -120,7 +120,7 @@ ProgramNode(0...266)(
            [KeywordParameterNode(149...151)((149...151), nil),
             KeywordParameterNode(153...155)((153...155), nil)],
            KeywordRestParameterNode(157...160)((157...159), (159...160)),
-           BlockParameterNode(162...164)((163...164), (162...163))
+           BlockParameterNode(162...164)(:g, (163...164), (162...163))
          ),
          [],
          (134...135),
@@ -147,7 +147,7 @@ ProgramNode(0...266)(
            [KeywordParameterNode(191...193)((191...193), nil),
             KeywordParameterNode(195...197)((195...197), nil)],
            KeywordRestParameterNode(199...202)((199...201), (201...202)),
-           BlockParameterNode(204...206)((205...206), (204...205))
+           BlockParameterNode(204...206)(:g, (205...206), (204...205))
          ),
          [],
          (176...177),

diff --git a/test/yarp/snapshots/seattlerb/args_kw_block.txt b/test/yarp/snapshots/seattlerb/args_kw_block.txt
@@ -11,7 +11,7 @@ ProgramNode(0...20)(
          nil,
          [KeywordParameterNode(6...10)((6...8), IntegerNode(9...10)())],
          nil,
-         BlockParameterNode(12...14)((13...14), (12...13))
+         BlockParameterNode(12...14)(:b, (13...14), (12...13))
        ),
        nil,
        [:a, :b],

diff --git a/test/yarp/snapshots/seattlerb/block_arg__bare.txt b/test/yarp/snapshots/seattlerb/block_arg__bare.txt
@@ -11,7 +11,7 @@ ProgramNode(0...13)(
          nil,
          [],
          nil,
-         BlockParameterNode(6...7)(nil, (6...7))
+         BlockParameterNode(6...7)(nil, nil, (6...7))
        ),
        nil,
        [:&],

diff --git a/test/yarp/snapshots/seattlerb/block_arg_opt_arg_block.txt b/test/yarp/snapshots/seattlerb/block_arg_opt_arg_block.txt
@@ -23,7 +23,7 @@ ProgramNode(0...21)(
              nil,
              [],
              nil,
-             BlockParameterNode(16...18)((17...18), (16...17))
+             BlockParameterNode(16...18)(:e, (17...18), (16...17))
            ),
            [],
            (4...5),

diff --git a/test/yarp/snapshots/seattlerb/block_arg_opt_splat_arg_block_omfg.txt b/test/yarp/snapshots/seattlerb/block_arg_opt_splat_arg_block_omfg.txt
@@ -23,7 +23,7 @@ ProgramNode(0...25)(
              RestParameterNode(13...15)((13...14), (14...15)),
              [],
              nil,
-             BlockParameterNode(20...22)((21...22), (20...21))
+             BlockParameterNode(20...22)(:f, (21...22), (20...21))
            ),
            [],
            (4...5),

diff --git a/test/yarp/snapshots/seattlerb/block_args_opt3.txt b/test/yarp/snapshots/seattlerb/block_args_opt3.txt
@@ -29,7 +29,7 @@ ProgramNode(0...42)(
              nil,
              [],
              nil,
-             BlockParameterNode(24...26)((25...26), (24...25))
+             BlockParameterNode(24...26)(:d, (25...26), (24...25))
            ),
            [],
            (4...5),

diff --git a/test/yarp/snapshots/seattlerb/block_opt_splat_arg_block_omfg.txt b/test/yarp/snapshots/seattlerb/block_opt_splat_arg_block_omfg.txt
@@ -23,7 +23,7 @@ ProgramNode(0...22)(
              RestParameterNode(10...12)((10...11), (11...12)),
              [],
              nil,
-             BlockParameterNode(17...19)((18...19), (17...18))
+             BlockParameterNode(17...19)(:e, (18...19), (17...18))
            ),
            [],
            (4...5),

diff --git a/test/yarp/snapshots/seattlerb/difficult3_3.txt b/test/yarp/snapshots/seattlerb/difficult3_3.txt
@@ -18,7 +18,7 @@ ProgramNode(0...17)(
              RestParameterNode(5...7)((5...6), (6...7)),
              [],
              nil,
-             BlockParameterNode(12...14)((13...14), (12...13))
+             BlockParameterNode(12...14)(:c, (13...14), (12...13))
            ),
            [],
            (4...5),

diff --git a/test/yarp/snapshots/seattlerb/iter_args_10_2.txt b/test/yarp/snapshots/seattlerb/iter_args_10_2.txt
@@ -23,7 +23,7 @@ ProgramNode(0...25)(
              RestParameterNode(16...18)((16...17), (17...18)),
              [],
              nil,
-             BlockParameterNode(20...22)((21...22), (20...21))
+             BlockParameterNode(20...22)(:d, (21...22), (20...21))
            ),
            [],
            (4...5),

diff --git a/test/yarp/snapshots/seattlerb/iter_args_11_2.txt b/test/yarp/snapshots/seattlerb/iter_args_11_2.txt
@@ -23,7 +23,7 @@ ProgramNode(0...28)(
              RestParameterNode(16...18)((16...17), (17...18)),
              [],
              nil,
-             BlockParameterNode(23...25)((24...25), (23...24))
+             BlockParameterNode(23...25)(:e, (24...25), (23...24))
            ),
            [],
            (4...5),

diff --git a/test/yarp/snapshots/seattlerb/iter_args_5.txt b/test/yarp/snapshots/seattlerb/iter_args_5.txt
@@ -18,7 +18,7 @@ ProgramNode(0...13)(
              nil,
              [],
              nil,
-             BlockParameterNode(8...10)((9...10), (8...9))
+             BlockParameterNode(8...10)(:b, (9...10), (8...9))
            ),
            [],
            (4...5),

diff --git a/test/yarp/snapshots/seattlerb/iter_args_7_2.txt b/test/yarp/snapshots/seattlerb/iter_args_7_2.txt
@@ -23,7 +23,7 @@ ProgramNode(0...22)(
              RestParameterNode(13...15)((13...14), (14...15)),
              [],
              nil,
-             BlockParameterNode(17...19)((18...19), (17...18))
+             BlockParameterNode(17...19)(:c, (18...19), (17...18))
            ),
            [],
            (4...5),

diff --git a/test/yarp/snapshots/seattlerb/iter_args_8_2.txt b/test/yarp/snapshots/seattlerb/iter_args_8_2.txt
@@ -23,7 +23,7 @@ ProgramNode(0...25)(
              RestParameterNode(13...15)((13...14), (14...15)),
              [],
              nil,
-             BlockParameterNode(20...22)((21...22), (20...21))
+             BlockParameterNode(20...22)(:d, (21...22), (20...21))
            ),
            [],
            (4...5),

diff --git a/test/yarp/snapshots/seattlerb/iter_args_9_2.txt b/test/yarp/snapshots/seattlerb/iter_args_9_2.txt
@@ -23,7 +23,7 @@ ProgramNode(0...21)(
              nil,
              [],
              nil,
-             BlockParameterNode(16...18)((17...18), (16...17))
+             BlockParameterNode(16...18)(:c, (17...18), (16...17))
            ),
            [],
            (4...5),

diff --git a/test/yarp/snapshots/seattlerb/stabby_arg_opt_splat_arg_block_omfg.txt b/test/yarp/snapshots/seattlerb/stabby_arg_opt_splat_arg_block_omfg.txt
@@ -19,7 +19,7 @@ ProgramNode(0...23)(
            RestParameterNode(11...13)((11...12), (12...13)),
            [],
            nil,
-           BlockParameterNode(18...20)((19...20), (18...19))
+           BlockParameterNode(18...20)(:f, (19...20), (18...19))
          ),
          [],
          (2...3),

diff --git a/test/yarp/snapshots/unparser/corpus/literal/def.txt b/test/yarp/snapshots/unparser/corpus/literal/def.txt
@@ -781,7 +781,7 @@ ProgramNode(0...913)(
          RestParameterNode(654...658)((654...655), (655...658)),
          [],
          nil,
-         BlockParameterNode(660...666)((661...666), (660...661))
+         BlockParameterNode(660...666)(:block, (661...666), (660...661))
        ),
        StatementsNode(670...673)(
          [CallNode(670...673)(
@@ -840,7 +840,7 @@ ProgramNode(0...913)(
          nil,
          [],
          nil,
-         BlockParameterNode(729...735)((730...735), (729...730))
+         BlockParameterNode(729...735)(:block, (730...735), (729...730))
        ),
        StatementsNode(739...742)(
          [CallNode(739...742)(
@@ -873,7 +873,7 @@ ProgramNode(0...913)(
          nil,
          [],
          nil,
-         BlockParameterNode(761...767)((762...767), (761...762))
+         BlockParameterNode(761...767)(:block, (762...767), (761...762))
        ),
        StatementsNode(771...774)([LocalVariableReadNode(771...774)(:bar, 0)]),
        [:bar, :block],

diff --git a/test/yarp/snapshots/unparser/corpus/literal/since/31.txt b/test/yarp/snapshots/unparser/corpus/literal/since/31.txt
@@ -11,7 +11,7 @@ ProgramNode(0...51)(
          nil,
          [],
          nil,
-         BlockParameterNode(8...9)(nil, (8...9))
+         BlockParameterNode(8...9)(nil, nil, (8...9))
        ),
        StatementsNode(13...19)(
          [CallNode(13...19)(
@@ -46,7 +46,7 @@ ProgramNode(0...51)(
          nil,
          [],
          nil,
-         BlockParameterNode(36...37)(nil, (36...37))
+         BlockParameterNode(36...37)(nil, nil, (36...37))
        ),
        StatementsNode(41...47)(
          [CallNode(41...47)(

diff --git a/test/yarp/snapshots/whitequark/anonymous_blockarg.txt b/test/yarp/snapshots/whitequark/anonymous_blockarg.txt
@@ -11,7 +11,7 @@ ProgramNode(0...23)(
          nil,
          [],
          nil,
-         BlockParameterNode(8...9)(nil, (8...9))
+         BlockParameterNode(8...9)(nil, nil, (8...9))
        ),
        StatementsNode(12...18)(
          [CallNode(12...18)(