summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGisle Aas <gisle@aas.no>2001-04-04 13:17:29 -0700
committerJarkko Hietaniemi <jhi@iki.fi>2001-04-05 22:54:17 +0000
commit986b19de108d7d28065c88eb6f0409b17efc8482 (patch)
tree7df968c83c6d37bba503b142bc7df52130315208
parent60d9c7be9863c530d823c4f8da8d90bb057dce39 (diff)
downloadperl-986b19de108d7d28065c88eb6f0409b17efc8482.tar.gz
Propagate calling context for do '...'
Message-ID: <lrg0fo827q.fsf@caliper.ActiveState.com> p4raw-id: //depot/perl@9579
-rw-r--r--pod/perlfunc.pod2
-rw-r--r--pp_ctl.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/pod/perlfunc.pod b/pod/perlfunc.pod
index aafc1976aa..4e7f1a940e 100644
--- a/pod/perlfunc.pod
+++ b/pod/perlfunc.pod
@@ -1117,7 +1117,7 @@ from a Perl subroutine library.
is just like
- scalar eval `cat stat.pl`;
+ eval `cat stat.pl`;
except that it's more efficient and concise, keeps track of the current
filename for error messages, searches the @INC libraries, and updates
diff --git a/pp_ctl.c b/pp_ctl.c
index 90c6a3cb89..272f506943 100644
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -3022,7 +3022,7 @@ PP(pp_require)
char *tryname;
SV *namesv = Nullsv;
SV** svp;
- I32 gimme = G_SCALAR;
+ I32 gimme = GIMME_V;
PerlIO *tryrsfp = 0;
STRLEN n_a;
int filter_has_file = 0;
@@ -3360,7 +3360,7 @@ trylocal: {
PL_eval_owner = thr;
MUTEX_UNLOCK(&PL_eval_mutex);
#endif /* USE_THREADS */
- return DOCATCH(doeval(G_SCALAR, NULL));
+ return DOCATCH(doeval(gimme, NULL));
}
PP(pp_dofile)