[gawk-diffs] [SCM] gawk branch, feature/stringfix, updated. gawk-4.1.0-2439-gfb06aea

[Arnold Robbins]

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, feature/stringfix has been updated
       via  fb06aea485b8da29c8bf9135d641615c50f37ae7 (commit)
       via  7b46fc2f6243d91e01b6e74fd69b193b4eddb05b (commit)
       via  85e1012dab425dc50bc3faa2a3f28a9a47dac017 (commit)
       via  6e6ac2dccf7048f501e19490c90ea31c3f527633 (commit)
      from  384261e9ea2b5ad4481b907726c4c92e8711c880 (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=fb06aea485b8da29c8bf9135d641615c50f37ae7

commit fb06aea485b8da29c8bf9135d641615c50f37ae7
Merge: 384261e 7b46fc2
Author: Arnold D. Robbins <address@hidden>
Date:   Wed Feb 1 21:20:07 2017 +0200

    Merge branch 'master' into feature/stringfix

diff --cc ChangeLog
index 54516df,8a0dfc3..de40e3e
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,32 -1,15 +1,44 @@@
+ 2017-02-01         Arnold D. Robbins     <address@hidden>
+ 
+       * builtin.c (mbc_char_count): Remove spurious multiplies by
+       gawk_mb_cur_max. Thanks to Andrew Schorr for making me look
+       at this code.
+ 
+       Unrelated:
+ 
+       * awkgram.y (make_profile_number): Renamed to ...
+       (set_profile_next): New function. All calls adjusted. Also improved
+       use at MPFR number case.
+ 
 +2017-01-28         Andrew J. Schorr     <address@hidden>
 +
 +      * io.c (inetfile): Replace strncmp with memcmp in a few places, now
 +      that we are checking string length beforehand.
 +
 +2017-01-27         Andrew J. Schorr     <address@hidden>
 +
 +      * io.c (redirect_string): Check explen positive before accessing *str.
 +      In lintwarn message, use explen string length. Pass length to inetfile.
 +      (devopen): Pass name length to inetfile.
 +      Stop assuming that remoteport is NUL-terminated.
 +      (two_way_open): Pass name length to inetfile.
 +      (inetfile): Stop assuming NUL string termination; add checks to avoid 
 +      string overrun.
 +
 +2017-01-27         Andrew J. Schorr     <address@hidden>
 +
 +      * awk.h (str_terminate_f): New helper function for terminating a string
 +      NODE.
 +      (str_terminate): Macro wrapper to call str_terminate_f.
 +      (str_restore): New macro to restore the string.
 +      * builtin.c (do_strftime): Use str_terminate and str_restore.
 +      (do_dcgettext): Ditto, and remove saved_end flag since equivalent
 +      to testing (t2 != NULL). Fix overrun bug in calculating result
 +      length when !ENABLE_NLS.
 +      (do_dcngettext, do_bindtextdomain): Use str_terminate and str_restore.
 +      * interpret.h (Op_arrayfor_init, Op_indirect_func_call): Ditto.
 +      * str_array.c (env_remove): Ditto.
 +
  2017-01-27         Andrew J. Schorr     <address@hidden>
  
        * interpret.h [UNFIELD]: Fix condition for assignment from
diff --cc awkgram.c
index f5fa6b2,5b55cf5..9c19767
--- a/awkgram.c
+++ b/awkgram.c
@@@ -6450,10 -6445,10 +6445,10 @@@ retry
                }
  #endif
                if (base != 10)
 -                      d = nondec2awknum(tokstart, strlen(tokstart), NULL);
 +                      d = nondec2awknum(tokstart, strlen(tokstart)-1, NULL);
                else
                        d = atof(tokstart);
-               yylval->memory = make_profile_number(d, tokstart, 
strlen(tokstart) - 1);
+               yylval->memory = set_profile_text(make_number(d), tokstart, 
strlen(tokstart) - 1);
                if (d <= INT32_MAX && d >= INT32_MIN && d == (int32_t) d)
                        yylval->memory->flags |= NUMINT;
                return lasttok = YNUMBER;
diff --cc awkgram.y
index 345816d,541cebf..85f7cff
--- a/awkgram.y
+++ b/awkgram.y
@@@ -4030,10 -4025,10 +4025,10 @@@ retry
                }
  #endif
                if (base != 10)
 -                      d = nondec2awknum(tokstart, strlen(tokstart), NULL);
 +                      d = nondec2awknum(tokstart, strlen(tokstart)-1, NULL);
                else
                        d = atof(tokstart);
-               yylval->memory = make_profile_number(d, tokstart, 
strlen(tokstart) - 1);
+               yylval->memory = set_profile_text(make_number(d), tokstart, 
strlen(tokstart) - 1);
                if (d <= INT32_MAX && d >= INT32_MIN && d == (int32_t) d)
                        yylval->memory->flags |= NUMINT;
                return lasttok = YNUMBER;

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

Summary of changes:
 ChangeLog      |   12 ++++++++++++
 awkgram.c      |   26 ++++++++++----------------
 awkgram.y      |   26 ++++++++++----------------
 builtin.c      |    4 ++--
 po/ChangeLog   |    4 ++++
 po/POTFILES.in |   15 ++++++++-------
 6 files changed, 46 insertions(+), 41 deletions(-)


hooks/post-receive
-- 
gawk