Make EVAL() and .EVAL really Cool

rakudo · Jul 9, 2014 · 95e3ca4 · 95e3ca4
1 parent 3bd00dd
commit 95e3ca4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/core/Cool.pm b/src/core/Cool.pm
@@ -214,12 +214,8 @@ my class Cool { # declared in BOOTSTRAP
     method trim-leading () { self.Stringy.trim-leading  };
     method trim-trailing() { self.Stringy.trim-trailing };
 
-    method eval(*%opts) {  # is DEPRECATED doesn't work in settings
-        DEPRECATED("'EVAL'");
-        EVAL(self.Stringy, context => CALLER::, |%opts);
-    }
     method EVAL(*%opts) {
-        EVAL(self.Stringy, context => CALLER::, |%opts);
+        EVAL(self, context => CALLER::, |%opts);
     }
 
     multi method Real() { self.Numeric.Real }

diff --git a/src/core/control.pm b/src/core/control.pm
@@ -161,13 +161,13 @@ multi sub warn(*@msg) is hidden_from_backtrace {
 }
 
 proto sub EVAL($, *%) {*}
-multi sub EVAL(Str $code, :$lang = 'perl6', PseudoStash :$context) {
+multi sub EVAL(Cool $code, :$lang = 'perl6', PseudoStash :$context) {
     my $eval_ctx := nqp::getattr(nqp::decont($context // CALLER::), PseudoStash, '$!ctx');
     my $?FILES   := 'EVAL_' ~ (state $no)++;
     my $compiler := nqp::getcomp($lang);
     X::Eval::NoSuchLang.new(:$lang).throw
         if nqp::isnull($compiler);
-    my $compiled := $compiler.compile($code, :outer_ctx($eval_ctx), :global(GLOBAL));
+    my $compiled := $compiler.compile($code.Stringy, :outer_ctx($eval_ctx), :global(GLOBAL));
     nqp::forceouterctx(nqp::getattr($compiled, ForeignCode, '$!do'), $eval_ctx);
     $compiled();
 }