eval => EVAL in S03 and S04

Author: FROGGS

S03-binding/closure.t

@@ -4,35 +4,35 @@ use Test;
 plan 8;
 
 diag "Testing for calling block bindings...";
-is eval(q[
+is EVAL(q[
 	my &foo := { "foo" };
 	foo;
 ]), 'foo',  "Calling block binding without argument. (Runtime)";
 
 {
-is eval(q[
+is EVAL(q[
 	my &foo ::= { "foo" };
 	foo;
 ]), 'foo',  "Calling block binding without argument. (read-only bind)";
 }
 
-is eval(q[
+is EVAL(q[
 	my &foo := { $^a };
 	foo(1);
 ]), 1, "Calling block binding with argument. (Runtime, with parens)";
 
-is eval(q[
+is EVAL(q[
 	my &foo := { $^a };
 	foo 1;
 ]), 1,  "Calling block binding with argument. (Runtime, no parens)";
 
 {
-is eval(q[
+is EVAL(q[
 	my &foo ::= { $^a };
 	foo(1);
 ]), 1,  "Calling block binding with argument. (read-only bind, with parens)";
 
-is eval(q[
+is EVAL(q[
 	my &foo ::= { $^a };
 	foo 1;
 ]), 1,  "Calling block binding with argument. (read-only bind, no parens)";

S03-metaops/cross.t

@@ -4,7 +4,7 @@ use Test;
 plan 28;
 
 # L<S03/List infix precedence/the cross operator>
-ok eval('<a b> X <c d>'), 'cross non-meta operator parses';
+ok EVAL('<a b> X <c d>'), 'cross non-meta operator parses';
 
 {
     my @result = <a b> X <1 2>;
@@ -38,7 +38,7 @@ is ([+] 1, 2, 3 X** 2, 4), (1+1 + 4+16 + 9+81), '[+] and X** work';
 }
 
 # L<S03/Cross operators>
-ok eval('<a b> X, <c d>'), 'cross metaoperator parses';
+ok EVAL('<a b> X, <c d>'), 'cross metaoperator parses';
 
 # L<S03/Cross operators/"string concatenating form is">
 #?pugs todo 'feature'

S03-metaops/hyper.t

@@ -381,10 +381,10 @@ my @e;
         { key => 'val' }
     );
 
-    my $full = join '', eval '@array>>.<key>';
+    my $full = join '', EVAL '@array>>.<key>';
     is($full, 'valvalval', 'hyper-dereference an array');
 
-    my $part = join '', eval '@array[0,1]>>.<key>';
+    my $part = join '', EVAL '@array[0,1]>>.<key>';
     is($part, 'valval', 'hyper-dereference an array slice');
 }
 
@@ -696,12 +696,12 @@ my @e;
 
 # test non-UTF-8 input
 #?niecza skip 'nonsensical test'
-#?pugs skip 'eval(Buf)'
-#?rakudo skip 'eval(Buf)'
+#?pugs skip 'EVAL(Buf)'
+#?rakudo skip 'EVAL(Buf)'
 #?DOES 1
 {
     my $t = '(1, 2, 3) »+« (4, 3, 2)';
-    ok !eval($t.encode('ISO-8859-1')),
+    ok !EVAL($t.encode('ISO-8859-1')),
        'Latin-1 »+« without pre-declaration is an error';
 }
 
@@ -743,7 +743,7 @@ my @e;
 # RT #77010
 
 {
-    # niecza doesn't propagate slangs into &eval yet
+    # niecza doesn't propagate slangs into &EVAL yet
     eval_lives_ok 'sub infix:<+++>($a, $b) { ($a + $b) div 2 }; 10 >>+++<< 14', 'can use hypers with local scoped user-defined operators';
 } 
 

S03-metaops/zip.t

@@ -3,13 +3,13 @@ use v6;
 use Test;
 plan 24;
 
-ok eval('<a b> Z <c d>'), 'zip non-meta operator parses';
+ok EVAL('<a b> Z <c d>'), 'zip non-meta operator parses';
 
 is (<a b> Z <1 2>), <a 1 b 2>, 'non-meta zip produces expected result';
 
 is (1, 2, 3 Z** 2, 4), (1, 16), 'zip-power works';
 
-ok eval('<a b> Z, <c d>'), 'zip metaoperator parses';
+ok EVAL('<a b> Z, <c d>'), 'zip metaoperator parses';
 
 is (<a b> Z~ <1 2>), <a1 b2>, 'zip-concat produces expected result';
 

S03-operators/adverbial-modifiers.t

@@ -40,7 +40,7 @@ is blub "bar":times(2), 'BLUBBLUBbar', 'user-defined prefix operator, :times adv
   is ~$v, ~$e, ':foo«alice»';
 
   $e = (foo => { a => 1, b => 2 });
-  $v = eval ':foo{ a => 1, b => 2 }';
+  $v = EVAL ':foo{ a => 1, b => 2 }';
   is ~$v, ~$e, ':foo{ a => 1, b => 2 }';
 
   $e = (foo => { dostuff() });
@@ -106,23 +106,23 @@ sub fiddle(:$x,:$y){ violin($x) ~ violin($y) }
   # Since the demagicalizing of pairs, this test shouldn't and doesn't work any
   # longer.
 
-#  $v = 'eval failed';
-#  eval '$v = fiddle :x("a") :y("b")()';
+#  $v = 'EVAL failed';
+#  EVAL '$v = fiddle :x("a") :y("b")()';
 #  #?pugs todo 'bug'
 #  is $v, "ab", 'fiddle :x("a") :y("b")()';
 
-#  $v = 'eval failed';
-#  eval '$v = fiddle :x("a") :y("b") ()';
+#  $v = 'EVAL failed';
+#  EVAL '$v = fiddle :x("a") :y("b") ()';
 #  #?pugs todo 'bug'
 #  is $v, "ab", 'fiddle :x("a") :y("b") ()';
 
-#  $v = 'eval failed';
-#  eval '$v = fiddle :x("a"):y("b") ()';
+#  $v = 'EVAL failed';
+#  EVAL '$v = fiddle :x("a"):y("b") ()';
 #  #?pugs todo 'bug'
 #  is $v, "ab", 'fiddle :x("a"):y("b") ()';
 
-#  $v = 'eval failed';
-#  eval '$v = fiddle :x("a"):y("b")()';
+#  $v = 'EVAL failed';
+#  EVAL '$v = fiddle :x("a"):y("b")()';
 #  #?pugs todo 'bug'
 #  is $v, "ab", 'fiddle :x("a"):y("b")()';
 

S03-operators/brainos.t

@@ -15,22 +15,22 @@ instead. Similar for C<!~>.
 #L<S03/Chaining binary precedence/"To catch">
 
 my $str = 'foo';
-try { eval '$str =~ m/bar/;' };
+try { EVAL '$str =~ m/bar/;' };
 ok  $!  ~~ Exception, 'caught "=~" braino';
 ok "$!" ~~ /'~~'/, 'error for "=~" usage mentions "~~"';
 
-try { eval '$str !~ m/bar/;' };
+try { EVAL '$str !~ m/bar/;' };
 ok  $!  ~~ Exception, 'caught "!~" braino';
 ok "$!" ~~ /'!~~'/, 'error for "!~" usage mentions "!~~"';
 
 # RT #76878
 {
     my $x = 2;
-    is eval('"$x =~ b"'), '2 =~ b', '=~ allowed in double quotes';
-    is eval('"$x !~ b"'), '2 !~ b', '!~ allowed in double quotes';
-    is eval('"$x << b"'), '2 << b', '<< allowed in double quotes';
-    is eval('"$x >> b"'), '2 >> b', '>> allowed in double quotes';
-    is eval('"$x . b"'),  '2 . b',  '.  allowed in double quotes';
+    is EVAL('"$x =~ b"'), '2 =~ b', '=~ allowed in double quotes';
+    is EVAL('"$x !~ b"'), '2 !~ b', '!~ allowed in double quotes';
+    is EVAL('"$x << b"'), '2 << b', '<< allowed in double quotes';
+    is EVAL('"$x >> b"'), '2 >> b', '>> allowed in double quotes';
+    is EVAL('"$x . b"'),  '2 . b',  '.  allowed in double quotes';
 }
 
 # vim: ft=perl6

S03-operators/context-forcers.t

@@ -83,7 +83,7 @@ sub iis(Mu $a, Mu $b, $descr) {
 
 ok 4.Str ~~ Str, 'Int.Str returns a Str';
 
-sub eval_elsewhere($code){ eval($code) }
+sub eval_elsewhere($code){ EVAL($code) }
 
 # L<S02/Context/numeric "+">
 # numeric (+) context

S03-operators/flip-flop.t

@@ -119,7 +119,7 @@ plan 39;
 #?rakudo skip 'dubious scoping?'
 {
 
-    # keep track of # of times lhs and rhs are eval'd by adding
+    # keep track of # of times lhs and rhs are EVAL'd by adding
     # a state var to both sides.
     sub ff_eval($code, $lhs, $rhs, @a) {
         my $lhs_run = 0;

S03-operators/is-divisible-by.t

@@ -31,7 +31,7 @@ plan 15;
 } #1
 
 {
-    dies_ok {eval "9  %% 0"}, 'cannot divide by zero using infix:<%%>';
+    dies_ok {EVAL "9  %% 0"}, 'cannot divide by zero using infix:<%%>';
     #?rakudo todo "not sure why this doesn't fire"
-    dies_ok {eval "9 !%% 0"}, 'cannot divide by zero using infix:<%%>';
+    dies_ok {EVAL "9 !%% 0"}, 'cannot divide by zero using infix:<%%>';
 } #2

S03-operators/precedence.t

@@ -231,7 +231,7 @@ eval_dies_ok '1, 2 Z 3, 4 X 5, 6',
 
 # RT 73266
 {
-    try { eval 'say and die 73266' };
+    try { EVAL 'say and die 73266' };
     ok ~$! !~~ '73266', 'and after say is not interpreted as infix:<and>';
 }