X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FImport%2FInto.pm;h=a59ce66ecb260d2ff6862e5b4e81851e5e10a646;hb=9f39bd722eb803aeff0b567a10b921daa4f36448;hp=59c861bdd848b9391fe0ccd466ce7fce455084b1;hpb=ac6d2081e8a5f1e5dbe0f95685080edaf40ca48b;p=p5sagit%2FImport-Into.git

diff --git a/lib/Import/Into.pm b/lib/Import/Into.pm
index 59c861b..a59ce66 100644
--- a/lib/Import/Into.pm
+++ b/lib/Import/Into.pm
@@ -5,29 +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}
+  my ($package, $file, $line)
+    = $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;
@@ -44,11 +43,13 @@ Import::Into - import packages into other packages
 
   use Thing1 ();
   use Thing2 ();
+  use Thing3 ();
 
   sub import {
     my $target = caller;
     Thing1->import::into($target);
     Thing2->import::into($target, qw(import arguments));
+    Thing3->import::into(1); # import to level
   }
 
 Note: you don't need to do anything more clever than this provided you
@@ -74,6 +75,11 @@ C<import::into> on it. This is a global method, and is callable on any
 package (and in fact on any object as well, although it's rarer that you'd
 want to do that).
 
+If you provide C<import::into> with an integer instead of a package name, it
+will be used as the number of stack frames to skip to find where to export to.
+This has the advantage of preserving the apparent filename and line number
+being exported to, which some modules (L<autodie>, L<strictures>) check.
+
 Finally, we also provide an C<unimport::out_of> to allow the exporting of the
 effect of C<no>:
 
@@ -197,7 +203,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