[gawk-diffs] [SCM] gawk branch, master, updated. gawk-4.1.0-1946-ged6a8b0

[Andrew J. Schorr]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, master has been updated
       via  ed6a8b0cbdfd4b2231b89bfa420147a88f7312cf (commit)
      from  0703039505200ca5126e11d905a6fa40c602d1b9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=ed6a8b0cbdfd4b2231b89bfa420147a88f7312cf

commit ed6a8b0cbdfd4b2231b89bfa420147a88f7312cf
Author: Andrew J. Schorr <address@hidden>
Date:   Mon Aug 15 11:37:33 2016 -0400

    Fix int_array.c:is_integer to remove check superseded by improved logic 
merged from stable branch.

diff --git a/ChangeLog b/ChangeLog
index dbc826b..9977bf6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-08-15         Andrew J. Schorr     <address@hidden>
+
+       * 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     <address@hidden>
 
        * re.c (make_regexp): Only call dfasyntax if actually using
diff --git a/int_array.c b/int_array.c
index 38b4943..c244169 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

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog   |    6 ++++++
 int_array.c |   22 ----------------------
 2 files changed, 6 insertions(+), 22 deletions(-)


hooks/post-receive
-- 
gawk