Upgrade to AutoLoader-5.63

[perl5.git] / lib / AutoLoader.pm

diff --git a/lib/AutoLoader.pm b/lib/AutoLoader.pm
index af33ee8..28be69f 100644 (file)
--- a/lib/AutoLoader.pm
+++ b/lib/AutoLoader.pm
@@ -1,24 +1,73 @@
 package AutoLoader;
 
-use 5.005_64;
-our(@EXPORT, @EXPORT_OK, $VERSION);
+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 = ();
-    @EXPORT_OK = @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';
-    $VERSION = '5.57';
+    $is_macos = $^O eq 'MacOS';
+    $VERSION = '5.63';
 }
 
 AUTOLOAD {
     my $sub = $AUTOLOAD;
+    my $filename = AutoLoader::find_filename( $sub );
+
+    my $save = $@;
+    local $!; # Do not munge the value. 
+    eval { local $SIG{__DIE__}; require $filename };
+    if ($@) {
+       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 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 ($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 &$sub;
+}
+
+sub can {
+    my ($self, $method) = @_;
+
+    my $parent          = $self->SUPER::can( $method );
+    return $parent if $parent;
+
+    my $package         = ref( $self ) || $self;
+    my $filename        = AutoLoader::find_filename( $package . '::' . $method );
+    local $@;
+    return unless eval { require $filename };
+
+    no strict 'refs';
+    return \&{ $package . '::' . $method };
+}
+
+sub find_filename {
+    my $sub = shift;
     my $filename;
     # Braces used to preserve $1 et al.
     {
@@ -38,7 +87,14 @@ AUTOLOAD {
        my ($pkg,$func) = ($sub =~ /(.*)::([^:]+)$/);
        $pkg =~ s#::#/#g;
        if (defined($filename = $INC{"$pkg.pm"})) {
-           $filename =~ s#^(.*)$pkg\.pm\z#$1auto/$pkg/$func.al#s;
+           if ($is_macos) {
+               $pkg =~ tr#/#:#;
+               $filename = undef
+                 unless $filename =~ s#^(.*)$pkg\.pm\z#$1auto:$pkg:$func.al#s;
+           } else {
+               $filename = undef
+                 unless $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',
@@ -46,22 +102,27 @@ 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 $filename) {
+           if (defined $filename and -r $filename) {
                unless ($filename =~ m|^/|s) {
                    if ($is_dosish) {
                        unless ($filename =~ m{^([a-z]:)?[\\/]}is) {
-                            $filename = "./$filename";
+                           if ($^O ne 'NetWare') {
+                               $filename = "./$filename";
+                           } else {
+                               $filename = "$filename";
+                           }
                        }
                    }
                    elsif ($is_epoc) {
                        unless ($filename =~ m{^([a-z?]:)?[\\/]}is) {
                             $filename = "./$filename";
                        }
-                   }elsif ($is_vms) {
+                   }
+                   elsif ($is_vms) {
                        # XXX todo by VMSmiths
                        $filename = "./$filename";
                    }
-                   else {
+                   elsif (!$is_macos) {
                        $filename = "./$filename";
                    }
                }
@@ -76,30 +137,7 @@ AUTOLOAD {
            $filename =~ s#::#/#g;
        }
     }
-    my $save = $@;
-    eval { local $SIG{__DIE__}; require $filename };
-    if ($@) {
-       if (substr($sub,-9) eq '::DESTROY') {
-           *$sub = sub {};
-       } else {
-           # 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.
-           # There is a slight risk that we could pick up the wrong file here
-           # but autosplit should have warned about that when splitting.
-           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 &$sub;
+    return $filename;
 }
 
 sub import {
@@ -111,8 +149,11 @@ sub import {
     #
 
     if ($pkg eq 'AutoLoader') {
-      local $Exporter::ExportLevel = 1;
-      Exporter::import $pkg, @_;
+       if ( @_ and $_[0] =~ /^&?AUTOLOAD$/ ) {
+           no strict 'refs';
+           *{ $callpkg . '::AUTOLOAD' } = \&AUTOLOAD;
+           *{ $callpkg . '::can'      } = \&can;
+       }
     }
 
     #
@@ -131,7 +172,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 ($@) {
@@ -147,8 +194,15 @@ sub import {
 }
 
 sub unimport {
-  my $callpkg = caller;
-  eval "package $callpkg; sub AUTOLOAD;";
+    my $callpkg = caller;
+
+    no strict 'refs';
+
+    for my $exported (qw( AUTOLOAD can )) {
+       my $symname = $callpkg . '::' . $exported;
+       undef *{ $symname } if \&{ $symname } == \&{ $exported };
+       *{ $symname } = \&{ $symname };
+    }
 }
 
 1;