for review: fix a problem with tests/term

[Zoltan Somogyi]

Fergus, please review this.

tests/term/Mmakefile:
	The setting of some optimization flags can require information
	(including termination information) about some non-interface
	procedures to be included in the .trans_opt file if intermodule
	optimization is specified. For consistent results even when the
	default sets of flags vary, we now disable the flags that can
	have this effect.

tests/term/associative.trans_opt_exp:
	Restrict the output to what you get without intermodule optimization
	flags.

Zoltan.

cvs diff: Diffing .
Index: Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/term/Mmakefile,v
retrieving revision 1.6
diff -u -u -r1.6 Mmakefile
--- Mmakefile	1998/03/20 02:58:28	1.6
+++ Mmakefile	1998/06/22 08:44:53
@@ -68,7 +68,10 @@
 
 #-----------------------------------------------------------------------------#
 
-MCTRANSOPTFLAGS = --enable-termination --term-single-arg 5 --term-norm simple
+MCTERMFLAGS = --enable-termination --term-single-arg 5 --term-norm simple
+MCOPTFLAGS  = --no-inlining --no-optimize-unused-args --no-deforestation \
+	      --no-optimize-higher-order
+MCTRANSOPTFLAGS = $(MCTERMFLAGS) $(MCOPTFLAGS)
 
 $(trans_opts_subdir)%.trans_opt: %.m
 	$(MC) $(MCFLAGS) --make-trans-opt $(MCTRANSOPTFLAGS) $< \
Index: associative.trans_opt_exp
===================================================================
RCS file: /home/mercury1/repository/tests/term/associative.trans_opt_exp,v
retrieving revision 1.4
diff -u -u -r1.4 associative.trans_opt_exp
--- associative.trans_opt_exp	1998/05/25 21:55:00	1.4
+++ associative.trans_opt_exp	1998/06/22 08:45:23
@@ -1,3 +1,2 @@
 :- module associative.
 :- pragma termination_info(associative:normal_form((builtin:in), (builtin:out)), finite(0, [yes, no]), can_loop).
-:- pragma termination_info(associative:rewrite((builtin:in), (builtin:out)), finite(0, [yes, no]), cannot_loop).