diff options
author | Jesse Luehrs <doy@tozt.net> | 2011-08-02 01:10:22 -0500 |
---|---|---|
committer | Jesse Luehrs <doy@tozt.net> | 2011-08-02 01:44:09 -0500 |
commit | 794dc9df98d2aaf2f143f32ac7dfa42fa46ce07e (patch) | |
tree | b69e18746bb51909368fa7679de263031c3e18d7 | |
parent | 0fb2ea464c6eb6c52831d44ef541a0d4d5c95a92 (diff) | |
download | eval-closure-794dc9df98d2aaf2f143f32ac7dfa42fa46ce07e.tar.gz eval-closure-794dc9df98d2aaf2f143f32ac7dfa42fa46ce07e.zip |
compile each thing in a separate package, to avoid leakage
-rw-r--r-- | lib/Eval/Closure.pm | 18 | ||||
-rw-r--r-- | t/compiling-package.t | 29 |
2 files changed, 34 insertions, 13 deletions
diff --git a/lib/Eval/Closure.pm b/lib/Eval/Closure.pm index 23cf250..42c20da 100644 --- a/lib/Eval/Closure.pm +++ b/lib/Eval/Closure.pm @@ -207,14 +207,18 @@ sub _clean_eval_closure { } } +$Eval::Closure::SANDBOX_ID = 0; + sub _clean_eval { - package # hide from PAUSE - Eval::Closure::Sandbox; - local $@; - local $SIG{__DIE__}; - my $compiler = eval $_[0]; - my $e = $@; - return [ $compiler, $e ]; + $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 { diff --git a/t/compiling-package.t b/t/compiling-package.t index 5c3764f..09b4d0b 100644 --- a/t/compiling-package.t +++ b/t/compiling-package.t @@ -5,13 +5,30 @@ use Test::More; use Eval::Closure; -my $code = eval_closure( - source => 'no strict "refs"; sub { keys %{__PACKAGE__ . "::"} }', -); +{ + my $code = eval_closure( + source => 'no strict "refs"; sub { keys %{__PACKAGE__ . "::"} }', + ); -# defining the sub { } creates __ANON__, calling 'no strict' creates BEGIN -my @stash_keys = grep { $_ ne '__ANON__' && $_ ne 'BEGIN' } $code->(); + # defining the sub { } creates __ANON__, calling 'no strict' creates BEGIN + my @stash_keys = grep { $_ ne '__ANON__' && $_ ne 'BEGIN' } $code->(); -is_deeply([@stash_keys], [], "compiled in an empty package"); + is_deeply([@stash_keys], [], "compiled in an empty package"); +} + +{ + # the more common case where you'd run into this is imported subs + # for instance, Bread::Board::as vs Moose::Util::TypeConstraints::as + my $c1 = eval_closure( + source => 'no strict "vars"; sub { ++$foo }', + ); + my $c2 = eval_closure( + source => 'no strict "vars"; sub { --$foo }', + ); + is($c1->(), 1); + is($c1->(), 2); + is($c2->(), -1); + is($c2->(), -2); +} done_testing; |