Generate OP_IS_SOCKET() and OP_IS_FILETEST() macros

[p5sagit/p5-mst-13.2.git] / lib / AutoLoader.pm

diff --git a/lib/AutoLoader.pm b/lib/AutoLoader.pm
index d62ceb0..c26db72 100644 (file)
--- a/lib/AutoLoader.pm
+++ b/lib/AutoLoader.pm
@@ -36,7 +36,7 @@ AUTOLOAD {
        my ($pkg,$func) = ($sub =~ /(.*)::([^:]+)$/);
        $pkg =~ s#::#/#g;
        if (defined($filename = $INC{"$pkg.pm"})) {
-           $filename =~ s#^(.*)$pkg\.pm$#$1auto/$pkg/$func.al#;
+           $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',
@@ -45,9 +45,9 @@ 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) {
                             $filename = "./$filename";
                        }
                    }
@@ -140,6 +140,11 @@ sub import {
     } 
 }
 
+sub unimport {
+  my $callpkg = caller;
+  eval "package $callpkg; sub AUTOLOAD;";
+}
+
 1;
 
 __END__
@@ -259,6 +264,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