diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2016-11-12 19:12:13 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2016-11-12 19:12:13 +0200 |
| commit | cc04afb329cea035d0d9b67cd3b677e06b2f3996 (patch) | |
| tree | 3622f3f241d75079bcafd24651a4952e357a9c09 /field.c | |
| parent | 9a31c12053ef715ccb732f456de00b4afc38d888 (diff) | |
| download | egawk-cc04afb329cea035d0d9b67cd3b677e06b2f3996.tar.gz egawk-cc04afb329cea035d0d9b67cd3b677e06b2f3996.tar.bz2 egawk-cc04afb329cea035d0d9b67cd3b677e06b2f3996.zip | |
Further code improvements and doc changes as diff until merge.
Diffstat (limited to 'field.c')
| -rw-r--r-- | field.c | 29 |
1 files changed, 14 insertions, 15 deletions
@@ -132,7 +132,7 @@ set_field(long num, n = fields_arr[num]; n->stptr = str; n->stlen = len; - n->flags = (STRCUR|STRING|MAYBE_NUM); /* do not set MALLOC */ + n->flags = (STRCUR|STRING|USER_INPUT); /* do not set MALLOC */ } /* rebuild_record --- Someone assigned a value to $(something). @@ -231,10 +231,10 @@ rebuild_record() cops += fields_arr[i]->stlen + OFSlen; } -#ifndef NDEBUG - if ((fields_arr[0]->flags & MALLOC) == 0) - assert(fields_arr[0]->valref == 1); -#endif + assert((fields_arr[0]->flags & MALLOC) == 0 + ? fields_arr[0]->valref == 1 + : true); + unref(fields_arr[0]); fields_arr[0] = tmp; @@ -293,10 +293,10 @@ set_record(const char *buf, int cnt) databuf[cnt] = '\0'; /* manage field 0: */ -#ifndef NDEBUG - if ((fields_arr[0]->flags & MALLOC) == 0) - assert(fields_arr[0]->valref == 1); -#endif + assert((fields_arr[0]->flags & MALLOC) == 0 + ? fields_arr[0]->valref == 1 + : true); + unref(fields_arr[0]); getnode(n); n->stptr = databuf; @@ -304,7 +304,7 @@ set_record(const char *buf, int cnt) n->valref = 1; n->type = Node_val; n->stfmt = STFMT_UNUSED; - n->flags = (STRING|STRCUR|MAYBE_NUM); /* do not set MALLOC */ + n->flags = (STRING|STRCUR|USER_INPUT); /* do not set MALLOC */ fields_arr[0] = n; #undef INITIAL_SIZE @@ -328,10 +328,9 @@ purge_record() NF = -1; for (i = 1; i <= parse_high_water; i++) { -#ifndef NDEBUG - if ((fields_arr[i]->flags & MALLOC) == 0) - assert(fields_arr[i]->valref == 1); -#endif + assert((fields_arr[i]->flags & MALLOC) == 0 + ? fields_arr[i]->valref == 1 + : true); unref(fields_arr[i]); getnode(n); *n = *Null_field; @@ -883,7 +882,7 @@ set_element(long num, char *s, long len, NODE *n) NODE *sub; it = make_string(s, len); - it->flags |= MAYBE_NUM; + it->flags |= USER_INPUT; sub = make_number((AWKNUM) (num)); lhs = assoc_lookup(n, sub); unref(*lhs); |