gawk-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[SCM] gawk branch, feature/cpp-compile, updated. gawk-4.1.0-5474-g6e740f


From: Arnold Robbins
Subject: [SCM] gawk branch, feature/cpp-compile, updated. gawk-4.1.0-5474-g6e740f50
Date: Fri, 24 Feb 2023 03:41:41 -0500 (EST)

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/cpp-compile has been updated
       via  6e740f508b3cd6825362c1f950478b52000089c0 (commit)
       via  dce594e35127b9a74eafb197eb457ecc569e9de3 (commit)
       via  267725099deada5982cf99dc544b590c418732d1 (commit)
       via  a908e81a6b4a41116e3268a915449881c9982209 (commit)
       via  da883f8177a12293a395d77c31d7aeaa95c254aa (commit)
       via  90da4e0a6fea0499b891bb3801fde88b99346367 (commit)
       via  1c16328521f317b4f3df3d3010fc17e9811bd5e1 (commit)
       via  2480186827f4e5f9b4269426742d5f4985dcbe01 (commit)
      from  a4fbe5c2fa5089b7a84b92ea720b524b6e87b6bd (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=6e740f508b3cd6825362c1f950478b52000089c0

commit 6e740f508b3cd6825362c1f950478b52000089c0
Merge: a4fbe5c2 dce594e3
Author: Arnold D. Robbins <arnold@skeeve.com>
Date:   Fri Feb 24 10:41:27 2023 +0200

    Merge branch 'master' into feature/cpp-compile

diff --cc awk.h
index 8e67936c,7208cea4..c9117065
--- a/awk.h
+++ b/awk.h
@@@ -977,25 -964,22 +977,25 @@@ typedef struct iobuf 
  typedef void (*Func_ptr)(void);
  
  /* structure used to dynamically maintain a linked-list of open files/pipes */
 +enum redirect_flags {
 +      RED_NONE        = 0,
 +      RED_FILE        = 1,
 +      RED_PIPE        = 2,
 +      RED_READ        = 4,
 +      RED_WRITE       = 8,
 +      RED_APPEND      = 16,
-       RED_NOBUF       = 32,
++      RED_FLUSH       = 32,
 +      RED_USED        = 64,   /* closed temporarily to reuse fd */
 +      RED_EOF         = 128,
 +      RED_TWOWAY      = 256,
 +      RED_PTY         = 512,
 +      RED_SOCKET      = 1024,
 +      RED_TCP         = 2048,
 +};
 +typedef enum redirect_flags redirect_flags_t;
 +
  struct redirect {
 -      enum redirect_flags {
 -              RED_NONE        = 0,
 -              RED_FILE        = 1,
 -              RED_PIPE        = 2,
 -              RED_READ        = 4,
 -              RED_WRITE       = 8,
 -              RED_APPEND      = 16,
 -              RED_FLUSH       = 32,
 -              RED_USED        = 64,   /* closed temporarily to reuse fd */
 -              RED_EOF         = 128,
 -              RED_TWOWAY      = 256,
 -              RED_PTY         = 512,
 -              RED_SOCKET      = 1024,
 -              RED_TCP         = 2048,
 -      } flag;
 +      ENUM(redirect_flags) flag;
        char *value;
        FILE *ifp;      /* input fp, needed for PIPES_SIMULATED */
        IOBUF *iop;
diff --cc io.c
index a487e16f,94d6a0df..27df7139
--- a/io.c
+++ b/io.c
@@@ -746,11 -746,8 +746,11 @@@ check_duplicated_redirections(const cha
        };
        int i = 0, j = sizeof(mixtures) / sizeof(mixtures[0]);
  
 +      int oldflags = oflags;
 +      int newflags = nflags;
 +
-       oldflags &= ~(RED_NOBUF|RED_EOF|RED_PTY);
-       newflags &= ~(RED_NOBUF|RED_EOF|RED_PTY);
+       oldflags &= ~(RED_FLUSH|RED_EOF|RED_PTY);
+       newflags &= ~(RED_FLUSH|RED_EOF|RED_PTY);
  
        for (i = 0; i < j; i++) {
                bool both_have_common = \
@@@ -3186,7 -3183,7 +3186,7 @@@ find_input_parser(IOBUF *iop
        awk_input_parser_t *ip, *ip2;
  
        /* if already associated with an input parser, bail out early */
-       if (iop->public_.get_record != NULL)
 -      if (iop->public.get_record != NULL || iop->public.read_func != read)
++      if (iop->public._get_record != NULL || iop->public.read_func != read)
                return;
  
        ip = ip2 = NULL;

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

Summary of changes:
 ChangeLog                        |  27 +++++++
 awk.h                            |   5 +-
 builtin.c                        |  25 ++++---
 doc/ChangeLog                    |   5 +-
 doc/gawk.info                    | 150 ++++++++++++++++++++-------------------
 doc/gawk.texi                    |   4 ++
 doc/gawktexi.in                  |   4 ++
 field.c                          |   1 +
 io.c                             |  14 ++--
 pc/ChangeLog                     |   4 ++
 pc/Makefile.tst                  |  12 +++-
 test/ChangeLog                   |   7 ++
 test/Makefile.am                 |   6 +-
 test/Makefile.in                 |  16 ++++-
 test/Maketests                   |  10 +++
 test/elemnew2.awk                |  15 ++++
 test/elemnew2.ok                 |   3 +
 test/elemnew3.awk                |   9 +++
 test/{stupid4.ok => elemnew3.ok} |   1 -
 19 files changed, 222 insertions(+), 96 deletions(-)
 create mode 100644 test/elemnew2.awk
 create mode 100644 test/elemnew2.ok
 create mode 100644 test/elemnew3.awk
 copy test/{stupid4.ok => elemnew3.ok} (57%)


hooks/post-receive
-- 
gawk



reply via email to

[Prev in Thread] Current Thread [Next in Thread]