X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FAutoLoader.pm;h=b42d5ff4b68cde79580f8a0eadaf8c8bb981a58a;hb=f6d6199cd6711f5e8a8e6c1a57445fa6f848c822;hp=8e15c1f60c8de4744bb3e14fb97147f637bf5394;hpb=e3d0cac0c3bf9ec77cb3e2fc362639f009d309e4;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/AutoLoader.pm b/lib/AutoLoader.pm
index 8e15c1f..b42d5ff 100644
--- a/lib/AutoLoader.pm
+++ b/lib/AutoLoader.pm
@@ -1,17 +1,22 @@
 package AutoLoader;
 
-# use vars qw(@EXPORT @EXPORT_OK $VERSION);
+use 5.006_001;
+our(@EXPORT, @EXPORT_OK, $VERSION);
 
 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 = $VERSION = '5.57';
+    $is_macos = $^O eq 'MacOS';
+    $VERSION = '5.59';
 }
 
 AUTOLOAD {
@@ -35,7 +40,12 @@ AUTOLOAD {
 	my ($pkg,$func) = ($sub =~ /(.*)::([^:]+)$/);
 	$pkg =~ s#::#/#g;
 	if (defined($filename = $INC{"$pkg.pm"})) {
-	    $filename =~ s#^(.*)$pkg\.pm$#$1auto/$pkg/$func.al#;
+	    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',
@@ -44,9 +54,18 @@ AUTOLOAD {
 	    # looked for 'lib/lib/auto/foo/bar.al', given @INC = ('lib').
 
 	    if (-r $filename) {
-		unless ($filename =~ m|^/|) {
+		unless ($filename =~ m|^/|s) {
 		    if ($is_dosish) {
-			unless ($filename =~ m{^([a-z]:)?[\\/]}i) {
+			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";
 			}
 		    }
@@ -54,7 +73,7 @@ AUTOLOAD {
 			# XXX todo by VMSmiths
 			$filename = "./$filename";
 		    }
-		    else {
+		    elsif (!$is_macos) {
 			$filename = "./$filename";
 		    }
 		}
@@ -70,6 +89,7 @@ AUTOLOAD {
 	}
     }
     my $save = $@;
+    local $!; # Do not munge the value. 
     eval { local $SIG{__DIE__}; require $filename };
     if ($@) {
 	if (substr($sub,-9) eq '::DESTROY') {
@@ -124,7 +144,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 ($@) {
@@ -139,6 +165,11 @@ sub import {
     } 
 }
 
+sub unimport {
+  my $callpkg = caller;
+  eval "package $callpkg; sub AUTOLOAD;";
+}
+
 1;
 
 __END__
@@ -258,6 +289,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<AutoLoader> vs. B<SelfLoader>
 
 The B<AutoLoader> is similar in purpose to B<SelfLoader>: both delay the