[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] gawk branch, master, updated. gawk-4.1.0-4698-g27f1be8a
|
From: |
Arnold Robbins |
|
Subject: |
[SCM] gawk branch, master, updated. gawk-4.1.0-4698-g27f1be8a |
|
Date: |
Thu, 21 Apr 2022 10:32:07 -0400 (EDT) |
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 27f1be8a62b69cad58761b126f51297dbc093b13 (commit)
via 6cf92b53d37c1f9e3029cb1c8c0217100c7e36d8 (commit)
from 618431c865d8ac8a44e0bc9021b05c181695c136 (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=27f1be8a62b69cad58761b126f51297dbc093b13
commit 27f1be8a62b69cad58761b126f51297dbc093b13
Merge: 618431c8 6cf92b53
Author: Arnold D. Robbins <arnold@skeeve.com>
Date: Thu Apr 21 17:31:47 2022 +0300
Merge branch 'gawk-5.1-stable'
diff --cc ChangeLog
index a1c9443a,13f462a9..9380f203
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,12 +1,16 @@@
+ 2022-04-21 Arnold D. Robbins <arnold@skeeve.com>
+
+ Fix some profiling issues related to comments in switch / case
+ statements.
+
+ * awkgram.y (merge_comments): Remove newline between comments being
+ merged.
+ * profile.c (pprint): Improve code for Op_K_switch, Op_K_case.
+
+2022-04-18 Arnold D. Robbins <arnold@skeeve.com>
+
+ * gawkbug.in: Small changes.
+
2022-04-01 Arnold D. Robbins <arnold@skeeve.com>
Small fix from the persistent-gawk guys.
diff --cc pc/Makefile.tst
index 98ec2853,2ea1822c..8ccab06d
--- a/pc/Makefile.tst
+++ b/pc/Makefile.tst
@@@ -186,31 -186,31 +186,32 @@@ UNIX_TESTS =
GAWK_EXT_TESTS = \
aadelete1 aadelete2 aarray1 aasort aasorti argtest arraysort \
- arraysort2 arraytype backw badargs beginfile1 beginfile2 binmode1 \
- charasbytes colonwarn clos1way clos1way2 clos1way3 clos1way4 \
- clos1way5 clos1way6 commas crlf dbugeval dbugeval2 dbugeval3 \
- dbugtypedre1 dbugtypedre2 delsub devfd devfd1 devfd2 dfacheck1 \
- dumpvars errno exit fieldwdth forcenum fpat1 fpat2 fpat3 fpat4 \
- fpat5 fpat6 fpat7 fpat8 fpat9 fpatnull fsfwfs funlen functab1 \
- functab2 functab3 functab6 fwtest fwtest2 fwtest3 fwtest4 fwtest5 \
- fwtest6 fwtest7 fwtest8 genpot gensub gensub2 gensub3 getlndir \
- gnuops2 gnuops3 gnureops gsubind icasefs icasers id igncdym igncfs \
- ignrcas2 ignrcas4 ignrcase incdupe incdupe2 incdupe3 incdupe4 \
- incdupe5 incdupe6 incdupe7 include include2 indirectbuiltin \
- indirectbuiltin2 \
- indirectcall indirectcall2 indirectcall3 inf-nan-torture intarray
iolint \
- isarrayunset lint lintexp lintindex lintint lintlength lintplus \
- lintold lintset lintwarn manyfiles match1 match2 match3 mbstr1 \
- mbstr2 mixed1 mktime modifiers muldimposix nastyparm negtime \
- next nondec nondec2 nonfatal1 nonfatal2 nonfatal3 nsawk1a nsawk1b \
- nsawk1c nsawk2a nsawk2b nsbad nsbad_cmd nsforloop nsfuncrecurse \
- nsidentifier nsindirect1 nsindirect2 nsprof1 nsprof2 octdec patsplit
posix \
- printfbad1 printfbad2 printfbad3 printfbad4 printhuge procinfs \
- profile0 profile1 profile2 profile3 profile4 profile5 profile6 \
- profile7 profile8 profile9 profile10 profile11 profile12 profile13 \
- profile14 profile15 profile16 pty1 pty2 rebuf regexsub regnul1 regnul2 \
+ arraysort2 arraytype asortbool backw badargs beginfile1 \
+ beginfile2 binmode1 charasbytes clos1way clos1way2 clos1way3 \
+ clos1way4 clos1way5 clos1way6 colonwarn commas crlf dbugeval \
+ dbugeval2 dbugeval3 dbugtypedre1 dbugtypedre2 delsub devfd \
+ devfd1 devfd2 dfacheck1 dumpvars errno exit fieldwdth forcenum \
+ fpat1 fpat2 fpat3 fpat4 fpat5 fpat6 fpat7 fpat8 fpat9 fpatnull \
+ fsfwfs functab1 functab2 functab3 functab6 funlen fwtest fwtest2 \
+ fwtest3 fwtest4 fwtest5 fwtest6 fwtest7 fwtest8 genpot gensub \
+ gensub2 gensub3 getlndir gnuops2 gnuops3 gnureops gsubind \
+ icasefs icasers id igncdym igncfs ignrcas2 ignrcas4 ignrcase \
+ incdupe incdupe2 incdupe3 incdupe4 incdupe5 incdupe6 incdupe7 \
+ include include2 indirectbuiltin indirectcall indirectcall2 \
+ indirectcall3 indirectbuiltin2 \
+ inf-nan-torture intarray iolint isarrayunset lint lintexp \
+ lintindex lintint lintlength lintold lintplus lintset lintwarn \
+ manyfiles match1 match2 match3 mbstr1 mbstr2 mixed1 mktime \
+ modifiers muldimposix nastyparm negtime next nondec nondec2 \
+ nonfatal1 nonfatal2 nonfatal3 nsawk1a nsawk1b nsawk1c nsawk2a \
+ nsawk2b nsbad nsbad_cmd nsforloop nsfuncrecurse nsindirect1 \
+ nsidentifier nsindirect2 nsprof1 nsprof2 octdec patsplit posix
printfbad1 \
+ printfbad2 printfbad3 printfbad4 printhuge procinfs profile0 \
+ profile1 profile10 profile11 profile12 profile13 profile14 \
+ profile15 profile16 profile2 profile3 profile4 profile5 profile6 \
+ profile7 profile8 profile9 pty1 pty2 rebuf regexsub reginttrad \
+ profile17 \
- regx8bit reginttrad reint reint2 rsgetline rsglstdin rsstart1 \
+ regnul1 regnul2 regx8bit reint reint2 rsgetline rsglstdin rsstart1 \
rsstart2 rsstart3 rstest6 sandbox1 shadow shadowbuiltin sortfor \
sortfor2 sortu sourcesplit split_after_fpat splitarg4 strftfld \
strftime strtonum strtonum1 stupid1 stupid2 stupid3 stupid4 stupid5 \
@@@ -3201,7 -3187,12 +3202,12 @@@ regexsub
@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE:
$$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-regnul1:
++profile17:
+ @echo $@
- @-AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE:
$$? >>_$@
++ @-AWKPATH="$(srcdir)" $(AWK) -f $@.awk --pretty-print=_$@ >_$@ 2>&1 ||
echo EXIT CODE: $$? >>_$@
+ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
-regnul2:
+regnul1:
@echo $@
@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE:
$$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
diff --cc test/Makefile.am
index e6652965,04394b3c..58accb27
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@@ -1450,31 -1447,31 +1452,32 @@@ UNIX_TESTS =
GAWK_EXT_TESTS = \
aadelete1 aadelete2 aarray1 aasort aasorti argtest arraysort \
- arraysort2 arraytype backw badargs beginfile1 beginfile2 binmode1 \
- charasbytes colonwarn clos1way clos1way2 clos1way3 clos1way4 \
- clos1way5 clos1way6 commas crlf dbugeval dbugeval2 dbugeval3 \
- dbugtypedre1 dbugtypedre2 delsub devfd devfd1 devfd2 dfacheck1 \
- dumpvars errno exit fieldwdth forcenum fpat1 fpat2 fpat3 fpat4 \
- fpat5 fpat6 fpat7 fpat8 fpat9 fpatnull fsfwfs funlen functab1 \
- functab2 functab3 functab6 fwtest fwtest2 fwtest3 fwtest4 fwtest5 \
- fwtest6 fwtest7 fwtest8 genpot gensub gensub2 gensub3 getlndir \
- gnuops2 gnuops3 gnureops gsubind icasefs icasers id igncdym igncfs \
- ignrcas2 ignrcas4 ignrcase incdupe incdupe2 incdupe3 incdupe4 \
- incdupe5 incdupe6 incdupe7 include include2 indirectbuiltin \
- indirectbuiltin2 \
- indirectcall indirectcall2 indirectcall3 inf-nan-torture intarray
iolint \
- isarrayunset lint lintexp lintindex lintint lintlength lintplus \
- lintold lintset lintwarn manyfiles match1 match2 match3 mbstr1 \
- mbstr2 mixed1 mktime modifiers muldimposix nastyparm negtime \
- next nondec nondec2 nonfatal1 nonfatal2 nonfatal3 nsawk1a nsawk1b \
- nsawk1c nsawk2a nsawk2b nsbad nsbad_cmd nsforloop nsfuncrecurse \
- nsidentifier nsindirect1 nsindirect2 nsprof1 nsprof2 octdec patsplit
posix \
- printfbad1 printfbad2 printfbad3 printfbad4 printhuge procinfs \
- profile0 profile1 profile2 profile3 profile4 profile5 profile6 \
- profile7 profile8 profile9 profile10 profile11 profile12 profile13 \
- profile14 profile15 profile16 pty1 pty2 rebuf regexsub regnul1 regnul2 \
+ arraysort2 arraytype asortbool backw badargs beginfile1 \
+ beginfile2 binmode1 charasbytes clos1way clos1way2 clos1way3 \
+ clos1way4 clos1way5 clos1way6 colonwarn commas crlf dbugeval \
+ dbugeval2 dbugeval3 dbugtypedre1 dbugtypedre2 delsub devfd \
+ devfd1 devfd2 dfacheck1 dumpvars errno exit fieldwdth forcenum \
+ fpat1 fpat2 fpat3 fpat4 fpat5 fpat6 fpat7 fpat8 fpat9 fpatnull \
+ fsfwfs functab1 functab2 functab3 functab6 funlen fwtest fwtest2 \
+ fwtest3 fwtest4 fwtest5 fwtest6 fwtest7 fwtest8 genpot gensub \
+ gensub2 gensub3 getlndir gnuops2 gnuops3 gnureops gsubind \
+ icasefs icasers id igncdym igncfs ignrcas2 ignrcas4 ignrcase \
+ incdupe incdupe2 incdupe3 incdupe4 incdupe5 incdupe6 incdupe7 \
+ include include2 indirectbuiltin indirectcall indirectcall2 \
+ indirectcall3 indirectbuiltin2 \
+ inf-nan-torture intarray iolint isarrayunset lint lintexp \
+ lintindex lintint lintlength lintold lintplus lintset lintwarn \
+ manyfiles match1 match2 match3 mbstr1 mbstr2 mixed1 mktime \
+ modifiers muldimposix nastyparm negtime next nondec nondec2 \
+ nonfatal1 nonfatal2 nonfatal3 nsawk1a nsawk1b nsawk1c nsawk2a \
+ nsawk2b nsbad nsbad_cmd nsforloop nsfuncrecurse nsindirect1 \
+ nsidentifier nsindirect2 nsprof1 nsprof2 octdec patsplit posix
printfbad1 \
+ printfbad2 printfbad3 printfbad4 printhuge procinfs profile0 \
+ profile1 profile10 profile11 profile12 profile13 profile14 \
+ profile15 profile16 profile2 profile3 profile4 profile5 profile6 \
+ profile7 profile8 profile9 pty1 pty2 rebuf regexsub reginttrad \
+ profile17 \
- regx8bit reginttrad reint reint2 rsgetline rsglstdin rsstart1 \
+ regnul1 regnul2 regx8bit reint reint2 rsgetline rsglstdin rsstart1 \
rsstart2 rsstart3 rstest6 sandbox1 shadow shadowbuiltin sortfor \
sortfor2 sortu sourcesplit split_after_fpat splitarg4 strftfld \
strftime strtonum strtonum1 stupid1 stupid2 stupid3 stupid4 stupid5 \
diff --cc test/Makefile.in
index ed60771d,7e39f325..82cc0d5c
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@@ -1716,31 -1713,31 +1718,32 @@@ UNIX_TESTS =
GAWK_EXT_TESTS = \
aadelete1 aadelete2 aarray1 aasort aasorti argtest arraysort \
- arraysort2 arraytype backw badargs beginfile1 beginfile2 binmode1 \
- charasbytes colonwarn clos1way clos1way2 clos1way3 clos1way4 \
- clos1way5 clos1way6 commas crlf dbugeval dbugeval2 dbugeval3 \
- dbugtypedre1 dbugtypedre2 delsub devfd devfd1 devfd2 dfacheck1 \
- dumpvars errno exit fieldwdth forcenum fpat1 fpat2 fpat3 fpat4 \
- fpat5 fpat6 fpat7 fpat8 fpat9 fpatnull fsfwfs funlen functab1 \
- functab2 functab3 functab6 fwtest fwtest2 fwtest3 fwtest4 fwtest5 \
- fwtest6 fwtest7 fwtest8 genpot gensub gensub2 gensub3 getlndir \
- gnuops2 gnuops3 gnureops gsubind icasefs icasers id igncdym igncfs \
- ignrcas2 ignrcas4 ignrcase incdupe incdupe2 incdupe3 incdupe4 \
- incdupe5 incdupe6 incdupe7 include include2 indirectbuiltin \
- indirectbuiltin2 \
- indirectcall indirectcall2 indirectcall3 inf-nan-torture intarray
iolint \
- isarrayunset lint lintexp lintindex lintint lintlength lintplus \
- lintold lintset lintwarn manyfiles match1 match2 match3 mbstr1 \
- mbstr2 mixed1 mktime modifiers muldimposix nastyparm negtime \
- next nondec nondec2 nonfatal1 nonfatal2 nonfatal3 nsawk1a nsawk1b \
- nsawk1c nsawk2a nsawk2b nsbad nsbad_cmd nsforloop nsfuncrecurse \
- nsidentifier nsindirect1 nsindirect2 nsprof1 nsprof2 octdec patsplit
posix \
- printfbad1 printfbad2 printfbad3 printfbad4 printhuge procinfs \
- profile0 profile1 profile2 profile3 profile4 profile5 profile6 \
- profile7 profile8 profile9 profile10 profile11 profile12 profile13 \
- profile14 profile15 profile16 pty1 pty2 rebuf regexsub regnul1 regnul2 \
+ arraysort2 arraytype asortbool backw badargs beginfile1 \
+ beginfile2 binmode1 charasbytes clos1way clos1way2 clos1way3 \
+ clos1way4 clos1way5 clos1way6 colonwarn commas crlf dbugeval \
+ dbugeval2 dbugeval3 dbugtypedre1 dbugtypedre2 delsub devfd \
+ devfd1 devfd2 dfacheck1 dumpvars errno exit fieldwdth forcenum \
+ fpat1 fpat2 fpat3 fpat4 fpat5 fpat6 fpat7 fpat8 fpat9 fpatnull \
+ fsfwfs functab1 functab2 functab3 functab6 funlen fwtest fwtest2 \
+ fwtest3 fwtest4 fwtest5 fwtest6 fwtest7 fwtest8 genpot gensub \
+ gensub2 gensub3 getlndir gnuops2 gnuops3 gnureops gsubind \
+ icasefs icasers id igncdym igncfs ignrcas2 ignrcas4 ignrcase \
+ incdupe incdupe2 incdupe3 incdupe4 incdupe5 incdupe6 incdupe7 \
+ include include2 indirectbuiltin indirectcall indirectcall2 \
+ indirectcall3 indirectbuiltin2 \
+ inf-nan-torture intarray iolint isarrayunset lint lintexp \
+ lintindex lintint lintlength lintold lintplus lintset lintwarn \
+ manyfiles match1 match2 match3 mbstr1 mbstr2 mixed1 mktime \
+ modifiers muldimposix nastyparm negtime next nondec nondec2 \
+ nonfatal1 nonfatal2 nonfatal3 nsawk1a nsawk1b nsawk1c nsawk2a \
+ nsawk2b nsbad nsbad_cmd nsforloop nsfuncrecurse nsindirect1 \
+ nsidentifier nsindirect2 nsprof1 nsprof2 octdec patsplit posix
printfbad1 \
+ printfbad2 printfbad3 printfbad4 printhuge procinfs profile0 \
+ profile1 profile10 profile11 profile12 profile13 profile14 \
+ profile15 profile16 profile2 profile3 profile4 profile5 profile6 \
+ profile7 profile8 profile9 pty1 pty2 rebuf regexsub reginttrad \
+ profile17 \
- regx8bit reginttrad reint reint2 rsgetline rsglstdin rsstart1 \
+ regnul1 regnul2 regx8bit reint reint2 rsgetline rsglstdin rsstart1 \
rsstart2 rsstart3 rstest6 sandbox1 shadow shadowbuiltin sortfor \
sortfor2 sortu sourcesplit split_after_fpat splitarg4 strftfld \
strftime strtonum strtonum1 stupid1 stupid2 stupid3 stupid4 stupid5 \
@@@ -4890,7 -4873,12 +4893,12 @@@ regexsub
@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE:
$$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-regnul1:
++profile17:
+ @echo $@
- @-AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE:
$$? >>_$@
++ @-AWKPATH="$(srcdir)" $(AWK) -f $@.awk --pretty-print=_$@ >_$@ 2>&1 ||
echo EXIT CODE: $$? >>_$@
+ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
-regnul2:
+regnul1:
@echo $@
@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE:
$$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
diff --cc test/Maketests
index d21d4c6c,efc168b5..5e4080e2
--- a/test/Maketests
+++ b/test/Maketests
@@@ -1921,7 -1916,12 +1921,12 @@@ regexsub
@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE:
$$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-regnul1:
++profile17:
+ @echo $@
- @-AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE:
$$? >>_$@
++ @-AWKPATH="$(srcdir)" $(AWK) -f $@.awk --pretty-print=_$@ >_$@ 2>&1 ||
echo EXIT CODE: $$? >>_$@
+ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
-regnul2:
+regnul1:
@echo $@
@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE:
$$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 9 +++++++++
awkgram.c | 2 +-
awkgram.y | 1 -
pc/ChangeLog | 4 ++++
pc/Makefile.tst | 8 +++++++-
profile.c | 10 +++++++---
test/ChangeLog | 5 +++++
test/Makefile.am | 5 ++++-
test/Makefile.in | 10 +++++++++-
test/Maketests | 5 +++++
test/profile10.ok | 3 +--
test/profile11.ok | 13 ++-----------
test/profile17.awk | 18 ++++++++++++++++++
test/profile17.ok | 19 +++++++++++++++++++
test/profile5.ok | 18 ++++++------------
15 files changed, 97 insertions(+), 33 deletions(-)
create mode 100755 test/profile17.awk
create mode 100644 test/profile17.ok
hooks/post-receive
--
gawk
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] gawk branch, master, updated. gawk-4.1.0-4698-g27f1be8a,
Arnold Robbins <=