X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FAutoLoader.pm;h=28be69f8780f21cafa807a76e9418ef97ecd9f22;hb=dfa4e5d386dd8c5329351699b02085856cdd140e;hp=4b2261ed7d28fbb988cebfb177594d56a52f2f13;hpb=4d6b4052f6d8ee82bf0dff017df8eaa089f29e9f;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/AutoLoader.pm b/lib/AutoLoader.pm
index 4b2261e..28be69f 100644
--- a/lib/AutoLoader.pm
+++ b/lib/AutoLoader.pm
@@ -1,7 +1,9 @@
 package AutoLoader;
 
-use 5.6.0;
-our(@EXPORT, @EXPORT_OK, $VERSION);
+use strict;
+use 5.006_001;
+
+our($VERSION, $AUTOLOAD);
 
 my $is_dosish;
 my $is_epoc;
@@ -9,18 +11,63 @@ 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' || $^O eq 'NetWare';
     $is_epoc = $^O eq 'epoc';
     $is_vms = $^O eq 'VMS';
     $is_macos = $^O eq 'MacOS';
-    $VERSION = '5.58';
+    $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.
     {
@@ -42,9 +89,11 @@ AUTOLOAD {
 	if (defined($filename = $INC{"$pkg.pm"})) {
 	    if ($is_macos) {
 		$pkg =~ tr#/#:#;
-		$filename =~ s#^(.*)$pkg\.pm\z#$1auto:$pkg:$func.al#s;
+		$filename = undef
+		  unless $filename =~ s#^(.*)$pkg\.pm\z#$1auto:$pkg:$func.al#s;
 	    } else {
-		$filename =~ s#^(.*)$pkg\.pm\z#$1auto/$pkg/$func.al#s;
+		$filename = undef
+		  unless $filename =~ s#^(.*)$pkg\.pm\z#$1auto/$pkg/$func.al#s;
 	    }
 
 	    # if the file exists, then make sure that it is a
@@ -53,15 +102,15 @@ 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) {
-			     if ($^O ne 'NetWare') {
-					$filename = "./$filename";
-				} else {
-					$filename = "$filename";
-				}
+			    if ($^O ne 'NetWare') {
+				$filename = "./$filename";
+			    } else {
+				$filename = "$filename";
+			    }
 			}
 		    }
 		    elsif ($is_epoc) {
@@ -88,31 +137,7 @@ AUTOLOAD {
 	    $filename =~ s#::#/#g;
 	}
     }
-    my $save = $@;
-    local $!; # Do not munge the value. 
-    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 {
@@ -124,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;
+	}
     }
 
     #
@@ -166,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;