X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FEval%2FClosure.pm;h=ccd2bbc1de3894c3e54133ad2d38fd0dde802ba9;hb=9b61f78189993a7bdc82b034ea64cd1a66084f66;hp=787754c7e79681ead9991cff42391f9d6be89eac;hpb=1a2acf758e0e3bcd0694753469d237ebc356e8c1;p=gitmo%2FEval-Closure.git

diff --git a/lib/Eval/Closure.pm b/lib/Eval/Closure.pm
index 787754c..ccd2bbc 100644
--- a/lib/Eval/Closure.pm
+++ b/lib/Eval/Closure.pm
@@ -36,16 +36,13 @@ String eval is often used for dynamic code generation. For instance, C<Moose>
 uses it heavily, to generate inlined versions of accessors and constructors,
 which speeds code up at runtime by a significant amount. String eval is not
 without its issues however - it's difficult to control the scope it's used in
-(which determines which variables are in scope inside the eval), and it can be
-quite slow, especially if doing a large number of evals.
+(which determines which variables are in scope inside the eval), and it's easy
+to miss compilation errors, since eval catches them and sticks them in $@
+instead.
 
-This module attempts to solve both of those problems. It provides an
-C<eval_closure> function, which evals a string in a clean environment, other
-than a fixed list of specified variables. It also caches the result of the
-eval, so that doing repeated evals of the same source, even with a different
-environment, will be much faster (but note that the description is part of the
-string to be evaled, so it must also be the same (or non-existent) if caching
-is to work properly).
+This module attempts to solve these problems. It provides an C<eval_closure>
+function, which evals a string in a clean environment, other than a fixed list
+of specified variables. Compilation errors are rethrown automatically.
 
 =cut
 
@@ -193,22 +190,24 @@ sub _clean_eval_closure {
     return ($code, $e);
 }
 
-{
-    my %compiler_cache;
+sub _make_compiler {
+    my $source = _make_compiler_source(@_);
 
-    sub _make_compiler {
-        my $source = _make_compiler_source(@_);
-
-        unless (exists $compiler_cache{$source}) {
-            local $@;
-            local $SIG{__DIE__};
-            my $compiler = eval $source;
-            my $e = $@;
-            $compiler_cache{$source} = [ $compiler, $e ];
-        }
+    return @{ _clean_eval($source) };
+}
 
-        return @{ $compiler_cache{$source} };
-    }
+$Eval::Closure::SANDBOX_ID = 0;
+
+sub _clean_eval {
+    $Eval::Closure::SANDBOX_ID++;
+    return eval <<EVAL;
+package Eval::Closure::Sandbox_$Eval::Closure::SANDBOX_ID;
+local \$@;
+local \$SIG{__DIE__};
+my \$compiler = eval \$_[0];
+my \$e = \$@;
+[ \$compiler, \$e ];
+EVAL
 }
 
 sub _make_compiler_source {