From 289c0da5b7de5d976610c210dd5258459f3f0c12 Mon Sep 17 00:00:00 2001 From: Kevin Newton Date: Thu, 17 Aug 2023 21:09:53 -0400 Subject: [PATCH] [ruby/yarp] Update to latest whitequark https://github.com/ruby/yarp/commit/3607efb01d --- .../fixtures/whitequark/dedenting_heredoc.txt | 2 +- .../fixtures/whitequark/interp_digit_var.txt | 64 +++--- test/yarp/fixtures/whitequark/procarg0.txt | 4 +- .../whitequark/dedenting_heredoc.txt | 90 ++++----- .../snapshots/whitequark/interp_digit_var.txt | 186 +++++++++--------- test/yarp/snapshots/whitequark/procarg0.txt | 24 +-- 6 files changed, 185 insertions(+), 185 deletions(-) diff --git a/test/yarp/fixtures/whitequark/dedenting_heredoc.txt b/test/yarp/fixtures/whitequark/dedenting_heredoc.txt index 2840ec3e1c..84937d84ab 100644 --- a/test/yarp/fixtures/whitequark/dedenting_heredoc.txt +++ b/test/yarp/fixtures/whitequark/dedenting_heredoc.txt @@ -49,7 +49,7 @@ E p <<~E x - + y E diff --git a/test/yarp/fixtures/whitequark/interp_digit_var.txt b/test/yarp/fixtures/whitequark/interp_digit_var.txt index 37487ddbaf..1ae5a2e3e0 100644 --- a/test/yarp/fixtures/whitequark/interp_digit_var.txt +++ b/test/yarp/fixtures/whitequark/interp_digit_var.txt @@ -1,66 +1,66 @@ - "#@1" + "#@1" - "#@@1" + "#@@1" - %I[#@1] + %I[#@1] - %I[#@@1] + %I[#@@1] - %Q{#@1} + %Q{#@1} - %Q{#@@1} + %Q{#@@1} - %W[#@1] + %W[#@1] - %W[#@@1] + %W[#@@1] - %i[ #@1 ] + %i[ #@1 ] - %i[ #@@1 ] + %i[ #@@1 ] - %q{#@1} + %q{#@1} - %q{#@@1} + %q{#@@1} - %r{#@1} + %r{#@1} - %r{#@@1} + %r{#@@1} - %s{#@1} + %s{#@1} - %s{#@@1} + %s{#@@1} - %w[ #@1 ] + %w[ #@1 ] - %w[ #@@1 ] + %w[ #@@1 ] - %x{#@1} + %x{#@1} - %x{#@@1} + %x{#@@1} - %{#@1} + %{#@1} - %{#@@1} + %{#@@1} - '#@1' + '#@1' - '#@@1' + '#@@1' - /#@1/ + /#@1/ - /#@@1/ + /#@@1/ - :"#@1" + :"#@1" - :"#@@1" + :"#@@1" - :'#@1' + :'#@1' - :'#@@1' + :'#@@1' - `#@1` + `#@1` - `#@@1` + `#@@1` <<-"HERE" #@1 diff --git a/test/yarp/fixtures/whitequark/procarg0.txt b/test/yarp/fixtures/whitequark/procarg0.txt index 70b368e7d5..74cae2c2eb 100644 --- a/test/yarp/fixtures/whitequark/procarg0.txt +++ b/test/yarp/fixtures/whitequark/procarg0.txt @@ -1,3 +1,3 @@ -m { |(foo, bar)| } +m { |(foo, bar)| } -m { |foo| } +m { |foo| } diff --git a/test/yarp/snapshots/whitequark/dedenting_heredoc.txt b/test/yarp/snapshots/whitequark/dedenting_heredoc.txt index 10692b50cf..d74deb09b0 100644 --- a/test/yarp/snapshots/whitequark/dedenting_heredoc.txt +++ b/test/yarp/snapshots/whitequark/dedenting_heredoc.txt @@ -1,6 +1,6 @@ -ProgramNode(0...309)( +ProgramNode(0...313)( [], - StatementsNode(0...309)( + StatementsNode(0...313)( [CallNode(0...8)( nil, nil, @@ -206,13 +206,13 @@ ProgramNode(0...309)( ArgumentsNode(225...229)( [InterpolatedStringNode(225...229)( (225...229), - [StringNode(230...239)( + [StringNode(230...243)( nil, - (230...239), + (230...243), nil, - "x\n" + "\n" + "y\n" + "x\n" + " \n" + "y\n" )], - (239...241) + (243...245) )] ), nil, @@ -220,16 +220,16 @@ ProgramNode(0...309)( 0, "p" ), - CallNode(242...248)( + CallNode(246...252)( nil, nil, - (242...243), + (246...247), nil, - ArgumentsNode(244...248)( - [InterpolatedStringNode(244...248)( - (244...248), - [StringNode(249...259)(nil, (249...259), nil, "x\n" + " y\n")], - (259...261) + ArgumentsNode(248...252)( + [InterpolatedStringNode(248...252)( + (248...252), + [StringNode(253...263)(nil, (253...263), nil, "x\n" + " y\n")], + (263...265) )] ), nil, @@ -237,16 +237,16 @@ ProgramNode(0...309)( 0, "p" ), - CallNode(262...268)( + CallNode(266...272)( nil, nil, - (262...263), + (266...267), nil, - ArgumentsNode(264...268)( - [InterpolatedStringNode(264...268)( - (264...268), - [StringNode(269...273)(nil, (269...273), nil, "x\n")], - (273...275) + ArgumentsNode(268...272)( + [InterpolatedStringNode(268...272)( + (268...272), + [StringNode(273...277)(nil, (273...277), nil, "x\n")], + (277...279) )] ), nil, @@ -254,16 +254,16 @@ ProgramNode(0...309)( 0, "p" ), - CallNode(276...282)( + CallNode(280...286)( nil, nil, - (276...277), + (280...281), nil, - ArgumentsNode(278...282)( - [InterpolatedStringNode(278...282)( - (278...282), - [StringNode(283...288)(nil, (283...288), nil, "ð\n")], - (288...290) + ArgumentsNode(282...286)( + [InterpolatedStringNode(282...286)( + (282...286), + [StringNode(287...292)(nil, (287...292), nil, "ð\n")], + (292...294) )] ), nil, @@ -271,35 +271,35 @@ ProgramNode(0...309)( 0, "p" ), - CallNode(291...297)( + CallNode(295...301)( nil, nil, - (291...292), + (295...296), nil, - ArgumentsNode(293...297)( - [InterpolatedStringNode(293...297)((293...297), [], (298...300))] + ArgumentsNode(297...301)( + [InterpolatedStringNode(297...301)((297...301), [], (302...304))] ), nil, nil, 0, "p" ), - CallNode(301...309)( + CallNode(305...313)( nil, nil, - (301...302), + (305...306), nil, - ArgumentsNode(303...309)( - [InterpolatedXStringNode(303...309)( - (303...309), - [StringNode(310...318)(nil, (310...318), nil, " x\n"), - EmbeddedStatementsNode(318...324)( - (318...320), - StatementsNode(320...323)( - [CallNode(320...323)( + ArgumentsNode(307...313)( + [InterpolatedXStringNode(307...313)( + (307...313), + [StringNode(314...322)(nil, (314...322), nil, " x\n"), + EmbeddedStatementsNode(322...328)( + (322...324), + StatementsNode(324...327)( + [CallNode(324...327)( nil, nil, - (320...323), + (324...327), nil, nil, nil, @@ -308,10 +308,10 @@ ProgramNode(0...309)( "foo" )] ), - (323...324) + (327...328) ), - StringNode(324...325)(nil, (324...325), nil, "\n")], - (325...327) + StringNode(328...329)(nil, (328...329), nil, "\n")], + (329...331) )] ), nil, diff --git a/test/yarp/snapshots/whitequark/interp_digit_var.txt b/test/yarp/snapshots/whitequark/interp_digit_var.txt index 45d18f9ef2..4af55a97a8 100644 --- a/test/yarp/snapshots/whitequark/interp_digit_var.txt +++ b/test/yarp/snapshots/whitequark/interp_digit_var.txt @@ -1,123 +1,123 @@ -ProgramNode(1...433)( +ProgramNode(1...465)( [], - StatementsNode(1...433)( + StatementsNode(1...465)( [StringNode(1...6)((1...2), (2...5), (5...6), "\#@1"), - StringNode(9...15)((9...10), (10...14), (14...15), "\#@@1"), - ArrayNode(18...25)( - [SymbolNode(21...24)(nil, (21...24), nil, "\#@1")], - (18...21), - (24...25) + StringNode(10...16)((10...11), (11...15), (15...16), "\#@@1"), + ArrayNode(20...27)( + [SymbolNode(23...26)(nil, (23...26), nil, "\#@1")], + (20...23), + (26...27) ), - ArrayNode(28...36)( - [SymbolNode(31...35)(nil, (31...35), nil, "\#@@1")], - (28...31), - (35...36) + ArrayNode(31...39)( + [SymbolNode(34...38)(nil, (34...38), nil, "\#@@1")], + (31...34), + (38...39) ), - StringNode(39...46)((39...42), (42...45), (45...46), "\#@1"), - StringNode(49...57)((49...52), (52...56), (56...57), "\#@@1"), - ArrayNode(60...67)( - [StringNode(63...66)(nil, (63...66), nil, "\#@1")], - (60...63), - (66...67) + StringNode(43...50)((43...46), (46...49), (49...50), "\#@1"), + StringNode(54...62)((54...57), (57...61), (61...62), "\#@@1"), + ArrayNode(66...73)( + [StringNode(69...72)(nil, (69...72), nil, "\#@1")], + (66...69), + (72...73) ), - ArrayNode(70...78)( - [StringNode(73...77)(nil, (73...77), nil, "\#@@1")], - (70...73), - (77...78) + ArrayNode(77...85)( + [StringNode(80...84)(nil, (80...84), nil, "\#@@1")], + (77...80), + (84...85) ), - ArrayNode(81...90)( - [SymbolNode(85...88)(nil, (85...88), nil, "\#@1")], - (81...84), - (89...90) + ArrayNode(89...98)( + [SymbolNode(93...96)(nil, (93...96), nil, "\#@1")], + (89...92), + (97...98) ), - ArrayNode(93...103)( - [SymbolNode(97...101)(nil, (97...101), nil, "\#@@1")], - (93...96), - (102...103) + ArrayNode(102...112)( + [SymbolNode(106...110)(nil, (106...110), nil, "\#@@1")], + (102...105), + (111...112) ), - StringNode(106...113)((106...109), (109...112), (112...113), "\#@1"), - StringNode(116...124)((116...119), (119...123), (123...124), "\#@@1"), - RegularExpressionNode(127...134)( - (127...130), - (130...133), - (133...134), + StringNode(116...123)((116...119), (119...122), (122...123), "\#@1"), + StringNode(127...135)((127...130), (130...134), (134...135), "\#@@1"), + RegularExpressionNode(139...146)( + (139...142), + (142...145), + (145...146), "\#@1", 0 ), - RegularExpressionNode(137...145)( - (137...140), - (140...144), - (144...145), + RegularExpressionNode(150...158)( + (150...153), + (153...157), + (157...158), "\#@@1", 0 ), - SymbolNode(148...155)((148...151), (151...154), (154...155), "\#@1"), - SymbolNode(158...166)((158...161), (161...165), (165...166), "\#@@1"), - ArrayNode(169...178)( - [StringNode(173...176)(nil, (173...176), nil, "\#@1")], - (169...172), - (177...178) + SymbolNode(162...169)((162...165), (165...168), (168...169), "\#@1"), + SymbolNode(173...181)((173...176), (176...180), (180...181), "\#@@1"), + ArrayNode(185...194)( + [StringNode(189...192)(nil, (189...192), nil, "\#@1")], + (185...188), + (193...194) ), - ArrayNode(181...191)( - [StringNode(185...189)(nil, (185...189), nil, "\#@@1")], - (181...184), - (190...191) + ArrayNode(198...208)( + [StringNode(202...206)(nil, (202...206), nil, "\#@@1")], + (198...201), + (207...208) ), - XStringNode(194...201)((194...197), (197...200), (200...201), "\#@1"), - XStringNode(204...212)((204...207), (207...211), (211...212), "\#@@1"), - StringNode(215...221)((215...217), (217...220), (220...221), "\#@1"), - StringNode(224...231)((224...226), (226...230), (230...231), "\#@@1"), - StringNode(234...239)((234...235), (235...238), (238...239), "\#@1"), - StringNode(242...248)((242...243), (243...247), (247...248), "\#@@1"), - RegularExpressionNode(251...256)( - (251...252), - (252...255), - (255...256), + XStringNode(212...219)((212...215), (215...218), (218...219), "\#@1"), + XStringNode(223...231)((223...226), (226...230), (230...231), "\#@@1"), + StringNode(235...241)((235...237), (237...240), (240...241), "\#@1"), + StringNode(245...252)((245...247), (247...251), (251...252), "\#@@1"), + StringNode(256...261)((256...257), (257...260), (260...261), "\#@1"), + StringNode(265...271)((265...266), (266...270), (270...271), "\#@@1"), + RegularExpressionNode(275...280)( + (275...276), + (276...279), + (279...280), "\#@1", 0 ), - RegularExpressionNode(259...265)( - (259...260), - (260...264), - (264...265), + RegularExpressionNode(284...290)( + (284...285), + (285...289), + (289...290), "\#@@1", 0 ), - SymbolNode(268...274)(nil, (270...273), nil, "\#@1"), - SymbolNode(277...284)(nil, (279...283), nil, "\#@@1"), - SymbolNode(287...293)((287...289), (289...292), (292...293), "\#@1"), - SymbolNode(296...303)((296...298), (298...302), (302...303), "\#@@1"), - XStringNode(306...311)((306...307), (307...310), (310...311), "\#@1"), - XStringNode(314...320)((314...315), (315...319), (319...320), "\#@@1"), - InterpolatedStringNode(322...331)( - (322...331), - [StringNode(332...336)(nil, (332...336), nil, "\#@1\n")], - (336...341) + SymbolNode(294...300)(nil, (296...299), nil, "\#@1"), + SymbolNode(304...311)(nil, (306...310), nil, "\#@@1"), + SymbolNode(315...321)((315...317), (317...320), (320...321), "\#@1"), + SymbolNode(325...332)((325...327), (327...331), (331...332), "\#@@1"), + XStringNode(336...341)((336...337), (337...340), (340...341), "\#@1"), + XStringNode(345...351)((345...346), (346...350), (350...351), "\#@@1"), + InterpolatedStringNode(354...363)( + (354...363), + [StringNode(364...368)(nil, (364...368), nil, "\#@1\n")], + (368...373) ), - InterpolatedStringNode(342...351)( - (342...351), - [StringNode(352...357)(nil, (352...357), nil, "\#@@1\n")], - (357...362) + InterpolatedStringNode(374...383)( + (374...383), + [StringNode(384...389)(nil, (384...389), nil, "\#@@1\n")], + (389...394) ), - InterpolatedStringNode(363...372)( - (363...372), - [StringNode(373...377)(nil, (373...377), nil, "\#@1\n")], - (377...382) + InterpolatedStringNode(395...404)( + (395...404), + [StringNode(405...409)(nil, (405...409), nil, "\#@1\n")], + (409...414) ), - InterpolatedStringNode(383...392)( - (383...392), - [StringNode(393...398)(nil, (393...398), nil, "\#@@1\n")], - (398...403) + InterpolatedStringNode(415...424)( + (415...424), + [StringNode(425...430)(nil, (425...430), nil, "\#@@1\n")], + (430...435) ), - InterpolatedXStringNode(404...413)( - (404...413), - [StringNode(414...418)(nil, (414...418), nil, "\#@1\n")], - (418...423) + InterpolatedXStringNode(436...445)( + (436...445), + [StringNode(446...450)(nil, (446...450), nil, "\#@1\n")], + (450...455) ), - InterpolatedXStringNode(424...433)( - (424...433), - [StringNode(434...439)(nil, (434...439), nil, "\#@@1\n")], - (439...444) + InterpolatedXStringNode(456...465)( + (456...465), + [StringNode(466...471)(nil, (466...471), nil, "\#@@1\n")], + (471...476) )] ) ) diff --git a/test/yarp/snapshots/whitequark/procarg0.txt b/test/yarp/snapshots/whitequark/procarg0.txt index 8153bfdd9d..fb43e87210 100644 --- a/test/yarp/snapshots/whitequark/procarg0.txt +++ b/test/yarp/snapshots/whitequark/procarg0.txt @@ -1,6 +1,6 @@ -ProgramNode(0...31)( +ProgramNode(0...32)( [], - StatementsNode(0...31)( + StatementsNode(0...32)( [CallNode(0...18)( nil, nil, @@ -36,18 +36,18 @@ ProgramNode(0...31)( 0, "m" ), - CallNode(20...31)( + CallNode(21...32)( nil, nil, - (20...21), + (21...22), nil, nil, nil, - BlockNode(22...31)( + BlockNode(23...32)( [:foo], - BlockParametersNode(24...29)( - ParametersNode(25...28)( - [RequiredParameterNode(25...28)(:foo)], + BlockParametersNode(25...30)( + ParametersNode(26...29)( + [RequiredParameterNode(26...29)(:foo)], [], [], nil, @@ -56,12 +56,12 @@ ProgramNode(0...31)( nil ), [], - (24...25), - (28...29) + (25...26), + (29...30) ), nil, - (22...23), - (30...31) + (23...24), + (31...32) ), 0, "m"