Skip to content

Commit ed3857c

Browse files
committed
replace string eval with block form
1 parent c285128 commit ed3857c

File tree

1 file changed

+41
-41
lines changed

1 file changed

+41
-41
lines changed

t/fftw.t

+41-41
Original file line numberDiff line numberDiff line change
@@ -182,46 +182,46 @@ my $Nplans = 0;
182182
# try out some different ways of calling the module, make sure the argument
183183
# verification works
184184
{
185-
eval( 'fft1( )' );
185+
eval { fft1( ) };
186186
ok( $@, "Calling fft1 with no arguments should fail" );
187187

188-
eval( 'fft1(sequence(2,5), sequence(2,5), sequence(2,5) )' );
188+
eval { fft1(sequence(2,5), sequence(2,5), sequence(2,5) ) };
189189
ok( $@, "Calling fft1 with too many arguments should fail" );
190190

191-
eval( 'fft1(sequence(5))' );
191+
eval { fft1(sequence(5)) };
192192
ok( $@, "Calling fft1 without dim(0)==2 should fail. Trial 1");
193193

194-
eval( 'fft1(sequence(1,5))' );
194+
eval { fft1(sequence(1,5)) };
195195
ok( $@, "Calling fft1 without dim(0)==2 should fail. Trial 2");
196196

197-
eval( 'fft1(sequence(3,5))' );
197+
eval { fft1(sequence(3,5)) };
198198
ok( $@, "Calling fft1 without dim(0)==2 should fail. Trial 3");
199199

200-
eval( 'fft1(null))' );
200+
eval { fft1(null) };
201201
ok( $@, "Calling fft1(null) should fail.");
202202

203-
eval( 'fft1( {} ))' );
203+
eval { fft1( {} ) };
204204
ok( $@, "Calling fft1( {} ) should fail (want ndarray input).");
205205

206-
eval( 'fft1(sequence(2,5), sequence(3,5) )' );
206+
eval { fft1(sequence(2,5), sequence(3,5) ) };
207207
ok( $@, "Calling fft1 with mismatched arguments should fail" );
208208

209209
# should be able to ask for output in the arglist
210210
my $x = random(2,10);
211211
my $f1 = fft1( $x );
212212
my $f2;
213-
eval( 'fft1( $x, $f2 )' );
213+
eval { fft1( $x, $f2 ) };
214214
ok( $@, "Calling fft1 with undef argument should fail" );
215215

216216
$f2 = null;
217-
eval( 'fft1( $x, $f2 )' );
217+
eval { fft1( $x, $f2 ) };
218218
ok_should_reuse_plan( !$@ && all( approx( $f1, $f2 ), approx_eps_double),
219219
"Should be able to ask for output in the arglist" );
220220

221-
eval( 'fft4( sequence(2,5,3,4,4) );' );
221+
eval { fft4( sequence(2,5,3,4,4) ); };
222222
ok_should_make_plan( ! $@, "dimensionality baseline" );
223223

224-
eval( 'fft4( sequence(2,5,4,4) );' );
224+
eval { fft4( sequence(2,5,4,4) ); };
225225
ok( $@, "too few dimensions should fail" );
226226
}
227227

@@ -474,7 +474,7 @@ my $Nplans = 0;
474474
"double input/float output should do a float FFT" );
475475

476476
$f = $x->zeros->byte;
477-
eval( 'fft1($x, $f)' );
477+
eval { fft1($x, $f) };
478478
ok( $@, "Output to 'byte' should fail");
479479

