[gawk-diffs] [SCM] gawk branch, gawk-4.1-stable, updated. gawk-4.1.0-486-g82e7082

[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.1-stable has been updated
       via  82e7082d1653a2143fc29d405fe40329188828b5 (commit)
       via  d03f6f66493d8a8a80810f51fb363dfb7bcd02a5 (commit)
       via  ee77f64d563188b6a5d761fd9342df00431e99d8 (commit)
      from  8b863f8852067b0638e09dc7c82355b96381dc12 (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=82e7082d1653a2143fc29d405fe40329188828b5

commit 82e7082d1653a2143fc29d405fe40329188828b5
Author: Arnold D. Robbins <address@hidden>
Date:   Sun Nov 16 19:44:24 2014 +0200

    Update in NEWS.

diff --git a/NEWS b/NEWS
index 8791de3..d6a69af 100644
--- a/NEWS
+++ b/NEWS
@@ -23,17 +23,19 @@ Changes from 4.1.1 to 4.1.2
 5. Indirect function calls now work for both built-in and
    extension functions.
 
-6. In non-English locales, it was accidentally possible to use "letters"
+6. Built-in functions are now included in FUNCTAB.
+
+7. In non-English locales, it was accidentally possible to use "letters"
    beside those of the English alphabet in identifiers.  This has
    been fixed.  (isalpha and isalnum are NOT our friends.)
 
    If you feel that you must have this misfeature, use `configure --help'
    to see what option to use when configuring gawk to reenable it.
 
-7. The "where" command has been added to the debugger as an alias
+8. The "where" command has been added to the debugger as an alias
    for "backtrace". This will make life easier for long-time GDB users.
 
-8. Gawk no longer explicitly checks the current directory after doing
+9. Gawk no longer explicitly checks the current directory after doing
    a path search of AWKPATH.  The default value continues to have "." at
    the front, so most people should not be affected.  If you have your own
    AWKPATH setting, be sure to put "." in it somewhere. The documentation

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

commit d03f6f66493d8a8a80810f51fb363dfb7bcd02a5
Author: Arnold D. Robbins <address@hidden>
Date:   Sun Nov 16 19:43:58 2014 +0200

    Sync dfa with grep.

diff --git a/ChangeLog b/ChangeLog
index 0facf7a..67b3693 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
        * interpret.h: Revert change of 2014-11-11 since it breaks
        certain uses.
 
+       Unrelated:
+
+       * dfa.c: Sync with GNU grep.
+
 2014-11-15         Arnold D. Robbins     <address@hidden>
 
        * array.c, awk.h, awkgram.y, builtin.c, dfa.c, eval.c, field.c,
diff --git a/dfa.c b/dfa.c
index 53a8c2c..66136ce 100644
--- a/dfa.c
+++ b/dfa.c
@@ -3697,8 +3697,11 @@ dfassbuild (struct dfa *d)
   sup->musts = NULL;
 
   sup->charclasses = xnmalloc (sup->calloc, sizeof *sup->charclasses);
-  memcpy (sup->charclasses, d->charclasses,
-          d->cindex * sizeof *sup->charclasses);
+  if (d->cindex)
+    {
+      memcpy (sup->charclasses, d->charclasses,
+              d->cindex * sizeof *sup->charclasses);
+    }
 
   sup->tokens = xnmalloc (d->tindex, 2 * sizeof *sup->tokens);
   sup->talloc = d->tindex * 2;

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

commit ee77f64d563188b6a5d761fd9342df00431e99d8
Author: Arnold D. Robbins <address@hidden>
Date:   Sun Nov 16 19:43:18 2014 +0200

    Revert field reference changes of 2014-11-11.

diff --git a/ChangeLog b/ChangeLog
index 864ea36..0facf7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-16         Arnold D. Robbins     <address@hidden>
+
+       * interpret.h: Revert change of 2014-11-11 since it breaks
+       certain uses.
+
 2014-11-15         Arnold D. Robbins     <address@hidden>
 
        * array.c, awk.h, awkgram.y, builtin.c, dfa.c, eval.c, field.c,
diff --git a/interpret.h b/interpret.h
index 83ccbfc..74f56c7 100644
--- a/interpret.h
+++ b/interpret.h
@@ -340,12 +340,7 @@ uninitialized_scalar:
                        lhs = r_get_field(t1, (Func_ptr *) 0, true);
                        decr_sp();
                        DEREF(t1);
-                       /* only for $0, up ref count */
-                       if (*lhs == fields_arr[0]) {
-                               r = *lhs;
-                               UPREF(r);
-                       } else
-                               r = dupnode(*lhs);
+                       r = dupnode(*lhs);     /* can't use UPREF here */
                        PUSH(r);
                        break;
 
@@ -654,22 +649,11 @@ mod:
                        lhs = get_lhs(pc->memory, false);
                        unref(*lhs);
                        r = pc->initval;        /* constant initializer */
-                       if (r != NULL) {
+                       if (r == NULL)
+                               *lhs = POP_SCALAR();
+                       else {
                                UPREF(r);
                                *lhs = r;
-                       } else {
-                               r = POP_SCALAR();
-
-                               /* if was a field, turn it into a var */
-                               if ((r->flags & FIELD) == 0) {
-                                       *lhs = r;
-                               } else if (r->valref == 1) {
-                                       r->flags &= ~FIELD;
-                                       *lhs = r;
-                               } else {
-                                       *lhs = dupnode(r);
-                                       DEREF(r);
-                               }
                        }
                        break;
 

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

Summary of changes:
 ChangeLog   |    9 +++++++++
 NEWS        |    8 +++++---
 dfa.c       |    7 +++++--
 interpret.h |   24 ++++--------------------
 4 files changed, 23 insertions(+), 25 deletions(-)


hooks/post-receive
-- 
gawk