X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2Fsubs%2Fauto.pm;h=0625cc68078143780a94d44baace6d99a9f4259d;hb=c31abfbd7888d62dabfd301cc5f7435d7897e63f;hp=6c4bf274c10334ae9f6e8ff9c252656fe2e5f82b;hpb=a458a01af6d6d0e328ffc36afdcbd96628ae2e71;p=perl%2Fmodules%2Fsubs-auto.git

diff --git a/lib/subs/auto.pm b/lib/subs/auto.pm
index 6c4bf27..0625cc6 100644
--- a/lib/subs/auto.pm
+++ b/lib/subs/auto.pm
@@ -45,6 +45,18 @@ our $VERSION = '0.01';
 
 This pragma lexically enables the parsing of any bareword as a subroutine name, except those which corresponds to an entry in C<%INC> (expected to be class names) or whose symbol table entry has a IO slot (expected to be filehandles).
 
+You can pass options to C<import> as key / value pairs :
+
+=over 4
+
+=item *
+
+C<< in => $pkg >>
+
+Specifies on which package the pragma should act. Defaults to the current package.
+
+=back
+
 =cut
 
 BEGIN {
@@ -146,25 +158,27 @@ my $wiz = wizard data  => sub { +{ pkg => $_[1] } },
 
 my %pkgs;
 
+sub _validate_pkg {
+ my ($pkg, $cur) = @_;
+ return $cur unless $pkg;
+ croak 'Invalid package name' if ref $pkg
+                              or $pkg =~ /(?:-|[^\w:])/
+                              or $pkg =~ /(?:\A\d|\b:(?::\d|(?:::+)?\b))/;
+ $pkg =~ s/::$//;
+ $pkg = $cur . $pkg if $pkg eq '' or $pkg =~ /^::/;
+ $pkg;
+}
+
 sub import {
  shift;
  croak 'Optional arguments must be passed as keys/values pairs' if @_ % 2;
  my %args = @_;
- my $cur = (caller 1)[0];
- my $pkg;
- if ($pkg = $args{in}) {
-  croak 'Invalid package name' if ref $pkg
-                               or $pkg =~ /(?:-|[^\w:])/
-                               or $pkg =~ /(?:\A\d|\b:(?::\d|(?:::+)?\b))/;
-  $pkg =~ s/::$//;
-  $pkg = $cur . $pkg if $pkg eq '' or $pkg =~ /^::/;
- } else {
-  $pkg = $cur;
- }
+ my $cur  = (caller 1)[0];
+ my $in   = _validate_pkg $args{in}, $cur;
  $^H{bareword} = 1;
- ++$pkgs{$pkg};
+ ++$pkgs{$in};
  no strict 'refs';
- cast %{$pkg . '::'}, $wiz, $pkg;
+ cast %{$in . '::'}, $wiz, $in;
 }
 
 sub unimport {
@@ -187,6 +201,8 @@ None.
 
 C<*{'::foo'}{CODE}> will appear as defined in a scope where the pragma is enabled, C<foo> is used as a bareword, but is never actually defined afterwards. This may or may not be considered as Doing The Right Thing. However, C<*{'::foo'}{CODE}> will always return the right value if you fetch it outside the pragma's scope. Actually, you can make it return the right value even in the pragma's scope by reading C<*{'::foo'}{CODE}> outside (or by actually defining C<foo>, which is ultimately why you use this pragma, right ?).
 
+You have to open global filehandles outside of the scope of this pragma if you want them not to be treated as function calls. Or just use lexical filehandles and default ones as you should be.
+
 =head1 DEPENDENCIES
 
 L<perl> 5.10.0.