480480
$f = $x->zeros;
@@ -679,96 +679,96 @@ my $Nplans = 0;
679679
# real fft sanity checks
680680
{
681681
{
682-
eval 'rfft1( sequence(6) );';
682+
eval { rfft1( sequence(6) ) };
683683
ok_should_reuse_plan( ! $@, "real ffts shouldn't work inplace - baseline forward" );
684-
eval 'rfft1( inplace sequence(6) );';
684+
eval { rfft1( inplace sequence(6) ) };
685685
ok( $@, "real ffts shouldn't work inplace - forward" );
686686
}
687687

688688
{
689-
eval 'irfft1( sequence(2,4) );';
689+
eval { irfft1( sequence(2,4) ) };
690690
ok_should_reuse_plan( ! $@, "real ffts shouldn't work inplace - baseline backward" );
691-
eval 'irfft1( inplace sequence(2,4) );';
691+
eval { irfft1( inplace sequence(2,4) ) };
692692
ok( $@, "real ffts shouldn't work inplace - backward" );
693693
}
694694

695695
{
696-
eval 'rfft1( sequence(7), sequence(2,4) );';
696+
eval { rfft1( sequence(7), sequence(2,4) ) };
697697
ok_should_reuse_plan( ! $@, "real fft dims - baseline");
698698

699-
eval 'rfft1( sequence(7), sequence(3,4) );';
699+
eval { rfft1( sequence(7), sequence(3,4) ) };
700700
ok( $@, "real fft dimensionality 1");
701701

702-
eval 'rfft1( sequence(7), sequence(1,4) );';
702+
eval { rfft1( sequence(7), sequence(1,4) ) };
703703
ok( $@, "real fft dimensionality 2");
704704

705-
eval 'rfft1( sequence(7), sequence(2,5) );';
705+
eval { rfft1( sequence(7), sequence(2,5) ) };
706706
ok( $@, "real fft dimensionality 3");
707707

708-
eval 'rfft1( sequence(7), sequence(2,3) );';
708+
eval { rfft1( sequence(7), sequence(2,3) ) };
709709
ok( $@, "real fft dimensionality 4");
710710
}
711711

712712
{
713-
eval( 'rfft4( sequence(5,3,4,4) );' );
713+
eval { rfft4( sequence(5,3,4,4) ) };
714714
ok_should_make_plan( ! $@, "real dimensionality baseline" );
715715

716-
eval( 'rfft4( sequence(5,4,4) );' );
716+
eval { rfft4( sequence(5,4,4) ) };
717717
ok( $@, "real dimensionality: too few dimensions should fail" );
718718

719-
eval( 'irfft4( sequence(2,5,3,4,4) );' );
719+
eval { irfft4( sequence(2,5,3,4,4) ) };
720720
ok_should_make_plan( ! $@, "real-backward dimensionality baseline" );
721721

722-
eval( 'irfft4( sequence(5,4,4) );' );
722+
eval { irfft4( sequence(5,4,4) ) };
723723
ok( $@, "real-backward dimensionality: too few dimensions should fail" );
724724
}
725725

726726
{
727-
eval( 'rfft4( sequence(5,3,4,4), sequence(2,3,3,4,4) );' );
727+
eval { rfft4( sequence(5,3,4,4), sequence(2,3,3,4,4) ) };
728728
ok_should_reuse_plan( ! $@, "real dimensionality baseline - more explicit" );
729729

730-
eval( 'rfft4( sequence(5,3,4,4), sequence(2,3,3,4,4,3) );' );
730+
eval { rfft4( sequence(5,3,4,4), sequence(2,3,3,4,4,3) ) };
731731
ok_should_reuse_plan( ! $@, "real dimensionality baseline - extra dims should be ok" );
732732

733-
eval( 'rfft4( sequence(5,3,4,4), sequence(3,3,3,4,3) );' );
733+
eval { rfft4( sequence(5,3,4,4), sequence(3,3,3,4,3) ) };
734734
ok( $@, "real dimensionality - output should look like complex numbers" );
735735

736-
eval( 'rfft4( sequence(5,3,4,4), sequence(2,3,3,4,3) );' );
736+
eval { rfft4( sequence(5,3,4,4), sequence(2,3,3,4,3) ) };
737737
ok( $@, "real dimensionality - different dims should break 1" );
738738

739-
eval( 'rfft4( sequence(5,3,4,4), sequence(2,3,3,4,5) );' );
739+
eval { rfft4( sequence(5,3,4,4), sequence(2,3,3,4,5) ) };
740740
ok( $@, "real dimensionality - different dims should break 2" );
741741

742-
eval( 'rfft4( sequence(4,3,4,4), sequence(2,3,3,4,4) );' );
742+
eval { rfft4( sequence(4,3,4,4), sequence(2,3,3,4,4) ) };
743743
ok_should_make_plan( !$@, "real dimensionality - slightly different complex dims still ok" );
744744

745-
eval( 'rfft4( sequence(6,3,4,4), sequence(2,3,3,4,4) );' );
745+
eval { rfft4( sequence(6,3,4,4), sequence(2,3,3,4,4) ) };
746746
ok( $@, "real dimensionality - too different complex dims should break" );
747747
}
748748

749749
{
750-
eval( 'irfft4( sequence(2,3,3,4,4) );' );
750+
eval { irfft4( sequence(2,3,3,4,4) ) };
751751
ok_should_make_plan( ! $@, "real-backward dimensionality baseline 1" );
752752

753-
eval( 'irfft4( sequence(2,3,3,4,4), sequence(5,3,4,4) );' );
753+
eval { irfft4( sequence(2,3,3,4,4), sequence(5,3,4,4) ) };
754754
ok_should_make_plan( ! $@, "real-backward dimensionality baseline 2" );
755755

756-
eval( 'irfft4( sequence(2,3,3,4,4), sequence(5,3,4,4,3) );' );
756+
eval { irfft4( sequence(2,3,3,4,4), sequence(5,3,4,4,3) ) };
757757
ok_should_reuse_plan( ! $@, "real-backward dimensionality baseline - extra dims should be ok" );
758758

759-
eval( 'irfft4( sequence(3,3,3,4,4,3), sequence(5,3,4,4) );' );
759+
eval { irfft4( sequence(3,3,3,4,4,3), sequence(5,3,4,4) ) };
760760
ok( $@, "real-backward dimensionality - input should look like complex numbers" );
761761

762-
eval( 'irfft4( sequence(2,3,3,4,3), sequence(5,3,4,4) );' );
762+
eval { irfft4( sequence(2,3,3,4,3), sequence(5,3,4,4) ) };
763763
ok( $@, "real-backward dimensionality - different dims should break 1" );
764764

765-
eval( 'irfft4( sequence(2,3,3,4,5), sequence(5,3,4,4) );' );
765+
eval { irfft4( sequence(2,3,3,4,5), sequence(5,3,4,4) ) };
766766
ok( $@, "real-backward dimensionality - different dims should break 2" );
767767

768-
eval( 'irfft4( sequence(2,3,3,4,4), sequence(4,3,4,4) );' );
768+
eval { irfft4( sequence(2,3,3,4,4), sequence(4,3,4,4) ) };
769769
ok_should_reuse_plan( !$@, "real-backward dimensionality - slightly different complex dims still ok" );
770770

771-
eval( 'irfft4( sequence(2,3,3,4,4), sequence(6,3,4,4) );' );
771+
eval { irfft4( sequence(2,3,3,4,4), sequence(6,3,4,4) ) };
772772
ok( $@, "real-backward dimensionality - too different complex dims should break" );
773773
}
774774
}

0 commit comments

Comments
 (0)