aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2019-04-23 10:54:37 +0300
committerArnold D. Robbins <arnold@skeeve.com>2019-04-23 10:54:37 +0300
commit6a221b414087f0cf397b9f22a70c8b75b423d72b (patch)
tree86d9a68c6ada84034215e8d14a671d5efcf5f6fa
parentd3b5c776178a0b0680f984eab536c83089bbc92a (diff)
parent9347fde4a80b9dc31d2ddfacb14630be5f23287c (diff)
downloadegawk-6a221b414087f0cf397b9f22a70c8b75b423d72b.tar.gz
egawk-6a221b414087f0cf397b9f22a70c8b75b423d72b.tar.bz2
egawk-6a221b414087f0cf397b9f22a70c8b75b423d72b.zip
Merge branch 'gawk-5.0-stable'
-rw-r--r--doc/ChangeLog5
-rw-r--r--doc/gawk.texi4
-rw-r--r--doc/gawktexi.in4
-rw-r--r--test/ChangeLog5
-rw-r--r--test/Makefile.am5
-rw-r--r--test/Makefile.in10
-rw-r--r--test/Maketests5
-rw-r--r--test/assignnumfield2.awk4
-rw-r--r--test/assignnumfield2.ok1
9 files changed, 35 insertions, 8 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index fa330c20..63e3a4cb 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2019-04-22 Arnold D. Robbins <arnold@skeeve.com>
+
+ * gawktexi.in (Undocumented): Fix a typo. Thanks to Antonio Columbo
+ for pointing it out.
+
2019-04-21 Arnold D. Robbins <arnold@skeeve.com>
* gawktexi.in (Limitations): Provide brief instructions
diff --git a/doc/gawk.texi b/doc/gawk.texi
index 4b146a52..899fab49 100644
--- a/doc/gawk.texi
+++ b/doc/gawk.texi
@@ -5045,7 +5045,7 @@ use within Bash shell scripts, such that the error message will reflect
the line number in the shell script, instead of in the @command{awk}
program. To demonstrate:
-@exmaple
+@example
$ @kbd{gawk -v LINENO=10 'BEGIN @{ print("hi" @}'}
@error{} gawk: cmd. line:11: BEGIN @{ print("hi" @}
@error{} gawk: cmd. line:11: ^ syntax error
@@ -45210,5 +45210,3 @@ Add a section explaining recursion from ground zero. Probably
easiest to do it with factorial as the example. Explain that
recursion needs a stopping condition. Thanks to
Bill Duncan <bduncan@beachnet.org> for the suggestion.
-
-4/2109: Go through and check @print{} vs. @error{} in examples
diff --git a/doc/gawktexi.in b/doc/gawktexi.in
index 757fb4c0..611eed4a 100644
--- a/doc/gawktexi.in
+++ b/doc/gawktexi.in
@@ -4955,7 +4955,7 @@ use within Bash shell scripts, such that the error message will reflect
the line number in the shell script, instead of in the @command{awk}
program. To demonstrate:
-@exmaple
+@example
$ @kbd{gawk -v LINENO=10 'BEGIN @{ print("hi" @}'}
@error{} gawk: cmd. line:11: BEGIN @{ print("hi" @}
@error{} gawk: cmd. line:11: ^ syntax error
@@ -44183,5 +44183,3 @@ Add a section explaining recursion from ground zero. Probably
easiest to do it with factorial as the example. Explain that
recursion needs a stopping condition. Thanks to
Bill Duncan <bduncan@beachnet.org> for the suggestion.
-
-4/2109: Go through and check @print{} vs. @error{} in examples
diff --git a/test/ChangeLog b/test/ChangeLog
index 726ac262..e5b9dce2 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2019-02-22 Andrew J. Schorr <aschorr@telemetry-investments.com>
+
+ * Makefile.am (EXTRA_DIST): New test assignnumfield2.
+ * assignnumfield2.awk, assignnumfield2.ok: New files.
+
2019-04-21 Arnold D. Robbins <arnold@skeeve.com>
* Makefile.am (EXTRA_DIST): New test: fscaret.
diff --git a/test/Makefile.am b/test/Makefile.am
index 1ca9ba0c..4a5ab2d2 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -127,6 +127,8 @@ EXTRA_DIST = \
assignnumfield.awk \
assignnumfield.in \
assignnumfield.ok \
+ assignnumfield2.awk \
+ assignnumfield2.ok \
awkpath.ok \
back89.awk \
back89.in \
@@ -1285,7 +1287,8 @@ BASIC_TESTS = \
addcomma anchgsub anchor argarray arrayind1 arrayind2 arrayind3 arrayparm \
arrayprm2 arrayprm3 arrayref arrymem1 arryref2 arryref3 arryref4 arryref5 \
arynasty arynocls aryprm1 aryprm2 aryprm3 aryprm4 aryprm5 aryprm6 aryprm7 \
- aryprm8 aryprm9 arysubnm aryunasgn asgext awkpath assignnumfield \
+ aryprm8 aryprm9 arysubnm aryunasgn asgext awkpath \
+ assignnumfield assignnumfield2 \
back89 backgsub badassign1 badbuild \
callparam childin clobber closebad clsflnam compare compare2 \
concat1 concat2 concat3 concat4 concat5 convfmt \
diff --git a/test/Makefile.in b/test/Makefile.in
index 5eb79abe..bd261a5b 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -386,6 +386,8 @@ EXTRA_DIST = \
assignnumfield.awk \
assignnumfield.in \
assignnumfield.ok \
+ assignnumfield2.awk \
+ assignnumfield2.ok \
awkpath.ok \
back89.awk \
back89.in \
@@ -1544,7 +1546,8 @@ BASIC_TESTS = \
addcomma anchgsub anchor argarray arrayind1 arrayind2 arrayind3 arrayparm \
arrayprm2 arrayprm3 arrayref arrymem1 arryref2 arryref3 arryref4 arryref5 \
arynasty arynocls aryprm1 aryprm2 aryprm3 aryprm4 aryprm5 aryprm6 aryprm7 \
- aryprm8 aryprm9 arysubnm aryunasgn asgext awkpath assignnumfield \
+ aryprm8 aryprm9 arysubnm aryunasgn asgext awkpath \
+ assignnumfield assignnumfield2 \
back89 backgsub badassign1 badbuild \
callparam childin clobber closebad clsflnam compare compare2 \
concat1 concat2 concat3 concat4 concat5 convfmt \
@@ -2887,6 +2890,11 @@ assignnumfield:
@AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+assignnumfield2:
+ @echo $@
+ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
back89:
@echo $@
@AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
diff --git a/test/Maketests b/test/Maketests
index 1de780ec..ccce4f54 100644
--- a/test/Maketests
+++ b/test/Maketests
@@ -145,6 +145,11 @@ assignnumfield:
@AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+assignnumfield2:
+ @echo $@
+ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
back89:
@echo $@
@AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
diff --git a/test/assignnumfield2.awk b/test/assignnumfield2.awk
new file mode 100644
index 00000000..48b42db6
--- /dev/null
+++ b/test/assignnumfield2.awk
@@ -0,0 +1,4 @@
+BEGIN {
+ $0 = 1
+ print $1
+}
diff --git a/test/assignnumfield2.ok b/test/assignnumfield2.ok
new file mode 100644
index 00000000..d00491fd
--- /dev/null
+++ b/test/assignnumfield2.ok
@@ -0,0 +1 @@
+1