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

diff --git a/lib/Import/Into.pm b/lib/Import/Into.pm
index b1daa54..a9f4a6c 100644
--- a/lib/Import/Into.pm
+++ b/lib/Import/Into.pm
@@ -3,27 +3,30 @@ package Import::Into;
 use strict;
 use warnings FATAL => 'all';
 
-our $VERSION = '1.000003'; # 1.0.3
+our $VERSION = '1.001001'; # 1.1.1
 
-my %importers;
-
-sub _importer {
+sub _prelude {
   my $target = shift;
-  \($importers{$target} ||= eval qq{
-    package $target;
-    sub { my \$m = splice \@_, 1, 1; shift->\$m(\@_) };
-  } or die "Couldn't build importer for $target: $@")
+  my ($package, $file, $line)
+    = $target =~ /[^0-9]/ ? ($target) : caller($target + 2);
+  qq{package $package;\n}
+    . ($file ? "#line $line \"$file\"\n" : '')
+}
+
+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;
@@ -73,6 +76,7 @@ want to do that).
 Finally, we also provide an C<unimport::out_of> to allow the exporting of the
 effect of C<no>:
 
+  # unimport::out_of was added in 1.1.0 (1.001000)
   sub unimport {
     Moose->unimport::out_of(scalar caller); # no MyThing == no Moose
   }
@@ -180,13 +184,19 @@ you're receiving this from a parameter, I recommend using L<Module::Runtime>:
 
 And that's it.
 
+=head1 ACKNOWLEDGEMENTS
+
+Thanks to Getty for asking "how can I get C<< use strict; use warnings; >>
+turned on for all consumers of my code?" and then "why is this not a
+module?!".
+
 =head1 AUTHOR
 
 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