diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2016-08-16 05:41:32 +0300 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2016-08-16 05:41:32 +0300 |
| commit | 07d7d8846a6fb16bbf6309b84ff3b6fed8888cd2 (patch) | |
| tree | 4b9703a0057a5a17e9e33a814f13cd73da0fce5a | |
| parent | 0bdf798b8f9d018b4d11f63dddde683248d65a39 (diff) | |
| parent | ed6a8b0cbdfd4b2231b89bfa420147a88f7312cf (diff) | |
| download | egawk-07d7d8846a6fb16bbf6309b84ff3b6fed8888cd2.tar.gz egawk-07d7d8846a6fb16bbf6309b84ff3b6fed8888cd2.tar.bz2 egawk-07d7d8846a6fb16bbf6309b84ff3b6fed8888cd2.zip | |
Merge branch 'master' into feature/typed-regex
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | int_array.c | 22 |
2 files changed, 6 insertions, 22 deletions
@@ -1,3 +1,9 @@ +2016-08-15 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * int_array.c (is_integer): Fix merge of stable changes to remove + obsolete string formatting check that has been superseded by + the new standard_integer_string check. + 2016-08-14 Arnold D. Robbins <arnold@skeeve.com> * re.c (make_regexp): Only call dfasyntax if actually using diff --git a/int_array.c b/int_array.c index 38b4943e..c244169f 100644 --- a/int_array.c +++ b/int_array.c @@ -125,28 +125,6 @@ is_integer(NODE *symbol, NODE *subs) if (subs == Nnull_string || do_mpfr) return NULL; - /* - * Protect against MAYBE_NUM values where the string may not regenerate - * correctly. There could be white space and/or a non-decimal value. - * If stfmt is not STFMT_UNUSED, it means that the string value was - * generated using CONVFMT or OFMT, so there is no info there. - */ - if ((subs->flags & STRCUR) != 0 && subs->stfmt == STFMT_UNUSED) { - char *cp = subs->stptr; - - if ( subs->stlen == 0 - || cp[0] == '0' - || isspace((unsigned char) cp[0]) - || isspace((unsigned char) cp[subs->stlen - 1]) - || ( subs->stlen >= 2 - && (cp[0] == '-' || cp[0] == '+') - && cp[1] == '0')) - return NULL; - } - - if ((subs->flags & NUMINT) != 0) - return & success_node; - #ifdef CHECK_INTEGER_USING_FORCE_NUMBER /* * This approach is much simpler, because we remove all of the strtol |