finally make our m4 SusV3-compliant.

- changecom and changequote have a simple definition (that matches gnu-m4,
coincidentally, so we no longer need two distinct modes for these)

- off-by-one bug in -s, this finally works.

- reorder main parser loop, so that we can use alphabetic constructs in
quotes/comments.

- rename putback to pushback, this matches comments, and makes more sense.

- more uniform (and updated) description of changequote/changecom.

- new, systematic regression tests of comments/quotes.

- framework to test -s: one perl script to reconstitute `full' files with
all line numbers, so that we can verify the output without needing a
complete match.

okay otto@, fries@

1 files changed, 12 insertions, 3 deletions

diff --git a/regress/usr.bin/m4/Makefile b/regress/usr.bin/m4/Makefile
index 66e6e1a4fe5..6b89ec7a220 100644
--- a/regress/usr.bin/m4/Makefile
+++ b/regress/usr.bin/m4/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.21 2005/05/17 20:37:11 espie Exp $
+#	$OpenBSD: Makefile,v 1.22 2005/09/06 15:33:21 espie Exp $
 
 FIBOMAX=25
 M4=m4
@@ -10,7 +10,7 @@ REGRESS_TARGETS= test-ff_after_dnl test-m4wrap test-m4wrap2 \
     test-m4wrap3 test-gm4wrap3 test-fibo \
     test-patterns trip test-strangequotes test-redef test-quotes \
     test-weird test-args test-esyscmd test-eval test-gnupatterns \
-    test-gnupatterns2
+    test-gnupatterns2 test-comments test-synch1 test-synch1bis
 
 test-ff_after_dnl: ff_after_dnl.m4
 	${M4} ff_after_dnl.m4 | diff - ${.CURDIR}/ff_after_dnl.out
@@ -52,8 +52,9 @@ test-quotes:
 	${M4} ${.CURDIR}/quotes.m4 2>&1|	\
 		sed -e 's,\( *\).*/quotes.m4,\1quotes.m4,' | \
 		diff - ${.CURDIR}/quotes.out
-	${M4} -g ${.CURDIR}/quotes.m4 2>&1|diff - ${.CURDIR}/quotes.gnu.out
 
+test-comments:
+	${M4} ${.CURDIR}/comments.m4 | diff - ${.CURDIR}/comments.out
 test-strangequotes: strangequotes.m4
 	${M4} strangequotes.m4| diff - ${.CURDIR}/strangequotes.out
 
@@ -72,6 +73,14 @@ test-esyscmd:
 test-eval:
 	${M4} ${.CURDIR}/eval.m4 | diff -u - ${.CURDIR}/eval.out
 
+test-synch1:
+	${M4} -s ${.CURDIR}/synch1.m4|perl ${.CURDIR}/reconstitute|\
+		grep MARK| diff - ${.CURDIR}/synch1.out
+
+test-synch1bis:
+	${M4} -s <${.CURDIR}/synch1.m4|perl ${.CURDIR}/reconstitute|\
+		grep MARK| diff - ${.CURDIR}/synch1bis.out
+
 .PHONY:	${REGRESS_TARGETS}
 
 .include <bsd.regress.mk>