the double eval isn't necessary anymore

[gitmo/Eval-Closure.git] / lib / Eval / Closure.pm

diff --git a/lib/Eval/Closure.pm b/lib/Eval/Closure.pm
index 4a39ed2..161bcdf 100644 (file)
--- a/lib/Eval/Closure.pm
+++ b/lib/Eval/Closure.pm
@@ -36,11 +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).
+(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 this problem. It provides an C<eval_closure>
+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.
+of specified variables. Compilation errors are rethrown automatically.
 
 =cut
 
@@ -194,24 +196,22 @@ sub _make_compiler {
     return @{ _clean_eval($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
+    local $@;
+    local $SIG{__DIE__};
+    my $compiler = eval $_[0];
+    my $e = $@;
+    [ $compiler, $e ];
 }
 
+$Eval::Closure::SANDBOX_ID = 0;
+
 sub _make_compiler_source {
     my ($source, @capture_keys) = @_;
+    $Eval::Closure::SANDBOX_ID++;
     my $i = 0;
     return join "\n", (
+        "package Eval::Closure::Sandbox_$Eval::Closure::SANDBOX_ID;",
         'sub {',
         (map {
             'my ' . $_ . ' = ' . substr($_, 0, 1) . '{$_[' . $i++ . ']};'