eval => EVAL in S05, S06 and S09

Author: FROGGS

S05-capture/array-alias.t

@@ -49,7 +49,7 @@ ok("abcd" ~~ m/a  @<foo>=(<two>)  d/, 'Compound hypothetical capture');
   lives_ok { $ret = $/[0]<two> }, 'Implicit hypothetical variable captured -- lives_ok';
   is $ret, "bc", 'Implicit hypothetical variable captured -- retval is correct';
 }
-ok(! eval('@<foo>'), 'Explicit hypothetical variable not captured');
+ok(! EVAL('@<foo>'), 'Explicit hypothetical variable not captured');
 
 ok("  a b\tc" ~~ m/@<chars>=( @<spaces>=[\s+] (\S+))+/, 'Nested array capture');
 is("@<chars>", "a b c", 'Outer array capture');

S05-match/capturing-contexts.t

@@ -149,7 +149,7 @@ is_run( q{'aa' ~~ /(.)$1/},
 # RT 74180
 {
     my $s;
-    try { $s = eval '"foo" ~~ /(foo)/; "$0a"' };
+    try { $s = EVAL '"foo" ~~ /(foo)/; "$0a"' };
     ok not $!, 'alphabetic characters can follow digits in $0 variable in interpolation';
     is $s, 'fooa', 'alphabetic characters follows $0 interpolated value';
 }

S05-match/perl.t

@@ -17,9 +17,9 @@ my $m = ExprT1.parse('2 + 4');
 ok $m, 'Regex matches (1)';
 lives_ok { $m.perl }, '$/.perl lives (with named captures';
 #?niecza skip 'No value for parameter $a in is_deeply'
-is_deeply eval($m.perl), $m, '... and it reproduces the right thing (1)'; 
+is_deeply EVAL($m.perl), $m, '... and it reproduces the right thing (1)'; 
 #?niecza todo 'empty result'
-is ~eval($m.perl).<operator>, '+', ' right result (2)';
+is ~EVAL($m.perl).<operator>, '+', ' right result (2)';
 
 my regex f { f };
 my regex o { o };
@@ -36,7 +36,7 @@ lives_ok { $/.perl }, 'lives on quantified named captures';
     isa_ok $/, Match;
     is $/.ast, $code_str, 'Match.ast is the code matched';
     is $/.Str, $code_str, 'Match.Str is the code matched';
-    is_deeply eval($/.perl), $/, 'eval of Match.perl recreates Match';
+    is_deeply EVAL($/.perl), $/, 'EVAL of Match.perl recreates Match';
 }
 
 # vim: ft=perl6

S05-metasyntax/charset.t

@@ -103,7 +103,7 @@ ok 'b' ~~ /<[. .. b]>/, 'weird char class matches at least its end point';
 # RT #69682
 #?pugs todo
 {
-try { eval "/<[a-z]>/"; }
+try { EVAL "/<[a-z]>/"; }
 ok ~$! ~~ / 'Unsupported use of - as character range; in Perl 6 please use ..'/,
     "STD error message for - as character range";
 }

S05-metasyntax/delimiters.t

@@ -11,9 +11,9 @@ my %todo;
 #?niecza emit %todo = < ? 1 * 1 + 1 ~ 1 >;
 
 for @delims -> $d {
-    my $ok  = try { eval("my \$x = 'abc'; \$x ~~ m{$d}b{$d}") };
-    my $nok = try { eval("my \$x = 'abc'; \$x ~~ m{$d}d{$d}") };
-    my $is  = try { eval("my \$x = 'abc'; \$x ~~ s{$d}a{$d}b{$d}; \$x") } eq 'bbc';
+    my $ok  = try { EVAL("my \$x = 'abc'; \$x ~~ m{$d}b{$d}") };
+    my $nok = try { EVAL("my \$x = 'abc'; \$x ~~ m{$d}d{$d}") };
+    my $is  = try { EVAL("my \$x = 'abc'; \$x ~~ s{$d}a{$d}b{$d}; \$x") } eq 'bbc';
 
     todo "$d not yet supported" if %todo{$d};
     ok $ok && !$nok && $is, "$d as delimiter in match and substitution";

S05-metasyntax/regex.t

@@ -80,7 +80,7 @@ ok ';' ~~ /\;/,             'escaped ";" in m// works';
 # RT #64668
 #?niecza skip 'Exception NYI'
 {
-    try { eval '"RT #64668" ~~ /<nosuchrule>/' };
+    try { EVAL '"RT #64668" ~~ /<nosuchrule>/' };
     ok  $!  ~~ Exception, 'use of missing named rule dies';
     ok "$!" ~~ /nosuchrule/, 'error message mentions the missing rule';
 }

S05-metasyntax/unknown.t

@@ -25,7 +25,7 @@ lives_ok({"aa!" ~~ /'a'/}, 'quoted "a" is valid');
 
 # RT #74832
 {
-    dies_ok {eval('/ a+ + /')}, 'Cannot parse regex a+ +';
+    dies_ok {EVAL('/ a+ + /')}, 'Cannot parse regex a+ +';
     #?rakudo todo 'RT 74832'
     #?niecza todo
     ok "$!" ~~ /:i quantif/, 'error message mentions quantif{y,ier}';

S05-modifier/ignorecase.t

@@ -70,7 +70,7 @@ ok 'a' ~~ /:i < A B > /, ':i and quote words';
 
 # RT #114692
 {
-    try eval '"ABC" ~~ /:iabc/';
+    try EVAL '"ABC" ~~ /:iabc/';
     ok $!, "need whitespace after modifier";
 }
 

S05-substitution/match.t

@@ -16,7 +16,7 @@ ok $str.match(/h/)~~Match,  '.. it returns a Match object';
 #?DOES 6
 {
     for ('a'..'f') {
-        my $r = eval("rx/$_/");
+        my $r = EVAL("rx/$_/");
         is $str.match($r), $str~~$r, ".. works as ~~ matching '$str' with /$_/";
     }
 }

S05-transliteration/trans.t

@@ -237,7 +237,7 @@ is(" <>&".trans(:c, :s, ([' ', '>', '&'] =>
 #?niecza skip 'Action method quote:tr not yet implemented'
 {
     #?pugs todo
-    is(eval('"abc".trans(<== "a" => "A")'), "Abc",
+    is(EVAL('"abc".trans(<== "a" => "A")'), "Abc",
         "you're allowed to leave off the (...) named arg parens when you use <==");
 
     # Make sure the tr/// version works, too.