X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FAutoLoader.pm;h=4352d8b1fbe1a46cc27ec718f8154ff26a4058c8;hb=531e2ba17c3281a8e6bbb5e7c03fd7923b41370f;hp=5b083a78944a952b7d51d4003aaa59299ad7fd2c;hpb=f610777fe6e5155eff71b75c639bbca2c354315c;p=p5sagit%2Fp5-mst-13.2.git diff --git a/lib/AutoLoader.pm b/lib/AutoLoader.pm index 5b083a7..4352d8b 100644 --- a/lib/AutoLoader.pm +++ b/lib/AutoLoader.pm @@ -1,20 +1,26 @@ package AutoLoader; -use vars qw(@EXPORT @EXPORT_OK); +use strict; +use 5.006_001; + +our($VERSION, $AUTOLOAD); my $is_dosish; +my $is_epoc; my $is_vms; +my $is_macos; BEGIN { - require Exporter; - @EXPORT = (); - @EXPORT_OK = qw(AUTOLOAD); - $is_dosish = $^O eq 'dos' || $^O eq 'os2' || $^O eq 'MSWin32'; + $is_dosish = $^O eq 'dos' || $^O eq 'os2' || $^O eq 'MSWin32' || $^O eq 'NetWare'; + $is_epoc = $^O eq 'epoc'; $is_vms = $^O eq 'VMS'; + $is_macos = $^O eq 'MacOS'; + $VERSION = '5.60'; } AUTOLOAD { - my $name; + my $sub = $AUTOLOAD; + my $filename; # Braces used to preserve $1 et al. { # Try to find the autoloaded file from the package-qualified @@ -30,10 +36,15 @@ AUTOLOAD { # In this case, we simple prepend the 'auto/' and let the # C take care of the searching for us. - my ($pkg,$func) = $AUTOLOAD =~ /(.*)::([^:]+)$/; + my ($pkg,$func) = ($sub =~ /(.*)::([^:]+)$/); $pkg =~ s#::#/#g; - if (defined($name=$INC{"$pkg.pm"})) { - $name =~ s#^(.*)$pkg\.pm$#$1auto/$pkg/$func.al#; + if (defined($filename = $INC{"$pkg.pm"})) { + if ($is_macos) { + $pkg =~ tr#/#:#; + $filename =~ s#^(.*)$pkg\.pm\z#$1auto:$pkg:$func.al#s; + } else { + $filename =~ s#^(.*)$pkg\.pm\z#$1auto/$pkg/$func.al#s; + } # if the file exists, then make sure that it is a # a fully anchored path (i.e either '/usr/lib/auto/foo/bar.al', @@ -41,56 +52,68 @@ AUTOLOAD { # (and failing) to find the 'lib/auto/foo/bar.al' because it # looked for 'lib/lib/auto/foo/bar.al', given @INC = ('lib'). - if (-r $name) { - unless ($name =~ m|^/|) { + if (-r $filename) { + unless ($filename =~ m|^/|s) { if ($is_dosish) { - unless ($name =~ m{^([a-z]:)?[\\/]}i) { - $name = "./$name"; + unless ($filename =~ m{^([a-z]:)?[\\/]}is) { + if ($^O ne 'NetWare') { + $filename = "./$filename"; + } else { + $filename = "$filename"; + } + } + } + elsif ($is_epoc) { + unless ($filename =~ m{^([a-z?]:)?[\\/]}is) { + $filename = "./$filename"; } } elsif ($is_vms) { - # XXX todo by VMSmiths - $name = "./$name"; + # XXX todo by VMSmiths + $filename = "./$filename"; } - else { - $name = "./$name"; + elsif (!$is_macos) { + $filename = "./$filename"; } } } else { - $name = undef; + $filename = undef; } } - unless (defined $name) { + unless (defined $filename) { # let C do the searching - $name = "auto/$AUTOLOAD.al"; - $name =~ s#::#/#g; + $filename = "auto/$sub.al"; + $filename =~ s#::#/#g; } } my $save = $@; - eval { local $SIG{__DIE__}; require $name }; + local $!; # Do not munge the value. + eval { local $SIG{__DIE__}; require $filename }; if ($@) { - if (substr($AUTOLOAD,-9) eq '::DESTROY') { - *$AUTOLOAD = sub {}; - } else { + if (substr($sub,-9) eq '::DESTROY') { + no strict 'refs'; + *$sub = sub {}; + $@ = undef; + } elsif ($@ =~ /^Can't locate/) { # The load might just have failed because the filename was too # long for some old SVR3 systems which treat long names as errors. - # If we can succesfully truncate a long name then it's worth a go. + # If we can successfully truncate a long name then it's worth a go. # There is a slight risk that we could pick up the wrong file here # but autosplit should have warned about that when splitting. - if ($name =~ s/(\w{12,})\.al$/substr($1,0,11).".al"/e){ - eval {local $SIG{__DIE__};require $name}; - } - if ($@){ - $@ =~ s/ at .*\n//; - my $error = $@; - require Carp; - Carp::croak($error); + if ($filename =~ s/(\w{12,})\.al$/substr($1,0,11).".al"/e){ + eval { local $SIG{__DIE__}; require $filename }; } } + if ($@){ + $@ =~ s/ at .*\n//; + my $error = $@; + require Carp; + Carp::croak($error); + } } $@ = $save; - goto &$AUTOLOAD; + goto &$sub; } sub import { @@ -101,7 +124,11 @@ sub import { # Export symbols, but not by accident of inheritance. # - Exporter::export $pkg, $callpkg, @_ if $pkg eq 'AutoLoader'; + if ($pkg eq 'AutoLoader') { + no strict 'refs'; + *{ $callpkg . '::AUTOLOAD' } = \&AUTOLOAD + if @_ and $_[0] =~ /^&?AUTOLOAD$/; + } # # Try to find the autosplit index file. Eg., if the call package @@ -119,7 +146,13 @@ sub import { my $path = $INC{$calldir . '.pm'}; if (defined($path)) { # Try absolute path name. - $path =~ s#^(.*)$calldir\.pm$#$1auto/$calldir/autosplit.ix#; + if ($is_macos) { + (my $malldir = $calldir) =~ tr#/#:#; + $path =~ s#^(.*)$malldir\.pm\z#$1auto:$malldir:autosplit.ix#s; + } else { + $path =~ s#^(.*)$calldir\.pm\z#$1auto/$calldir/autosplit.ix#; + } + eval { require $path; }; # If that failed, try relative path with normal @INC searching. if ($@) { @@ -134,6 +167,15 @@ sub import { } } +sub unimport { + my $callpkg = caller; + + no strict 'refs'; + my $symname = $callpkg . '::AUTOLOAD'; + undef *{ $symname } if \&{ $symname } == \&AUTOLOAD; + *{ $symname } = \&{ $symname }; +} + 1; __END__ @@ -219,20 +261,20 @@ lines: use Carp; sub AUTOLOAD { - my $constname; - ($constname = $AUTOLOAD) =~ s/.*:://; + my $sub = $AUTOLOAD; + (my $constname = $sub) =~ s/.*:://; my $val = constant($constname, @_ ? $_[0] : 0); if ($! != 0) { - if ($! =~ /Invalid/) { - $AutoLoader::AUTOLOAD = $AUTOLOAD; + if ($! =~ /Invalid/ || $!{EINVAL}) { + $AutoLoader::AUTOLOAD = $sub; goto &AutoLoader::AUTOLOAD; } else { croak "Your vendor has not defined constant $constname"; } } - *$AUTOLOAD = sub { $val }; # same as: eval "sub $AUTOLOAD { $val }"; - goto &$AUTOLOAD; + *$sub = sub { $val }; # same as: eval "sub $sub { $val }"; + goto &$sub; } If any module's own AUTOLOAD subroutine has no need to fallback to the @@ -253,6 +295,12 @@ the package namespace. Variables pre-declared with this pragma will be visible to any autoloaded routines (but will not be invisible outside the package, unfortunately). +=head2 Not Using AutoLoader + +You can stop using AutoLoader by simply + + no AutoLoader; + =head2 B vs. B The B is similar in purpose to B: both delay the