diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2014-11-16 19:48:53 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2014-11-16 19:48:53 +0200 |
| commit | 905daf3abd3dc2d0dde5b2009ae00be3da3bf105 (patch) | |
| tree | 81364992fc861658815789d3b5b88d3a80592b64 /interpret.h | |
| parent | d312241e2ed853effb2d018d50e1362bf21848a0 (diff) | |
| parent | 82e7082d1653a2143fc29d405fe40329188828b5 (diff) | |
| download | egawk-905daf3abd3dc2d0dde5b2009ae00be3da3bf105.tar.gz egawk-905daf3abd3dc2d0dde5b2009ae00be3da3bf105.tar.bz2 egawk-905daf3abd3dc2d0dde5b2009ae00be3da3bf105.zip | |
Merge branch 'gawk-4.1-stable'
Diffstat (limited to 'interpret.h')
| -rw-r--r-- | interpret.h | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/interpret.h b/interpret.h index 1b8b09b0..2ffd07f2 100644 --- a/interpret.h +++ b/interpret.h @@ -340,12 +340,7 @@ uninitialized_scalar: lhs = r_get_field(t1, (Func_ptr *) 0, true); decr_sp(); DEREF(t1); - /* only for $0, up ref count */ - if (*lhs == fields_arr[0]) { - r = *lhs; - UPREF(r); - } else - r = dupnode(*lhs); + r = dupnode(*lhs); /* can't use UPREF here */ PUSH(r); break; @@ -654,22 +649,11 @@ mod: lhs = get_lhs(pc->memory, false); unref(*lhs); r = pc->initval; /* constant initializer */ - if (r != NULL) { + if (r == NULL) + *lhs = POP_SCALAR(); + else { UPREF(r); *lhs = r; - } else { - r = POP_SCALAR(); - - /* if was a field, turn it into a var */ - if ((r->flags & FIELD) == 0) { - *lhs = r; - } else if (r->valref == 1) { - r->flags &= ~FIELD; - *lhs = r; - } else { - *lhs = dupnode(r); - DEREF(r); - } } break; |