diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2017-01-15 21:22:23 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2017-01-15 21:22:23 +0200 |
| commit | b16dd7ad0af13d337fdcb36d9d59acf303804fcb (patch) | |
| tree | 27a9a145642203b9d0dd972bf672b1dbd122563c /interpret.h | |
| parent | 9c30bfea5a9492ea97dc2c4c75ba1031d56b32b9 (diff) | |
| parent | 0c3c1a2aa8318e0035f90fc3a5d30de470d949b3 (diff) | |
| download | egawk-b16dd7ad0af13d337fdcb36d9d59acf303804fcb.tar.gz egawk-b16dd7ad0af13d337fdcb36d9d59acf303804fcb.tar.bz2 egawk-b16dd7ad0af13d337fdcb36d9d59acf303804fcb.zip | |
Merge branch 'master' into feature/fix-comments
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; |