diff options
| author | Marcus Holland-Moritz <mhx-perl@gmx.net> | 2003-06-15 23:09:03 +0000 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2003-06-16 22:47:28 +0000 |
| commit | f48583aa2d2b7c9a2c44c530083c6fdd7e6f9713 (patch) | |
| tree | 5b20dd4504fecf6c06b69728fc2294ace4fbe3c8 /pp_ctl.c | |
| parent | 168696769693b5e65a30c0a0a677c7f648e8370e (diff) | |
| download | perl-f48583aa2d2b7c9a2c44c530083c6fdd7e6f9713.tar.gz | |
Revert change #19126, a poor attempt at fixing bug #21742.
The test for #21742 is marked as TODO.
Plus new regression tests from :
Subject: [perl #22708] void context in string eval is broken
From: "Marcus Holland-Moritz" (via RT) <perlbug-followup@perl.org>
Message-ID: <rt-22708-59432.14.6755501393177@rt.perl.org>
p4raw-link: @19126 on //depot/perl: a89be09a10c36299e755a956d356eb7f1f643437
p4raw-id: //depot/perl@19801
Diffstat (limited to 'pp_ctl.c')
| -rw-r--r-- | pp_ctl.c | 8 |
1 files changed, 1 insertions, 7 deletions
@@ -2898,13 +2898,7 @@ S_doeval(pTHX_ int gimme, OP** startop, CV* outside, U32 seq) *startop = PL_eval_root; } else SAVEFREEOP(PL_eval_root); - if (gimme & G_VOID && ! PL_in_eval & EVAL_INREQUIRE) - /* - * EVAL_INREQUIRE (the code is being required) is special-cased : - * in this case we want scalar context to be forced, instead - * of void context, so a proper return value is returned from - * C<require> via this leaveeval op. - */ + if (gimme & G_VOID) scalarvoid(PL_eval_root); else if (gimme & G_ARRAY) list(PL_eval_root); |