diff: extras/trailed_update bug fixes

[Fergus Henderson]

Fix a bug in the trailed_update library, and try to ensure
that it won't happen again.

extras/trailed_update/var.m:
	Fix a bug (I had changed a function name in but forgotten
	to change the caller).

extras/trailed_update/Mmakefile:
	Add `-Werror' to MGNUCFLAGS, to prevent reoccurrence of bugs
	like the one above.
	Fix the rule for `mmake depend' so that it makes the
	dependencies in the `samples' subdirectory too.

tools/test_mercury:
	Test the trailed_update library.

cvs diff  extras/trailed_update/Mmakefile extras/trailed_update/var.m tools/test_mercury
Index: extras/trailed_update/Mmakefile
===================================================================
RCS file: /home/staff/zs/imp/mercury/extras/trailed_update/Mmakefile,v
retrieving revision 1.3
diff -u -r1.3 Mmakefile
--- Mmakefile	1997/10/07 11:47:58	1.3
+++ Mmakefile	1997/11/11 10:11:01
@@ -8,12 +8,13 @@
 
 # enable C debugging
 RM_C = :
-MGNUCFLAGS = -g
+MGNUCFLAGS = -g -Werror
 MLFLAGS = -g
 
 MAIN_TARGET = libtrailed_update
 
 depend : trailed_update.depend
+	cd samples && mmake $(MMAKEFLAGS) depend
 
 check : libtrailed_update
 	cd samples && mmake $(MMAKEFLAGS) check
Index: extras/trailed_update/var.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/extras/trailed_update/var.m,v
retrieving revision 1.6
diff -u -r1.6 var.m
--- var.m	1997/10/12 13:32:51	1.6
+++ var.m	1997/11/11 10:11:12
@@ -458,7 +458,7 @@
 			** can't commit, so the goal flounders.
 			*/
 			if (old_goal != ML_var_last_goal.prev) {
-				report_goal_floundered(old_goal);
+				ML_var_report_goal_floundered(old_goal);
 			}
 			break;
 
Index: tools/test_mercury
===================================================================
RCS file: /home/staff/zs/imp/mercury/tools/test_mercury,v
retrieving revision 1.61
diff -u -r1.61 test_mercury
--- test_mercury	1997/09/26 14:13:58	1.61
+++ test_mercury	1997/11/11 10:08:22
@@ -291,13 +291,21 @@
 for grade in $GRADES kludge_for_broken_shells
 do
 	if [ "$GRADE" != kludge_for_broken_shells ]; then
-		echo "tests clpr stuff for grade $grade" 1>&2
+		echo "test clpr stuff for grade $grade" 1>&2
 		(cd mercury/extras/clpr &&
 			 mmake realclean $PARALLEL MMAKEFLAGS=$PARALLEL &&
 			 mmake depend	$PARALLEL MMAKEFLAGS=$PARALLEL &&
 			 mmake 		$PARALLEL MMAKEFLAGS=$PARALLEL &&
 			 mmake check	$PARALLEL MMAKEFLAGS=$PARALLEL &&
 			 mmake install	$PARALLEL MMAKEFLAGS=$PARALLEL &&
+			 mmake realclean $PARALLEL MMAKEFLAGS=$PARALLEL) ||
+				status=1
+		echo "test trailed_update stuff for grade $grade" 1>&2
+		(cd mercury/extras/trailed_update &&
+			 mmake realclean $PARALLEL MMAKEFLAGS=$PARALLEL &&
+			 mmake depend	$PARALLEL MMAKEFLAGS=$PARALLEL &&
+			 mmake 		$PARALLEL MMAKEFLAGS=$PARALLEL &&
+			 mmake check	$PARALLEL MMAKEFLAGS=$PARALLEL &&
 			 mmake realclean $PARALLEL MMAKEFLAGS=$PARALLEL) ||
 				status=1
 	fi

-- 
Fergus Henderson <fjh at cs.mu.oz.au>   |  "I have always known that the pursuit
WWW: <http://www.cs.mu.oz.au/~fjh>   |  of excellence is a lethal habit"
PGP: finger fjh at 128.250.37.3         |     -- the last words of T. S. Garp.