eval code directly instead of generating a sub

[p5sagit/Import-Into.git] / lib / Import / Into.pm

diff --git a/lib/Import/Into.pm b/lib/Import/Into.pm
index b1daa54..3314ec3 100644 (file)
--- a/lib/Import/Into.pm
+++ b/lib/Import/Into.pm
@@ -3,27 +3,26 @@ 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 + 1);
+  qq{package $package;\n}
+    . ($file ? "#line $line \"$file\"\n" : '')
 }
-  
 
 sub import::into {
   my ($class, $target, @args) = @_;
-  $class->${_importer($target)}(import => @args);
+  eval _prelude($target) . '$class->import(@args); 1'
+    or die $@;
 }
 
 sub unimport::out_of {
   my ($class, $target, @args) = @_;
-  $class->${_importer($target)}(unimport => @args);
+  eval _prelude($target) . '$class->unimport(@args); 1'
+    or die $@;
 }
 
 1;
@@ -73,6 +72,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 +180,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