[gawk-diffs] [SCM] gawk branch, gawk-4.2-stable, updated. gawk-4.1.0-2846-gd73659d

[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, gawk-4.2-stable has been updated
       via  d73659dcfd3a76103bf3772b075cc74d3e259fee (commit)
      from  3b8275d87abeb26a9989cb02fc85f62006ab70cd (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=d73659dcfd3a76103bf3772b075cc74d3e259fee

commit d73659dcfd3a76103bf3772b075cc74d3e259fee
Author: Arnold D. Robbins <address@hidden>
Date:   Sun Dec 10 19:04:10 2017 +0200

    Don't optimize !_"...".

diff --git a/ChangeLog b/ChangeLog
index 3255d8e..9d29272 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-12-10         Arnold D. Robbins     <address@hidden>
+
+       * awkgram.y: For '!' optimization on a string constant, don't
+       apply the optimization if it's a translatable string. Thanks
+       to Jeremy Feusi <address@hidden> for the report.
+
 2017-11-25         Andrew J. Schorr      <address@hidden>
 
        * debug.c (do_set_var): As in interpret.h (Op_store_field), we should
diff --git a/awkgram.c b/awkgram.c
index 1700a83..3bc1964 100644
--- a/awkgram.c
+++ b/awkgram.c
@@ -3817,7 +3817,7 @@ regular_print:
                } else {
                        if (do_optimize && (yyvsp[0])->nexti == 
(yyvsp[0])->lasti
                                        && (yyvsp[0])->nexti->opcode == 
Op_push_i
-                                       && ((yyvsp[0])->nexti->memory->flags & 
(MPFN|MPZN)) == 0
+                                       && ((yyvsp[0])->nexti->memory->flags & 
(MPFN|MPZN|INTLSTR)) == 0
                        ) {
                                NODE *n = (yyvsp[0])->nexti->memory;
                                if ((n->flags & STRING) != 0) {
diff --git a/awkgram.y b/awkgram.y
index 9f35143..bbc598d 100644
--- a/awkgram.y
+++ b/awkgram.y
@@ -1717,7 +1717,7 @@ non_post_simp_exp
                } else {
                        if (do_optimize && $2->nexti == $2->lasti
                                        && $2->nexti->opcode == Op_push_i
-                                       && ($2->nexti->memory->flags & 
(MPFN|MPZN)) == 0
+                                       && ($2->nexti->memory->flags & 
(MPFN|MPZN|INTLSTR)) == 0
                        ) {
                                NODE *n = $2->nexti->memory;
                                if ((n->flags & STRING) != 0) {

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

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


hooks/post-receive
-- 
gawk