[SCM] gawk branch, master, updated. gawk-4.1.0-5396-gd0cd5560

[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, master has been updated
       via  d0cd5560acebf972f77bc96346402baa3f7eed5b (commit)
       via  96386768af382ddc9b2dd6c6243c1b758ac3f2b8 (commit)
       via  3d10f90df39d77bf37fa8bfbec242ce16e38b831 (commit)
       via  101608d23c5d3b27e77651b7669f291c089ae91b (commit)
       via  a2fd0c60cb82ff5ad25afb864bd3ff0b6732b60a (commit)
       via  e49a1adc77c5cc9ca8f7db61b16de73b89a563fd (commit)
       via  a1a02e299412a7eb4b901bb0947168fd68e46689 (commit)
      from  78eaa04695da806ed5848c26acaaa8d14452a747 (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=d0cd5560acebf972f77bc96346402baa3f7eed5b

commit d0cd5560acebf972f77bc96346402baa3f7eed5b
Author: Arnold D. Robbins <arnold@skeeve.com>
Date:   Sat Oct 21 20:41:31 2023 +0300

    Fix a small issue with combining --lint and --profile.

diff --git a/ChangeLog b/ChangeLog
index 8c48b22d..f4f97bd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
        * main.c (parse_args): Deal better with things if -p
        given twice. Thanks to Hermann Peifer for the report.
        * Checklist: Revised a bit.
+       * awkgram.y (isnoeffect): Add Op_exec_count to the list so
+       that `gawk --lint --profile BEGIN{0}' also produces a lint
+       warning. Thanks yet again to Hermann Peifer.
 
 2023-10-19         Arnold D. Robbins     <arnold@skeeve.com>
 
diff --git a/awkgram.c b/awkgram.c
index 180d29c7..1bb00003 100644
--- a/awkgram.c
+++ b/awkgram.c
@@ -7869,6 +7869,7 @@ isnoeffect(OPCODE type)
        case Op_push_array:
        case Op_pop:
        case Op_lint_plus:
+       case Op_exec_count:
                return true;
        default:
                break;  /* keeps gcc -Wall happy */
diff --git a/awkgram.y b/awkgram.y
index 74be2340..5f0697b0 100644
--- a/awkgram.y
+++ b/awkgram.y
@@ -5367,6 +5367,7 @@ isnoeffect(OPCODE type)
        case Op_push_array:
        case Op_pop:
        case Op_lint_plus:
+       case Op_exec_count:
                return true;
        default:
                break;  /* keeps gcc -Wall happy */

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

commit 96386768af382ddc9b2dd6c6243c1b758ac3f2b8
Author: Arnold D. Robbins <arnold@skeeve.com>
Date:   Sat Oct 21 19:59:38 2023 +0300

    Small cleanup in the manual.

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 3baa4282..a5bc943d 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+2023-10-21         Arnold D. Robbins     <arnold@skeeve.com>
+
+       * gawk.texi: Remove notes at end of the file about sidebars.
+       Thanks to Antonio Columbo for pointing out that it's no
+       longer needed.
+
 2023-10-19         Arnold D. Robbins     <arnold@skeeve.com>
 
        * gawk.texi: Renamed from gawktexi.in. Sidebars converted to
diff --git a/doc/gawk.texi b/doc/gawk.texi
index eaf88091..dfa62c3b 100644
--- a/doc/gawk.texi
+++ b/doc/gawk.texi
@@ -47540,38 +47540,4 @@ text.  It's ok as one word when it's a metasyntactic 
variable, though.
 ------------------------
 ORA uses filename, thus the macro.
 
-Suggestions:
-------------
-
-Better sidebars can almost sort of be done with:
-
-       @ifdocbook
-       @macro @sidebar{title, content}
-       @inlinefmt{docbook, <sidebar><title>}
-       \title\
-       @inlinefmt{docbook, </title>}
-       \content\
-       @inlinefmt{docbook, </sidebar>}
-       @end macro
-       @end ifdocbook
-
-
-       @ifnotdocbook
-       @macro @sidebar{title, content}
-       @cartouche
-       @center @b{\title\}
-
-       \content\
-       @end cartouche
-       @end macro
-       @end ifnotdocbook
-
-But to use it you have to say
-
-       @sidebar{Title Here,
-       @include file-with-content
-       }
-
-which sorta sucks.
-
 TODO:

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

commit 3d10f90df39d77bf37fa8bfbec242ce16e38b831
Merge: 101608d2 a2fd0c60
Author: Arnold D. Robbins <arnold@skeeve.com>
Date:   Sat Oct 21 19:56:07 2023 +0300

    Merge branch 'feature/docit'


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

commit 101608d23c5d3b27e77651b7669f291c089ae91b
Author: Arnold D. Robbins <arnold@skeeve.com>
Date:   Sat Oct 21 19:39:14 2023 +0300

    Small argument parsing fix.

diff --git a/ChangeLog b/ChangeLog
index 123bcf41..8c48b22d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2023-10-21         Arnold D. Robbins     <arnold@skeeve.com>
+
+       * main.c (parse_args): Deal better with things if -p
+       given twice. Thanks to Hermann Peifer for the report.
+       * Checklist: Revised a bit.
+
 2023-10-19         Arnold D. Robbins     <arnold@skeeve.com>
 
        * NEWS: Updated.
diff --git a/Checklist b/Checklist
index 4aaaf6f7..3e5e5156 100644
--- a/Checklist
+++ b/Checklist
@@ -1,4 +1,4 @@
-Wed Oct 27 07:59:43 IDT 2021
+Fri 20 Oct 2023 14:03:39 IDT
 ============================
 
 A checklist for making releases.
@@ -22,17 +22,18 @@ ___ Version information is correct in
        ___ configure.ac
        ___ doc/gawk.1
        ___ doc/awkcard.in
-       ___ doc/gawktexi.in
+       ___ doc/gawk.texi
        ___ doc/gawkinet.texi
        ___ extension/configure.ac
 ___ doc/texinfo.tex is up to date
-___ doc/gawktexi.in is up to date
+___ doc/gawk.texi is up to date
 ___ doc/gawkinet.texi is up to date
 ___ doc/gawkworkflow.texi is up to date
+___ doc/pm-gawk.texi is up to date
 ___ doc/gawk.1 is up to date
 ___ doc/awkcard.in is up to date
 ___ Italian translations are up to date:
-       ___ doc/it/gawktexi.in
+       ___ doc/it/gawk.texi
        ___ doc/it/gawk.1
        ___ po/it.po
 ___ Run prepinfo on the manual.
diff --git a/main.c b/main.c
index 9b63bad3..8a1adda7 100644
--- a/main.c
+++ b/main.c
@@ -1726,7 +1726,7 @@ parse_args(int argc, char **argv)
                        break;
 
                case 'p':
-                       if (do_pretty_print)
+                       if (do_pretty_print && ! do_profile)
                                warning(_("`--profile' overrides 
`--pretty-print'"));
                        do_flags |= DO_PROFILE;
                        /* fall through */

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

Summary of changes:
 ChangeLog                                        |   9 ++
 Checklist                                        |   9 +-
 awkgram.c                                        |   1 +
 awkgram.y                                        |   1 +
 doc/ChangeLog                                    |   6 +
 doc/gawk.texi                                    |  34 ----
 doc/it/ChangeLog                                 |  18 +++
 doc/it/README.txt                                |  21 +--
 doc/it/{compila_originale.sh => compila_gawk.sh} |   4 -
 doc/it/compila_smallprint.sh                     |  19 ---
 doc/it/gawk.1                                    |  40 ++---
 doc/it/{gawktexi.in => gawk.texi}                | 176 ++++++++++++---------
 doc/it/gendocs.sh                                |  48 +++++-
 doc/it/genera_formati.sh                         |   8 +-
 doc/it/sidebar.awk                               |  67 --------
 doc/it/texinfo.tex                               | 190 +++++++++++------------
 main.c                                           |   2 +-
 17 files changed, 311 insertions(+), 342 deletions(-)
 mode change 100644 => 100755 doc/it/README.txt
 rename doc/it/{compila_originale.sh => compila_gawk.sh} (80%)
 delete mode 100755 doc/it/compila_smallprint.sh
 mode change 100755 => 100644 doc/it/gawk.1
 rename doc/it/{gawktexi.in => gawk.texi} (99%)
 delete mode 100644 doc/it/sidebar.awk


hooks/post-receive
-- 
gawk