turn setting the current package into a parameter

2 files changed, 10 insertions, 9 deletions

diff --git a/lib/Reply/Plugin/Defaults.pm b/lib/Reply/Plugin/Defaults.pm
index debed09..f1813fb 100644
--- a/lib/Reply/Plugin/Defaults.pm
+++ b/lib/Reply/Plugin/Defaults.pm
@@ -26,7 +26,6 @@ sub read_line {
 }
 
 (my $PREFIX = <<'PREFIX') =~ s/__PACKAGE__/__PACKAGE__/ge;
-package main;
 BEGIN {
     $^H = $__PACKAGE__::default_hints;
     %^H = %$__PACKAGE__::default_hinthash;
@@ -47,8 +46,11 @@ sub compile {
         $args{environment} = { map { %$_ } @envs }
     }
 
+    my $package = delete $args{package} || 'main';
+    my $prefix = "package $package;\n$PREFIX";
+
     return eval_closure(
-        source      => "sub {\n$PREFIX;\n$line\n}",
+        source      => "sub {\n$prefix;\n$line\n}",
         terse_error => 1,
         %args,
     );
diff --git a/lib/Reply/Plugin/Packages.pm b/lib/Reply/Plugin/Packages.pm
index eb69f96..d6fad68 100644
--- a/lib/Reply/Plugin/Packages.pm
+++ b/lib/Reply/Plugin/Packages.pm
@@ -36,7 +36,6 @@ sub mangle_line {
 
     my $package = __PACKAGE__;
     return <<LINE;
-package $self->{package};
 $line
 ;
 BEGIN {
@@ -47,16 +46,16 @@ LINE
 
 sub compile {
     my $self = shift;
-    my ($next, @args) = @_;
+    my ($next, $line, %args) = @_;
+
+    $args{package} = $self->{package};
+
+    my @result = $next->($line, %args);
 
     # XXX it'd be nice to avoid using globals here, but we can't use
     # eval_closure's environment parameter since we need to access the
     # information in a BEGIN block
-    our $package = $self->{package};
-
-    my @result = $next->(@args);
-
-    $self->{package} = $package;
+    $self->{package} = our $package;
 
     return @result;
 }