Skip to content

Commit 2f42d3c

Browse files
richardleachrichardleach
committed
Adjust B tests to match new scoping arrangements
1 parent a4c6d63 commit 2f42d3c

File tree

6 files changed

+106
-122
lines changed

6 files changed

+106
-122
lines changed

‎ext/B/t/optree_check.t‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,11 @@ checkOptree ( name => 'fixup nextstate (in reftext)',
144144
code => sub {my $a},
145145
strip_open_hints => 1,
146146
expect => <<'EOT_EOT', expect_nt => <<'EONT_EONT');
147-
# 1 <;> nextstate( NOTE THAT THIS CAN BE ANYTHING ) v:>,<,%
147+
# 1 <;> nextstate( NOTE THAT THIS CAN BE ANYTHING ) v:>,<,%,{
148148
# 2 <0> padsv[$a:54,55] sM/LVINTRO
149149
# 3 <1> leavesub[1 ref] K/REFC,1
150150
EOT_EOT
151-
# 1 <;> nextstate(main 54 optree_concise.t:84) v:>,<,%
151+
# 1 <;> nextstate(main 54 optree_concise.t:84) v:>,<,%,{
152152
# 2 <0> padsv[$a:54,55] sM/LVINTRO
153153
# 3 <1> leavesub[1 ref] K/REFC,1
154154
EONT_EONT
@@ -159,11 +159,11 @@ checkOptree ( name => 'fixup opcode args',
159159
code => sub {my $a},
160160
strip_open_hints => 1,
161161
expect => <<'EOT_EOT', expect_nt => <<'EONT_EONT');
162-
# 1 <;> nextstate(main 56 optree_concise.t:96) v:>,<,%
162+
# 1 <;> nextstate(main 56 optree_concise.t:96) v:>,<,%,{
163163
# 2 <0> padsv[$a:56,57] sM/LVINTRO
164164
# 3 <1> leavesub[1 ref] K/REFC,1
165165
EOT_EOT
166-
# 1 <;> nextstate(main 56 optree_concise.t:96) v:>,<,%
166+
# 1 <;> nextstate(main 56 optree_concise.t:96) v:>,<,%,{
167167
# 2 <0> padsv[$a:56,57] sM/LVINTRO
168168
# 3 <1> leavesub[1 ref] K/REFC,1
169169
EONT_EONT

