diff options
author | Arnold D. Robbins <arnold@skeeve.com> | 2016-08-03 21:32:17 +0300 |
---|---|---|
committer | Arnold D. Robbins <arnold@skeeve.com> | 2016-08-03 21:32:17 +0300 |
commit | 5b0b9518e94d4aee27e9b0b0617c2bdd0081592c (patch) | |
tree | 7fd96cba6b334e219bfad3a489fb41ff68cd82ee /awk.h | |
parent | 14587bf02200b8f184f19f52bbff83973d9d9197 (diff) | |
parent | 9907a598dca8f129422c42f8c4fa3b4e2c988221 (diff) | |
download | egawk-5b0b9518e94d4aee27e9b0b0617c2bdd0081592c.tar.gz egawk-5b0b9518e94d4aee27e9b0b0617c2bdd0081592c.tar.bz2 egawk-5b0b9518e94d4aee27e9b0b0617c2bdd0081592c.zip |
Merge branch 'master' into feature/nocopy
Diffstat (limited to 'awk.h')
-rw-r--r-- | awk.h | 9 |
1 files changed, 1 insertions, 8 deletions
@@ -264,7 +264,6 @@ typedef enum nodevals { Node_val, /* node is a value - type in flags */ Node_regex, /* a regexp, text, compiled, flags, etc */ Node_dynregex, /* a dynamic regexp */ - Node_typedregex, /* like Node_regex, but is a real type */ /* symbol table values */ Node_var, /* scalar variable, lnode is value */ @@ -1813,9 +1812,6 @@ dupnode(NODE *n) static inline NODE * force_string_fmt(NODE *s, const char *fmtstr, int fmtidx) { - if (s->type == Node_typedregex) - return dupnode(s->re_exp); - if ((s->flags & STRCUR) != 0 && (s->stfmt == STFMT_UNUSED || s->stfmt == fmtidx) ) @@ -1847,9 +1843,6 @@ unref(NODE *r) static inline NODE * force_number(NODE *n) { - if (n->type == Node_typedregex) - return Nnull_string; - return (n->flags & NUMCUR) != 0 ? n : str2number(n); } @@ -1874,7 +1867,7 @@ force_number(NODE *n) static inline NODE * fixtype(NODE *n) { - assert(n->type == Node_val || n->type == Node_typedregex); + assert(n->type == Node_val); if (n->type == Node_val) { if ((n->flags & (NUMCUR|MAYBE_NUM)) == MAYBE_NUM) return force_number(n); |