diff options
| author | Nick Ing-Simmons <nik@tiuk.ti.com> | 1998-07-18 20:50:26 +0000 |
|---|---|---|
| committer | Nick Ing-Simmons <nik@tiuk.ti.com> | 1998-07-18 20:50:26 +0000 |
| commit | 62a559b8665e0cfb74dd6a69c48e22412fbdf175 (patch) | |
| tree | 99a5701cb5373bb2618f4e40af79056304e8bfe3 /op.h | |
| parent | 954eb2b583d25fd9ce5047f2c3b685b640f18bd7 (diff) | |
| parent | f7ac0805bb97e1e2d7fa37a2ffc86ce9bd5c6350 (diff) | |
| download | perl-62a559b8665e0cfb74dd6a69c48e22412fbdf175.tar.gz | |
Merge latest mainline
p4raw-id: //depot/ansiperl@1536
Diffstat (limited to 'op.h')
| -rw-r--r-- | op.h | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -81,10 +81,14 @@ typedef U32 PADOFFSET; /* On OP_ENTERITER, loop var is per-thread */ /* old names; don't use in new code, but don't break them, either */ -#define OPf_LIST 1 -#define OPf_KNOW 2 +#define OPf_LIST OPf_WANT_LIST +#define OPf_KNOW OPf_WANT #define GIMME \ - (PL_op->op_flags & OPf_KNOW ? PL_op->op_flags & OPf_LIST : dowantarray()) + (PL_op->op_flags & OPf_WANT \ + ? ((PL_op->op_flags & OPf_WANT) == OPf_WANT_LIST \ + ? G_ARRAY \ + : G_SCALAR) \ + : dowantarray()) /* Private for lvalues */ #define OPpLVAL_INTRO 128 /* Lvalue must be localized */ |