diff options
| author | Andrew J. Schorr <aschorr@telemetry-investments.com> | 2017-01-15 12:06:17 -0500 |
|---|---|---|
| committer | Andrew J. Schorr <aschorr@telemetry-investments.com> | 2017-01-15 12:06:17 -0500 |
| commit | 0c3c1a2aa8318e0035f90fc3a5d30de470d949b3 (patch) | |
| tree | 6b29a78cb905577c06d164274275b10ab2f0717e /interpret.h | |
| parent | aa4a2c09d9b438e628254238e184ebff2c6b7acc (diff) | |
| parent | 2fd82e70b4a9b85427a126f103841ebcb8e8bb16 (diff) | |
| download | egawk-0c3c1a2aa8318e0035f90fc3a5d30de470d949b3.tar.gz egawk-0c3c1a2aa8318e0035f90fc3a5d30de470d949b3.tar.bz2 egawk-0c3c1a2aa8318e0035f90fc3a5d30de470d949b3.zip | |
Merge branch 'gawk-4.1-stable'
Diffstat (limited to 'interpret.h')
| -rw-r--r-- | interpret.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/interpret.h b/interpret.h index 1399e720..3526325e 100644 --- a/interpret.h +++ b/interpret.h @@ -718,14 +718,16 @@ mod: *lhs = dupnode(t1); } - if (t1 != t2 && t1->valref == 1 && (t1->flags & MPFN) == 0) { + if (t1 != t2 && t1->valref == 1 && (t1->flags & (MPFN|MPZN)) == 0) { size_t nlen = t1->stlen + t2->stlen; erealloc(t1->stptr, char *, nlen + 1, "r_interpret"); memcpy(t1->stptr + t1->stlen, t2->stptr, t2->stlen); t1->stlen = nlen; t1->stptr[nlen] = '\0'; - t1->flags &= ~(NUMCUR|NUMBER|NUMINT); + t1->flags &= ~(NUMCUR|NUMBER|USER_INPUT|NUMINT|INTIND); + t1->flags |= (STRING|STRCUR); + t1->stfmt = -1; if ((t1->flags & WSTRCUR) != 0 && (t2->flags & WSTRCUR) != 0) { size_t wlen = t1->wstlen + t2->wstlen; |