Skip to content

Commit 9fdc724

Browse files
jkeenanjkeenan
committed
Use indented heredoc to make loop structure more visible
This test file consists of sets of nested 'for' loops. The closing braces of the loops in two of those sets were on the same line, which made the code less legible. To uncuddle them, we eat our own dogfood and convert two heredocs to indented heredocs.
1 parent 70a73bd commit 9fdc724

File tree

1 file changed

+78
-76
lines changed

1 file changed

+78
-76
lines changed

‎t/op/decl-refs.t‎

Lines changed: 78 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -39,84 +39,86 @@ use feature 'declared_refs', 'state';
3939
no warnings 'experimental::declared_refs';
4040

4141
for $decl ('my', 'state', 'our', 'local') {
42-
for $sigl ('$', '@', '%') {
43-
# The weird code that follows uses ~ as a sigil placeholder and MY
44-
# as a declarator placeholder.
45-
my $code = '#line ' . (__LINE__+1) . ' ' . __FILE__ . "\n" . <<'END';
46-
my $ret = MY \~a;
47-
is $ret, \~a, 'MY \$a returns ref to $a';
48-
isnt $ret, \~::a, 'MY \$a ret val is not pkg var';
49-
my @ret = MY \(~b, ~c);
50-
is "@ret", \~b." ".\~c, 'MY \(~b, ~c) returns correct refs';
51-
isnt $ret[0], \~::b, 'first retval of MY \(~b, ~c) is not pkg var';
52-
isnt $ret[1], \~::c, '2nd retval of MY \(~b, ~c) is not pkg var';
53-
@ret = MY (\(~d, ~e));
54-
is "@ret", \~d." ".\~e, 'MY (\(~d, ~e)) returns correct refs';
55-
isnt $ret[0], \~::d, 'first retval of MY (\(~d, ~e)) is not pkg var';
56-
isnt $ret[1], \~::e, '2nd retval of MY (\(~d, ~e)) is not pkg var';
57-
@ret = \MY (\~f, ~g);
58-
is ${$ret[0]}, \~f, 'first retval of MY (\~f, ~g) is \~f';
59-
isnt ${$ret[0]}, \~::f, 'first retval of MY (\~f, ~g) is not \~::f';
60-
is $ret[1], \~g, '2nd retval of MY (\~f, ~g) is ~g';
61-
isnt $ret[1], \~::g, '2nd retval of MY (\~f, ~g) is not ~::g';
62-
*MODIFY_SCALAR_ATTRIBUTES = sub {
63-
is @_, 3, 'MY \~h : risible calls handler with right no. of args';
64-
is $_[2], 'risible', 'correct attr passed by MY \~h : risible';
65-
return;
66-
};
67-
SKIP : {
68-
unless ('MY' eq 'local') {
69-
skip_if_miniperl "No attributes on miniperl", 2;
70-
eval 'MY \~h : risible' or die $@ unless 'MY' eq 'local';
42+
for $sigl ('$', '@', '%') {
43+
# The weird code that follows uses ~ as a sigil placeholder and MY
44+
# as a declarator placeholder.
45+
my $code = '#line ' . (__LINE__+1) . ' ' . __FILE__ . "\n" . <<~'END';
46+
my $ret = MY \~a;
47+
is $ret, \~a, 'MY \$a returns ref to $a';
48+
isnt $ret, \~::a, 'MY \$a ret val is not pkg var';
49+
my @ret = MY \(~b, ~c);
50+
is "@ret", \~b." ".\~c, 'MY \(~b, ~c) returns correct refs';
51+
isnt $ret[0], \~::b, 'first retval of MY \(~b, ~c) is not pkg var';
52+
isnt $ret[1], \~::c, '2nd retval of MY \(~b, ~c) is not pkg var';
53+
@ret = MY (\(~d, ~e));
54+
is "@ret", \~d." ".\~e, 'MY (\(~d, ~e)) returns correct refs';
55+
isnt $ret[0], \~::d, 'first retval of MY (\(~d, ~e)) is not pkg var';
56+
isnt $ret[1], \~::e, '2nd retval of MY (\(~d, ~e)) is not pkg var';
57+
@ret = \MY (\~f, ~g);
58+
is ${$ret[0]}, \~f, 'first retval of MY (\~f, ~g) is \~f';
59+
isnt ${$ret[0]}, \~::f, 'first retval of MY (\~f, ~g) is not \~::f';
60+
is $ret[1], \~g, '2nd retval of MY (\~f, ~g) is ~g';
61+
isnt $ret[1], \~::g, '2nd retval of MY (\~f, ~g) is not ~::g';
62+
*MODIFY_SCALAR_ATTRIBUTES = sub {
63+
is @_, 3, 'MY \~h : risible calls handler with right no. of args';
64+
is $_[2], 'risible', 'correct attr passed by MY \~h : risible';
65+
return;
66+
};
67+
SKIP : {
68+
unless ('MY' eq 'local') {
69+
skip_if_miniperl "No attributes on miniperl", 2;
70+
eval 'MY \~h : risible' or die $@ unless 'MY' eq 'local';
71+
}
7172
}
72-
}
73-
eval 'MY \~a ** 1';
74-
like $@,
75-
qr/^Can't (?:declare|modify) exponentiation \(\*\*\) in "?MY"? at/,
76-
'comp error for MY \~a ** 1';
77-
$ret = MY \\~i;
78-
is $$ret, \~i, 'retval of MY \\~i is ref to ref to ~i';
79-
$ret = MY \\~i;
80-
isnt $$ret, \~::i, 'retval of MY \\~i is ref to ref to ~::i';
81-
$ret = MY (\\~i);
82-
is $$ret, \~i, 'retval of MY (\\~i) is ref to ref to ~i';
83-
$ret = MY (\\~i);
84-
isnt $$ret, \~::i, 'retval of MY (\\~i) is ref to ref to ~::i';
85-
*MODIFY_SCALAR_ATTRIBUTES = sub {
86-
is @_, 3, 'MY (\~h) : bumpy calls handler with right no. of args';
87-
is $_[2], 'bumpy', 'correct attr passed by MY (\~h) : bumpy';
88-
return;
89-
};
90-
SKIP : {
91-
unless ('MY' eq 'local') {
92-
skip_if_miniperl "No attributes on miniperl", 2;
93-
eval 'MY (\~h) : bumpy' or die $@;
73+
eval 'MY \~a ** 1';
74+
like $@,
75+
qr/^Can't (?:declare|modify) exponentiation \(\*\*\) in "?MY"? at/,
76+
'comp error for MY \~a ** 1';
77+
$ret = MY \\~i;
78+
is $$ret, \~i, 'retval of MY \\~i is ref to ref to ~i';
79+
$ret = MY \\~i;
80+
isnt $$ret, \~::i, 'retval of MY \\~i is ref to ref to ~::i';
81+
$ret = MY (\\~i);
82+
is $$ret, \~i, 'retval of MY (\\~i) is ref to ref to ~i';
83+
$ret = MY (\\~i);
84+
isnt $$ret, \~::i, 'retval of MY (\\~i) is ref to ref to ~::i';
85+
*MODIFY_SCALAR_ATTRIBUTES = sub {
86+
is @_, 3, 'MY (\~h) : bumpy calls handler with right no. of args';
87+
is $_[2], 'bumpy', 'correct attr passed by MY (\~h) : bumpy';
88+
return;
89+
};
90+
SKIP : {
91+
unless ('MY' eq 'local') {
92+
skip_if_miniperl "No attributes on miniperl", 2;
93+
eval 'MY (\~h) : bumpy' or die $@;
94+
}
9495
}
95-
}
96-
1;
97-
END
98-
$code =~ s/MY/$decl/g;
99-
$code =~ s/~/$sigl/g;
100-
$code =~ s/MODIFY_\KSCALAR/$sigl eq '@' ? "ARRAY" : "HASH"/eggnog
101-
if $sigl ne '$';
102-
if ($decl =~ /^(?:our|local)\z/) {
103-
$code =~ s/is ?no?t/is/g; # tests for package vars
104-
}
105-
eval $code or die $@;
106-
}}
96+
1;
97+
END
98+
$code =~ s/MY/$decl/g;
99+
$code =~ s/~/$sigl/g;
100+
$code =~ s/MODIFY_\KSCALAR/$sigl eq '@' ? "ARRAY" : "HASH"/eggnog
101+
if $sigl ne '$';
102+
if ($decl =~ /^(?:our|local)\z/) {
103+
$code =~ s/is ?no?t/is/g; # tests for package vars
104+
}
105+
eval $code or die $@;
106+
} # END 'for $sigl' loop
107+
} # END 'for $decl' loop
107108

108109
use feature 'refaliasing'; no warnings "experimental::refaliasing";
109110
for $decl ('my', 'state', 'our') {
110-
for $sigl ('$', '@', '%') {
111-
my $code = '#line ' . (__LINE__+1) . ' ' . __FILE__ . "\n" . <<'ENE';
112-
for MY \~x (\~::y) {
113-
is \~x, \~::y, '\~x aliased by for MY \~x';
114-
isnt \~x, \~::x, '\~x is not equivalent to \~::x';
115-
}
116-
1;
117-
ENE
118-
$code =~ s/MY/$decl/g;
119-
$code =~ s/~/$sigl/g;
120-
$code =~ s/is ?no?t/is/g if $decl eq 'our';
121-
eval $code or die $@;
122-
}}
111+
for $sigl ('$', '@', '%') {
112+
my $code = '#line ' . (__LINE__+1) . ' ' . __FILE__ . "\n" . <<~'ENE';
113+
for MY \~x (\~::y) {
114+
is \~x, \~::y, '\~x aliased by for MY \~x';
115+
isnt \~x, \~::x, '\~x is not equivalent to \~::x';
116+
}
117+
1;
118+
ENE
119+
$code =~ s/MY/$decl/g;
120+
$code =~ s/~/$sigl/g;
121+
$code =~ s/is ?no?t/is/g if $decl eq 'our';
122+
eval $code or die $@;
123+
} # END 'for $sigl' loop
124+
} # END 'for $decl' loop

0 commit comments

Comments
 (0)