From: Rick Delaney <rick@consumercontact.com>
Date: Tue, 23 Sep 2003 12:14:52 +0000 (-0400)
Subject: (was Re: require() does not behave aas documented)
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=4d8b06f1629b5d0007e3c48de953ec16cd80d51f;p=p5sagit%2Fp5-mst-13.2.git

(was Re: require() does not behave aas documented)
Message-ID: <20030923121452.G18845@biff.bort.ca>

p4raw-id: //depot/perl@21415
---

diff --git a/pp_ctl.c b/pp_ctl.c
index 37e5c0b..5a7fdaa 100644
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -1402,6 +1402,9 @@ Perl_die_where(pTHX_ char *message, STRLEN msglen)
 
 	    if (optype == OP_REQUIRE) {
 		char* msg = SvPVx(ERRSV, n_a);
+               SV *nsv = cx->blk_eval.old_namesv;
+               (void)hv_store(GvHVn(PL_incgv), SvPVX(nsv), SvCUR(nsv),
+                               &PL_sv_undef, 0);
 		DIE(aTHX_ "%sCompilation failed in require",
 		    *msg ? msg : "Unknown error\n");
 	    }
@@ -2842,7 +2845,7 @@ S_doeval(pTHX_ int gimme, OP** startop, CV* outside, U32 seq)
 	sv_setpv(ERRSV,"");
     if (yyparse() || PL_error_count || !PL_eval_root) {
 	SV **newsp;			/* Used by POPBLOCK. */
-	PERL_CONTEXT *cx;
+       PERL_CONTEXT *cx = &cxstack[cxstack_ix];
 	I32 optype = 0;			/* Might be reset by POPEVAL. */
 	STRLEN n_a;
 	
@@ -2861,6 +2864,9 @@ S_doeval(pTHX_ int gimme, OP** startop, CV* outside, U32 seq)
 	LEAVE;
 	if (optype == OP_REQUIRE) {
 	    char* msg = SvPVx(ERRSV, n_a);
+           SV *nsv = cx->blk_eval.old_namesv;
+           (void)hv_store(GvHVn(PL_incgv), SvPVX(nsv), SvCUR(nsv),
+                          &PL_sv_undef, 0);
 	    DIE(aTHX_ "%sCompilation failed in require",
 		*msg ? msg : "Unknown error\n");
 	}
@@ -3049,9 +3055,12 @@ PP(pp_require)
 	DIE(aTHX_ "Null filename used");
     TAINT_PROPER("require");
     if (PL_op->op_type == OP_REQUIRE &&
-      (svp = hv_fetch(GvHVn(PL_incgv), name, len, 0)) &&
-      *svp != &PL_sv_undef)
-	RETPUSHYES;
+       (svp = hv_fetch(GvHVn(PL_incgv), name, len, 0))) {
+       if (*svp != &PL_sv_undef)
+           RETPUSHYES;
+       else
+           DIE(aTHX_ "Compilation failed in require");
+    }
 
     /* prepare to compile file */
 
diff --git a/t/comp/require.t b/t/comp/require.t
index c82d535..fa75e18 100755
--- a/t/comp/require.t
+++ b/t/comp/require.t
@@ -11,7 +11,7 @@ $i = 1;
 
 my $Is_EBCDIC = (ord('A') == 193) ? 1 : 0;
 my $Is_UTF8   = (${^OPEN} || "") =~ /:utf8/;
-my $total_tests = 30;
+my $total_tests = 44;
 if ($Is_EBCDIC || $Is_UTF8) { $total_tests = 27; }
 print "1..$total_tests\n";
 
@@ -108,6 +108,24 @@ do_require "0;\n";
 print "# $@\nnot " unless $@ =~ /did not return a true/;
 print "ok ",$i++,"\n";
 
+print "not " if exists $INC{'bleah.pm'};
+print "ok ",$i++,"\n";
+
+my $flag_file = 'bleah.flg';
+# run-time error in require
+for my $expected_compile (1,0) {
+    write_file($flag_file, 1);
+    print "not " unless -e $flag_file;
+    print "ok ",$i++,"\n";
+    write_file('bleah.pm', "unlink '$flag_file' or die; \$a=0; \$b=1/\$a; 1;\n");
+    print "# $@\nnot " if eval { require 'bleah.pm' };
+    print "ok ",$i++,"\n";
+    print "not " unless -e $flag_file xor $expected_compile;
+    print "ok ",$i++,"\n";
+    print "not " unless exists $INC{'bleah.pm'};
+    print "ok ",$i++,"\n";
+}
+
 # compile-time failure in require
 do_require "1)\n";
 # bison says 'parse error' instead of 'syntax error',
@@ -115,6 +133,20 @@ do_require "1)\n";
 print "# $@\nnot " unless $@ =~ /(syntax|parse) error/mi;
 print "ok ",$i++,"\n";
 
+# previous failure cached in %INC
+print "not " unless exists $INC{'bleah.pm'};
+print "ok ",$i++,"\n";
+write_file($flag_file, 1);
+write_file('bleah.pm', "unlink '$flag_file'; 1");
+print "# $@\nnot " if eval { require 'bleah.pm' };
+print "ok ",$i++,"\n";
+print "# $@\nnot " unless $@ =~ /Compilation failed/i;
+print "ok ",$i++,"\n";
+print "not " unless -e $flag_file;
+print "ok ",$i++,"\n";
+print "not " unless exists $INC{'bleah.pm'};
+print "ok ",$i++,"\n";
+
 # successful require
 do_require "1";
 print "# $@\nnot " if $@;
@@ -163,7 +195,11 @@ sub bytes_to_utf16 {
 $i++; do_require(bytes_to_utf16('n', qq(print "ok $i\\n"; 1;\n), 1)); # BE
 $i++; do_require(bytes_to_utf16('v', qq(print "ok $i\\n"; 1;\n), 1)); # LE
 
-END { 1 while unlink 'bleah.pm'; 1 while unlink 'bleah.do'; }
+END {
+    1 while unlink 'bleah.pm';
+    1 while unlink 'bleah.do';
+    1 while unlink 'bleah.flg';
+}
 
 # ***interaction with pod (don't put any thing after here)***