GH-25 Fix SEE FNEGATE; add test to SEE all words. Tweak error

output to use stdout which allows errors to follow more closely to the their temporal location.
SirWumpus · Sep 3, 2024 · d00e59c · d00e59c
1 parent 9470ca9
commit d00e59c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/src/makefile.in b/src/makefile.in
@@ -91,7 +91,7 @@ post4$E : config.h post4.h hooks.c post4.c
 post4.i : config.h post4.h post4.c
 	${CC} -E ${CFLAGS} -DTEST -DP4_BUILT="\"${BUILT}\"" post4.c >$*.i
 
-test : post4$E
+test tests: post4$E
 	cd ../test && ${MAKE} $@
 
 valgrind: post4$E

diff --git a/src/post4.c b/src/post4.c
@@ -1221,7 +1221,7 @@ p4Create(P4_Options *opts)
 	return NULL;
 }
 
-#define STDERR	stderr
+#define STDERR	stdout
 
 #ifdef P4_TRACE
 static void
@@ -2725,6 +2725,9 @@ _seext:		word = P4_POP(ctx->ds).xt;
 				} else if (strncmp(x.w->name.string, "_slit", STRLEN("_slit")) == 0) {
 					(void) printf("S\" %s\" ", (char *) &w.p[2]);
 					w.u += P4_CELL + P4_CELL_ALIGN(w.p[1].u + 1);
+				} else if (strncmp(x.w->name.string, "flit", STRLEN("flit")) == 0) {
+					/* Test: SEE FNEGATE */
+					(void) printf("%.*lF ", (int) ctx->precision, (*++w.p).f);
 				} else {
 					(void) printf("%.*s ", (int) x.w->name.length, x.w->name.string);
 					if (x.w->code == &&_branch || x.w->code == &&_branchz

diff --git a/test/makefile.in b/test/makefile.in
@@ -46,7 +46,7 @@ build: title post4$E
 
 clean : title
 	-rm -f *.o *.obj *.i *.map *.tds *.TR2 *.stackdump core *.core core.* *.log
-	-rm -f a.out$E post4$E
+	-rm -f a.out$E see.out post4$E
 
 distclean: clean
 	-rm -f config.h config.h.in makefile
@@ -60,12 +60,23 @@ title :
 	@echo '***************************************************************'
 	@echo
 
+tests: test test_quit see_all
+
 test : ${POST4}
 	POST4_PATH=../src ${POST4} ./units.p4
+
+test_quit : ${POST4}
 	@echo Testing QUIT...
 	! printf "' QUIT CATCH \n ABORT" | ${POST4} -c ${WORDS}
 	! printf "' QUIT CATCH \n -1 THROW" | ${POST4} -c ${WORDS}
 	! printf "' QUIT CATCH \n -123 THROW" | ${POST4} -c ${WORDS}
 	printf 'S" 0 THROW" '\'' EVALUATE CATCH' | ${POST4} -c ${WORDS}
 	printf 'S" -1 THROW" '\'' EVALUATE CATCH' | ${POST4} -c ${WORDS}
 	printf ": tw_keep_ds [: 123 QUIT ;] CATCH 456 . THROW ;\n tw_keep_ds \n . CR" | ${POST4} -c ${WORDS}
+
+# Test SEE against all words to check if any result in some failure like SEGFAULT.
+see_all: ${POST4}
+	echo WORDS | ${POST4} -c ${WORDS} \
+	  | sed 's/[[:space:][:cntrl:]]*$$//; s/[^[:space:][:cntrl:]]*/SEE &/g'\
+	  | ${POST4} -c ${WORDS} >see.out 2>&1
+	@echo "-OK-"