summaryrefslogtreecommitdiff
path: root/pp_ctl.c
diff options
context:
space:
mode:
authorPerl 5 Porters <perl5-porters@africa.nicoh.com>1997-04-09 00:00:00 +0000
committerChip Salzenberg <chip@atlantic.net>1997-04-09 00:00:00 +0000
commit7a2e2cd6e4407ff4fe23355f0373307425305867 (patch)
treeb8bac221ca9fae30bb25f4d8ac3ae8f8d5a1b483 /pp_ctl.c
parentfa85963645b525b23ccb5a91ab9199c740773c41 (diff)
downloadperl-7a2e2cd6e4407ff4fe23355f0373307425305867.tar.gz
[inseparable changes from match from perl-5.003_97c to perl-5.003_97d]perl-5.003_97d
DOCUMENTATION Subject: more (err, less) doubled words Date: Fri, 11 Apr 1997 22:31:25 +0300 (EET DST) From: Jarkko Hietaniemi <Jarkko.Hietaniemi@cc.hut.fi> Files: ext/DB_File/DB_File.pm ext/DynaLoader/DynaLoader.pm ext/IO/lib/IO/Pipe.pm lib/CGI.pm lib/Exporter.pm lib/ExtUtils/MakeMaker.pm lib/IPC/Open2.pm lib/IPC/Open3.pm lib/vars.pm pod/perlcall.pod pod/perldiag.pod pod/perlfaq1.pod pod/perlfaq3.pod pod/perlfaq5.pod pod/perlfaq7.pod pod/perlfaq8.pod pod/perlipc.pod private-msgid: 199704111931.WAA24460@alpha.hut.fi LIBRARY AND EXTENSIONS Subject: win32: perl5db patch Date: Thu, 10 Apr 1997 17:42:13 -0400 From: Gurusamy Sarathy <gsar@engin.umich.edu> Files: lib/perl5db.pl Msg-ID: 199704102142.RAA27396@aatma.engin.umich.edu (applied based on p5p patch as commit 56cbacacb6c634a626b06407cbd555bc1519a2d5) Subject: Enhancements to debugger, Term::ReadLine, Term::Cap Date: Thu, 10 Apr 1997 15:48:07 -0400 (EDT) From: Ilya Zakharevich <ilya@math.ohio-state.edu> Files: lib/Term/Cap.pm lib/Term/ReadLine.pm lib/perl5db.pl Msg-ID: 199704101948.PAA01841@monk.mps.ohio-state.edu (applied based on p5p patch as commit 6fb2d361298c4eb5d42f1f63b0f74a60d407e546) OTHER CORE CHANGES Subject: New error msg for low-key failure of C<require> From: Chip Salzenberg <chip@perl.com> Files: pod/perldiag.pod pp_ctl.c t/pragma/strict-subs t/pragma/strict-vars
Diffstat (limited to 'pp_ctl.c')
-rw-r--r--pp_ctl.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/pp_ctl.c b/pp_ctl.c
index aabdff582b..371e037ae5 100644
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -988,8 +988,10 @@ char *message;
LEAVE;
- if (optype == OP_REQUIRE)
- DIE("%s", SvPVx(GvSV(errgv), na));
+ if (optype == OP_REQUIRE) {
+ char* msg = SvPVx(GvSV(errgv), na);
+ DIE("%s", *msg ? msg : "Compilation failed in require");
+ }
return pop_return();
}
}
@@ -2081,8 +2083,10 @@ int gimme;
pop_return();
lex_end();
LEAVE;
- if (optype == OP_REQUIRE)
- DIE("%s", SvPVx(GvSV(errgv), na));
+ if (optype == OP_REQUIRE) {
+ char* msg = SvPVx(GvSV(errgv), na);
+ DIE("%s", *msg ? msg : "Compilation failed in require");
+ }
SvREFCNT_dec(rs);
rs = SvREFCNT_inc(nrs);
RETPUSHUNDEF;