X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FImport%2FInto.pm;h=a9f4a6cfdc9013e2a19bc71cfecb6965a8b3a8c3;hb=5f5f09b18af4987858e59a00204ceb49ff6f8ed0;hp=b7d645fa800969a1a0163a323a643e02d4ad6ecd;hpb=3946b3211d4c1adef2221543abd60c8f80088b99;p=p5sagit%2FImport-Into.git

diff --git a/lib/Import/Into.pm b/lib/Import/Into.pm
index b7d645f..a9f4a6c 100644
--- a/lib/Import/Into.pm
+++ b/lib/Import/Into.pm
@@ -5,30 +5,28 @@ use warnings FATAL => 'all';
 
 our $VERSION = '1.001001'; # 1.1.1
 
-my %importers;
-
-sub _importer {
+sub _prelude {
   my $target = shift;
   my ($package, $file, $line)
-    = $target =~ /[^0-9]/ ? ($target) : caller($target + 1);
-  my $code = qq{package $package;\n}
+    = $target =~ /[^0-9]/ ? ($target) : caller($target + 2);
+  qq{package $package;\n}
     . ($file ? "#line $line \"$file\"\n" : '')
-    . 'sub { my $m = splice @_, 1, 1; shift->$m(@_) };'."\n";
-  my $sub = \(eval $code
-    or die "Couldn't build importer for $package: $@");
-  $importers{$target} = $sub
-    unless $file;
-  $sub;
+}
+
+sub _make_action {
+  my ($action, $target) = @_;
+  eval _prelude($target).qq{sub { shift->$action(\@_) }}
+    or die "Failed to build action sub to ${action} for ${target}: $@";
 }
 
 sub import::into {
   my ($class, $target, @args) = @_;
-  $class->${_importer($target)}(import => @args);
+  _make_action(import => $target)->($class, @args);
 }
 
 sub unimport::out_of {
   my ($class, $target, @args) = @_;
-  $class->${_importer($target)}(unimport => @args);
+  _make_action(unimport => $target)->($class, @args);
 }
 
 1;
@@ -198,7 +196,7 @@ mst - Matt S. Trout (cpan:MSTROUT) <mst@shadowcat.co.uk>
 
 =head1 CONTRIBUTORS
 
-None yet - maybe this software is perfect! (ahahahahahahahahaha)
+haarg - Graham Knop (cpan:HAARG) <haarg@haarg.org>
 
 =head1 COPYRIGHT