‎ext/B/t/optree_for.t‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ checkOptree ( name => 'for my $var (@a)',
116116
bcopts => '-exec',
117117
strip_open_hints => 1,
118118
expect => <<'EOT_EOT', expect_nt => <<'EONT_EONT');
119-
1 <;> nextstate(main 1459 optree_for.t:90) v
119+
1 <;> nextstate(main 1459 optree_for.t:90) v:{
120120
2 <0> pushmark sM
121121
3 <#> gv[*a] s
122122
4 <1> rv2av[t3] sKRM/1
@@ -128,7 +128,7 @@ checkOptree ( name => 'for my $var (@a)',
128128
9 <2> leaveloop K/2
129129
a <1> leavesub[1 ref] K/REFC,1
130130
EOT_EOT
131-
1 <;> nextstate(main 424 optree_for.t:14) v:>,<,%
131+
1 <;> nextstate(main 424 optree_for.t:14) v:>,<,%,{
132132
2 <0> pushmark sM
133133
3 <$> gv(*a) s
134134
4 <1> rv2av[t2] sKRM/1
@@ -146,7 +146,7 @@ checkOptree ( name => 'for our $var (@a)',
146146
bcopts => '-exec',
147147
strip_open_hints => 1,
148148
expect => <<'EOT_EOT', expect_nt => <<'EONT_EONT');
149-
1 <;> nextstate(main 1466 optree_for.t:100) v
149+
1 <;> nextstate(main 1466 optree_for.t:100) v:{
150150
2 <0> pushmark sM
151151
3 <#> gv[*a] s
152152
4 <1> rv2av[t4] sKRM/1
@@ -160,7 +160,7 @@ a <|> and(other->8) K/1
160160
b <2> leaveloop K/2
161161
c <1> leavesub[1 ref] K/REFC,1
162162
EOT_EOT
163-
1 <;> nextstate(main 424 optree_for.t:111) v:>,<,%
163+
1 <;> nextstate(main 424 optree_for.t:111) v:>,<,%,{
164164
2 <0> pushmark sM
165165
3 <$> gv(*a) s
166166
4 <1> rv2av[t2] sKRM/1
@@ -180,7 +180,7 @@ checkOptree ( name => 'for my ($var) (@a)',
180180
bcopts => '-exec',
181181
strip_open_hints => 1,
182182
expect => <<'EOT_EOT', expect_nt => <<'EONT_EONT');
183-
1 <;> nextstate(main 1466 optree_for.t:100) v
183+
1 <;> nextstate(main 1466 optree_for.t:100) v:{
184184
2 <0> pushmark sM
185185
3 <#> gv[*a] s
186186
4 <1> rv2av[t3] sKRM/1
@@ -192,7 +192,7 @@ checkOptree ( name => 'for my ($var) (@a)',
192192
9 <2> leaveloop K/2
193193
a <1> leavesub[1 ref] K/REFC,1
194194
EOT_EOT
195-
1 <;> nextstate(main 424 optree_for.t:111) v:>,<,%
195+
1 <;> nextstate(main 424 optree_for.t:111) v:>,<,%,{
196196
2 <0> pushmark sM
197197
3 <$> gv(*a) s
198198
4 <1> rv2av[t2] sKRM/1
@@ -210,7 +210,7 @@ checkOptree ( name => 'for my ($var) (@lexical)',
210210
bcopts => '-exec',
211211
strip_open_hints => 1,
212212
expect => <<'EOT_EOT', expect_nt => <<'EONT_EONT');
213-
1 <;> nextstate(main 1466 optree_for.t:100) v
213+
1 <;> nextstate(main 1466 optree_for.t:100) v:{
214214
2 <0> pushmark sM
215215
3 <0> padav[@lexical:FAKE::7] sRM
216216
4 <{> enteriter(next->5 last->8 redo->5)[$var:1481,1484] KPS/LVINTRO
@@ -221,7 +221,7 @@ checkOptree ( name => 'for my ($var) (@lexical)',
221221
8 <2> leaveloop K/2
222222
9 <1> leavesub[2 refs] K/REFC,1
223223
EOT_EOT
224-
1 <;> nextstate(main 424 optree_for.t:111) v:>,<,%
224+
1 <;> nextstate(main 424 optree_for.t:111) v:>,<,%,{
225225
2 <0> pushmark sM
226226
3 <0> padav[@lexical:FAKE::2] sRM
227227
4 <{> enteriter(next->5 last->8 redo->5)[$var:1481,1484] KPS/LVINTRO
@@ -238,7 +238,7 @@ checkOptree ( name => 'for my ($key, $value) (%h)',
238238
bcopts => '-exec',
239239
strip_open_hints => 1,
240240
expect => <<'EOT_EOT', expect_nt => <<'EONT_EONT');
241-
1 <;> nextstate(main 1466 optree_for.t:100) v
241+
1 <;> nextstate(main 1466 optree_for.t:100) v:{
242242
2 <0> pushmark sM
243243
3 <#> gv[*h] s
244244
4 <1> rv2hv[t4] lKM
@@ -250,7 +250,7 @@ checkOptree ( name => 'for my ($key, $value) (%h)',
250250
9 <2> leaveloop K/2
251251
a <1> leavesub[1 ref] K/REFC,1
252252
EOT_EOT
253-
1 <;> nextstate(main 424 optree_for.t:111) v:>,<,%
253+
1 <;> nextstate(main 424 optree_for.t:111) v:>,<,%,{
254254
2 <0> pushmark sM
255255
3 <$> gv(*h) s
256256
4 <1> rv2hv[t3] lKM
@@ -268,7 +268,7 @@ checkOptree ( name => 'for my ($foo, $bar, $baz) (@a)',
268268
bcopts => '-exec',
269269
strip_open_hints => 1,
270270
expect => <<'EOT_EOT', expect_nt => <<'EONT_EONT');
271-
1 <;> nextstate(main 1466 optree_for.t:100) v
271+
1 <;> nextstate(main 1466 optree_for.t:100) v:{
272272
2 <0> pushmark sM
273273
3 <#> gv[*a] s
274274
4 <1> rv2av[t5] sKRM/1
@@ -280,7 +280,7 @@ checkOptree ( name => 'for my ($foo, $bar, $baz) (@a)',
280280
9 <2> leaveloop K/2
281281
a <1> leavesub[1 ref] K/REFC,1
282282
EOT_EOT
283-
1 <;> nextstate(main 424 optree_for.t:111) v:>,<,%
283+
1 <;> nextstate(main 424 optree_for.t:111) v:>,<,%,{
284284
2 <0> pushmark sM
285285
3 <$> gv(*a) s
286286
4 <1> rv2av[t4] sKRM/1

‎ext/B/t/optree_misc.t‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ checkOptree ( name => 'OP_AELEMFAST opclass',
2525
expect => <<'EOT_EOT', expect_nt => <<'EONT_EONT');
2626
# 7 <1> leavesub[1 ref] K/REFC,1 ->(end)
2727
# - <@> lineseq KP ->7
28-
# 1 <;> nextstate(main 634 optree_misc.t:25) v:>,<,% ->2
28+
# 1 <;> nextstate(main 634 optree_misc.t:25) v:>,<,%,{ ->2
2929
# 2 <0> padav[@x:634,636] vM/LVINTRO ->3
30-
# - <;> ex-nextstate(main 1594 optree_misc.t:27) v:>,<,% ->3
30+
# - <;> ex-nextstate(main 1594 optree_misc.t:27) v:>,<,%,{ ->3
3131
# - <1> rv2av[t4] vK/OURINTR,1 ->3
3232
# - <#> gv[*y] s ->-
3333
# 3 <;> nextstate(main 636 optree_misc.t:25) v:>,<,%,{ ->4
@@ -42,9 +42,9 @@ checkOptree ( name => 'OP_AELEMFAST opclass',
4242
EOT_EOT
4343
# 7 <1> leavesub[1 ref] K/REFC,1 ->(end)
4444
# - <@> lineseq KP ->7
45-
# 1 <;> nextstate(main 634 optree_misc.t:27) v:>,<,% ->2
45+
# 1 <;> nextstate(main 634 optree_misc.t:27) v:>,<,%,{ ->2
4646
# 2 <0> padav[@x:634,636] vM/LVINTRO ->3
47-
# - <;> ex-nextstate(main 1594 optree_misc.t:27) v:>,<,% ->3
47+
# - <;> ex-nextstate(main 1594 optree_misc.t:27) v:>,<,%,{ ->3
4848
# - <1> rv2av[t3] vK/OURINTR,1 ->3
4949
# - <$> gv(*y) s ->-
5050
# 3 <;> nextstate(main 636 optree_misc.t:27) v:>,<,%,{ ->4
@@ -168,12 +168,12 @@ checkOptree ( name => 'padrange',
168168
expect => <<'EOT_EOT', expect_nt => <<'EONT_EONT');
169169
# f <1> leavesub[1 ref] K/REFC,1 ->(end)
170170
# - <@> lineseq KP ->f
171-
# 1 <;> nextstate(main 1 -e:1) v:>,<,% ->2
171+
# 1 <;> nextstate(main 1 -e:1) v:>,<,%,{ ->2
172172
# - <@> list vKP ->3
173173
# 2 <0> padrange[$x:1,2; $y:1,2] vM/LVINTRO,range=2 ->3
174174
# - <0> padsv[$x:1,2] vM/LVINTRO ->-
175175
# - <0> padsv[$y:1,2] vM/LVINTRO ->-
176-
# 3 <;> nextstate(main 2 -e:1) v:>,<,% ->4
176+
# 3 <;> nextstate(main 2 -e:1) v:>,<,%,{ ->4
177177
# 8 <2> aassign[t4] vKS/COM_AGG ->9
178178
# - <1> ex-list lKP ->5
179179
# 4 <0> padrange[$x:1,2; $y:1,2] /range=2 ->5
@@ -196,12 +196,12 @@ checkOptree ( name => 'padrange',
196196
EOT_EOT
197197
# f <1> leavesub[1 ref] K/REFC,1 ->(end)
198198
# - <@> lineseq KP ->f
199-
# 1 <;> nextstate(main 1 -e:1) v:>,<,% ->2
199+
# 1 <;> nextstate(main 1 -e:1) v:>,<,%,{ ->2
200200
# - <@> list vKP ->3
201201
# 2 <0> padrange[$x:1,2; $y:1,2] vM/LVINTRO,range=2 ->3
202202
# - <0> padsv[$x:1,2] vM/LVINTRO ->-
203203
# - <0> padsv[$y:1,2] vM/LVINTRO ->-
204-
# 3 <;> nextstate(main 2 -e:1) v:>,<,% ->4
204+
# 3 <;> nextstate(main 2 -e:1) v:>,<,%,{ ->4
205205
# 8 <2> aassign[t4] vKS/COM_AGG ->9
206206
# - <1> ex-list lKP ->5
207207
# 4 <0> padrange[$x:1,2; $y:1,2] /range=2 ->5
@@ -233,7 +233,7 @@ checkOptree ( name => 'padrange and @_',
233233
expect => <<'EOT_EOT', expect_nt => <<'EONT_EONT');
234234
# d <1> leavesub[1 ref] K/REFC,1 ->(end)
235235
# - <@> lineseq KP ->d
236-
# 1 <;> nextstate(main 1 p3:1) v:>,<,% ->2
236+
# 1 <;> nextstate(main 1 p3:1) v:>,<,%,{ ->2
237237
# 3 <2> aassign[t5] vKS ->4
238238
# - <1> ex-list lK ->-
239239
# 2 <0> padrange[$a:1,4; $b:1,4] */LVINTRO,range=2 ->3
@@ -243,7 +243,7 @@ checkOptree ( name => 'padrange and @_',
243243
# - <0> pushmark sRM*/LVINTRO ->-
244244
# - <0> padsv[$a:1,4] sRM*/LVINTRO ->-
245245
# - <0> padsv[$b:1,4] sRM*/LVINTRO ->-
246-
# 4 <;> nextstate(main 2 p3:2) v:>,<,% ->5
246+
# 4 <;> nextstate(main 2 p3:2) v:>,<,%,{ ->5
247247
# 9 <2> aassign[t10] vKS/COM_RC1 ->a
248248
# - <1> ex-list lK ->8
249249
# 5 <0> pushmark s ->6
@@ -266,7 +266,7 @@ checkOptree ( name => 'padrange and @_',
266266
EOT_EOT
267267
# d <1> leavesub[1 ref] K/REFC,1 ->(end)
268268
# - <@> lineseq KP ->d
269-
# 1 <;> nextstate(main 1 p3:1) v:>,<,% ->2
269+
# 1 <;> nextstate(main 1 p3:1) v:>,<,%,{ ->2
270270
# 3 <2> aassign[t5] vKS ->4
271271
# - <1> ex-list lK ->-
272272
# 2 <0> padrange[$a:1,4; $b:1,4] */LVINTRO,range=2 ->3
@@ -276,7 +276,7 @@ EOT_EOT
276276
# - <0> pushmark sRM*/LVINTRO ->-
277277
# - <0> padsv[$a:1,4] sRM*/LVINTRO ->-
278278
# - <0> padsv[$b:1,4] sRM*/LVINTRO ->-
279-
# 4 <;> nextstate(main 2 p3:2) v:>,<,% ->5
279+
# 4 <;> nextstate(main 2 p3:2) v:>,<,%,{ ->5
280280
# 9 <2> aassign[t10] vKS/COM_RC1 ->a
281281
# - <1> ex-list lK ->8
282282
# 5 <0> pushmark s ->6
@@ -304,12 +304,12 @@ checkOptree ( name => 'consolidate padranges',
304304
expect => <<'EOT_EOT', expect_nt => <<'EONT_EONT');
305305
# 5 <1> leavesub[1 ref] K/REFC,1 ->(end)
306306
# - <@> lineseq KP ->5
307-
# 1 <;> nextstate(main 900 optree_misc.t:334) v:>,<,% ->2
307+
# 1 <;> nextstate(main 900 optree_misc.t:334) v:>,<,%,{ ->2
308308
# - <@> list vKP ->-
309309
# 2 <0> padrange[$a:900,902; $b:900,902; $c:901,902; $d:901,902] vM/LVINTRO,range=4 ->3
310310
# - <0> padsv[$a:900,902] vM/LVINTRO ->-
311311
# - <0> padsv[$b:900,902] vM/LVINTRO ->-
312-
# - <;> nextstate(main 901 optree_misc.t:334) v:>,<,% ->-
312+
# - <;> nextstate(main 901 optree_misc.t:334) v:>,<,%,{ ->-
313313
# - <@> list vKP ->3
314314
# - <0> pushmark vM/LVINTRO ->-
315315
# - <0> padsv[$c:901,902] vM/LVINTRO ->-
@@ -319,12 +319,12 @@ checkOptree ( name => 'consolidate padranges',
319319
EOT_EOT
320320
# 5 <1> leavesub[1 ref] K/REFC,1 ->(end)
321321
# - <@> lineseq KP ->5
322-
# 1 <;> nextstate(main 900 optree_misc.t:334) v:>,<,% ->2
322+
# 1 <;> nextstate(main 900 optree_misc.t:334) v:>,<,%,{ ->2
323323
# - <@> list vKP ->-
324324
# 2 <0> padrange[$a:900,902; $b:900,902; $c:901,902; $d:901,902] vM/LVINTRO,range=4 ->3
325325
# - <0> padsv[$a:900,902] vM/LVINTRO ->-
326326
# - <0> padsv[$b:900,902] vM/LVINTRO ->-
327-
# - <;> nextstate(main 901 optree_misc.t:334) v:>,<,% ->-
327+
# - <;> nextstate(main 901 optree_misc.t:334) v:>,<,%,{ ->-
328328
# - <@> list vKP ->3
329329
# - <0> pushmark vM/LVINTRO ->-
330330
# - <0> padsv[$c:901,902] vM/LVINTRO ->-
@@ -341,12 +341,12 @@ checkOptree ( name => 'consolidate padranges and singletons',
341341
expect => <<'EOT_EOT', expect_nt => <<'EONT_EONT');
342342
# 5 <1> leavesub[1 ref] K/REFC,1 ->(end)
343343
# - <@> lineseq KP ->5
344-
# 1 <;> nextstate(main 903 optree_misc.t:371) v:>,<,% ->2
344+
# 1 <;> nextstate(main 903 optree_misc.t:371) v:>,<,%,{ ->2
345345
# - <@> list vKP ->-
346346
# 2 <0> padrange[$a:903,910; $b:903,910; $c:904,910; $d:905,910; $e:905,910; @f:906,910; $g:907,910; $h:908,910; $i:908,910; %j:909,910] vM/LVINTRO,range=10 ->3
347347
# - <0> padsv[$a:903,910] vM/LVINTRO ->-
348348
# - <0> padsv[$b:903,910] vM/LVINTRO ->-
349-
# - <;> nextstate(main 904 optree_misc.t:371) v:>,<,% ->-
349+
# - <;> nextstate(main 904 optree_misc.t:371) v:>,<,%,{ ->-
350350
# - <0> padsv[$c:904,910] vM/LVINTRO ->-
351351
# - <;> nextstate(main 905 optree_misc.t:371) v:>,<,%,{ ->-
352352
# - <@> list vKP ->-
@@ -369,12 +369,12 @@ checkOptree ( name => 'consolidate padranges and singletons',
369369
EOT_EOT
370370
# 5 <1> leavesub[1 ref] K/REFC,1 ->(end)
371371
# - <@> lineseq KP ->5
372-
# 1 <;> nextstate(main 903 optree_misc.t:371) v:>,<,% ->2
372+
# 1 <;> nextstate(main 903 optree_misc.t:371) v:>,<,%,{ ->2
373373
# - <@> list vKP ->-
374374
# 2 <0> padrange[$a:903,910; $b:903,910; $c:904,910; $d:905,910; $e:905,910; @f:906,910; $g:907,910; $h:908,910; $i:908,910; %j:909,910] vM/LVINTRO,range=10 ->3
375375
# - <0> padsv[$a:903,910] vM/LVINTRO ->-
376376
# - <0> padsv[$b:903,910] vM/LVINTRO ->-
377-
# - <;> nextstate(main 904 optree_misc.t:371) v:>,<,% ->-
377+
# - <;> nextstate(main 904 optree_misc.t:371) v:>,<,%,{ ->-
378378
# - <0> padsv[$c:904,910] vM/LVINTRO ->-
379379
# - <;> nextstate(main 905 optree_misc.t:371) v:>,<,%,{ ->-
380380
# - <@> list vKP ->-

0 commit comments

Comments
 (0)