[gawk-diffs] [SCM] gawk branch, master, updated. gawk-4.1.0-593-gff21da5

[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  ff21da5c7f072a69e9582f1a7ae2039f27f564cf (commit)
       via  873f410df729f1c7bbe2d3a8b95b41c9706d700d (commit)
      from  d3bd5c88e7505063348d88604180d3e1e6e0f5a9 (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=ff21da5c7f072a69e9582f1a7ae2039f27f564cf

commit ff21da5c7f072a69e9582f1a7ae2039f27f564cf
Merge: d3bd5c8 873f410
Author: Andrew J. Schorr <address@hidden>
Date:   Sun Aug 3 14:44:47 2014 -0400

    Merge branch 'gawk-4.1-stable' to get --profile to work with -M.


http://git.sv.gnu.org/cgit/gawk.git/commit/?id=873f410df729f1c7bbe2d3a8b95b41c9706d700d

commit 873f410df729f1c7bbe2d3a8b95b41c9706d700d
Author: Andrew J. Schorr <address@hidden>
Date:   Sun Aug 3 14:44:09 2014 -0400

    Minor patch to get --profile to work in -M (MPFR) mode.

diff --git a/ChangeLog b/ChangeLog
index 0072c80..d18eb49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-08-03         Andrew J. Schorr     <address@hidden>
+
+       * awkgram.y (getfname): Match on either ptr or ptr2 so --profile
+       will work in -M (MPFR bignum) mode.
+
 2014-07-31         Arnold D. Robbins     <address@hidden>
 
        * builtin.c (format_tree): Make %c handling more sane on Windows.
diff --git a/awkgram.c b/awkgram.c
index 711c2e3..be852df 100644
--- a/awkgram.c
+++ b/awkgram.c
@@ -4283,7 +4283,7 @@ getfname(NODE *(*fptr)(int))
        j = sizeof(tokentab) / sizeof(tokentab[0]);
        /* linear search, no other way to do it */
        for (i = 0; i < j; i++) 
-               if (tokentab[i].ptr == fptr)
+               if (tokentab[i].ptr == fptr || tokentab[i].ptr2 == fptr)
                        return tokentab[i].operator;
 
        return NULL;
diff --git a/awkgram.y b/awkgram.y
index 1a19946..53a218a 100644
--- a/awkgram.y
+++ b/awkgram.y
@@ -1944,7 +1944,7 @@ getfname(NODE *(*fptr)(int))
        j = sizeof(tokentab) / sizeof(tokentab[0]);
        /* linear search, no other way to do it */
        for (i = 0; i < j; i++) 
-               if (tokentab[i].ptr == fptr)
+               if (tokentab[i].ptr == fptr || tokentab[i].ptr2 == fptr)
                        return tokentab[i].operator;
 
        return NULL;

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

Summary of changes:
 ChangeLog |    5 +++++
 awkgram.c |    2 +-
 awkgram.y |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
gawk