[m-dev.] trivial diff: s/aditi_ui/aditi_mui

Simon Taylor stayl at cs.mu.OZ.AU
Fri May 5 16:10:09 AEST 2000


Estimated hours taken: 0.5

The Aditi transaction paper published a few years ago contained
a small error which I included in my code -- the state arguments
passed into queries to ensure that database predicates are only
called from within a transaction should have mode `mui' rather
than `ui'. Compiling queries with the alias branch mode checker
confirms this.

Because `mui' modes do not yet work on the main branch, `aditi_mui'
(equivalent to `in') is used instead. This change replaces
all instances of `aditi_ui' with `aditi_mui'.

compiler/*.m:
doc/*.texi:
extras/aditi/*:
tests/valid/aditi*.m:
tests/invalid/aditi*.m:
	s/aditi_ui/aditi_mui


Index: compiler/hlds_goal.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/hlds_goal.m,v
retrieving revision 1.69
diff -u -u -r1.69 hlds_goal.m
--- compiler/hlds_goal.m	2000/04/14 08:37:50	1.69
+++ compiler/hlds_goal.m	2000/05/05 04:04:00
@@ -268,13 +268,13 @@
 		% An ugly syntax:
 		%
 		% InsertPred = (aditi_bottom_up
-		%	pred(DB::aditi_ui, X::out, Y::out) :- 
+		%	pred(DB::aditi_mui, X::out, Y::out) :- 
 		%		q(DB, X, Y)
 		% ),
 		% aditi_bulk_insert(pred p/3, InsertPred).
 		%
 		% DeletePred = (aditi_bottom_up
-		%	pred(DB::aditi_ui, X::out, Y::out) :- 
+		%	pred(DB::aditi_mui, X::out, Y::out) :- 
 		%		p(DB, X, Y),
 		%		q(DB, X, Y)
 		% ),
Index: compiler/mode_util.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/mode_util.m,v
retrieving revision 1.122
diff -u -u -r1.122 mode_util.m
--- compiler/mode_util.m	2000/04/19 04:00:36	1.122
+++ compiler/mode_util.m	2000/05/05 04:04:08
@@ -189,7 +189,7 @@
 	% Construct the modes used for `aditi__state' arguments.
 	% XXX These should be unique, but are not yet because that
 	% would require alias tracking.
-:- func aditi_ui_mode = (mode).
+:- func aditi_mui_mode = (mode).
 :- func aditi_di_mode = (mode).
 :- func aditi_uo_mode = (mode).
 
@@ -1636,7 +1636,7 @@
 
 unused_mode(Mode) :- make_std_mode("unused", [], Mode).
 
-aditi_ui_mode = Mode :- in_mode(Mode). 
+aditi_mui_mode = Mode :- in_mode(Mode). 
 
 aditi_di_mode = Mode :- in_mode(Mode).
 
Index: compiler/post_typecheck.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/post_typecheck.m,v
retrieving revision 1.21
diff -u -u -r1.21 post_typecheck.m
--- compiler/post_typecheck.m	2000/05/05 02:42:11	1.21
+++ compiler/post_typecheck.m	2000/05/05 04:04:12
@@ -445,7 +445,7 @@
 post_typecheck__insert_delete_modify_closure_info(bulk_insert, PredOrFunc,
 		ArgTypes, PredOrFunc, ClosureArgModes, nondet) :-
 	out_mode(OutMode),
-	AditiStateMode = aditi_ui_mode,
+	AditiStateMode = aditi_mui_mode,
 	aditi_builtin_modes(OutMode, AditiStateMode,
 		ArgTypes, ClosureArgModes).
 post_typecheck__insert_delete_modify_closure_info(delete(BulkOrFilter),
@@ -457,7 +457,7 @@
 		BulkOrFilter = filter,
 		in_mode(ArgMode)
 	),
-	AditiStateMode = aditi_ui_mode,
+	AditiStateMode = aditi_mui_mode,
 	aditi_builtin_modes(ArgMode, AditiStateMode,
 		ArgTypes, ClosureArgModes).
 post_typecheck__insert_delete_modify_closure_info(modify(BulkOrFilter),
@@ -470,7 +470,7 @@
 	(
 		BulkOrFilter = bulk,
 		DeleteArgMode = OutMode,
-		DeleteAditiStateMode = aditi_ui_mode
+		DeleteAditiStateMode = aditi_mui_mode
 	;
 		BulkOrFilter = filter,
 		DeleteArgMode = InMode,
@@ -752,7 +752,7 @@
 	{ proc_info_maybe_declared_argmodes(ProcInfo, MaybeArgModes) },
 	(
 		{ MaybeArgModes = yes(ArgModes) },
-		{ AditiUi = aditi_ui_mode },
+		{ AditiUi = aditi_mui_mode },
 		{ mode_get_insts(ModuleInfo, AditiUi, AditiUiInitialInst, _) },
 		(
 			{ check_aditi_state_modes_2(ModuleInfo, ArgTypes,
@@ -809,7 +809,7 @@
 	{ report_aditi_pragma(PredInfo, PredErrorPieces) },
 	{ list__append(PredErrorPieces,
 		[words(
-		"without an `aditi__state' argument with mode `aditi_ui'.")],
+		"without an `aditi__state' argument with mode `aditi_mui'.")],
 		ErrorPieces) },
 	error_util__write_error_pieces(Context, 0, ErrorPieces).
 
Index: compiler/purity.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/purity.m,v
retrieving revision 1.25
diff -u -u -r1.25 purity.m
--- compiler/purity.m	2000/04/22 07:12:02	1.25
+++ compiler/purity.m	2000/05/05 04:04:15
@@ -588,7 +588,7 @@
 				EvalMethod = (aditi_bottom_up),
 				% Make sure `aditi_bottom_up' expressions have
 				% a `ui' mode for their aditi_state.
-				StateMode = aditi_ui_mode
+				StateMode = aditi_mui_mode
 			),
 			pred_info_clauses_info(PredInfo, ClausesInfo),
 			clauses_info_vartypes(ClausesInfo, VarTypes),
Index: doc/reference_manual.texi
===================================================================
RCS file: /home/mercury1/repository/mercury/doc/reference_manual.texi,v
retrieving revision 1.181
diff -u -u -r1.181 reference_manual.texi
--- doc/reference_manual.texi	2000/04/22 07:12:21	1.181
+++ doc/reference_manual.texi	2000/05/05 04:04:36
@@ -6296,13 +6296,13 @@
 
 The examples make use of the following declarations:
 @example
-:- pred p(aditi__state::aditi_ui, int::out, int::out) is nondet.
+:- pred p(aditi__state::aditi_mui, int::out, int::out) is nondet.
 :- pragma base_relation(p/3).
 
-:- func f(aditi__state::aditi_ui, int::out) = (int::out) is nondet.
+:- func f(aditi__state::aditi_mui, int::out) = (int::out) is nondet.
 :- pragma base_relation(f/2).
 
-:- pred ancestor(aditi__state::aditi_ui, int::out, int::out) is nondet.
+:- pred ancestor(aditi__state::aditi_mui, int::out, int::out) is nondet.
 :- pragma aditi(ancestor/3).
 @end example
 
@@ -6432,7 +6432,7 @@
 the same type signature as the base relation being updated.
 
 The @samp{aditi__state} argument of @samp{@var{Closure}} must have
-mode @samp{aditi_ui}. All other arguments must have mode @samp{out}.
+mode @samp{aditi_mui}. All other arguments must have mode @samp{out}.
 The determinism of @samp{@var{Closure}} must be @samp{nondet}.
 
 @samp{@var{Closure}} must be evaluable bottom-up by the Aditi
@@ -6458,7 +6458,7 @@
 
 @example
 Closure = (aditi_bottom_up
-        pred(@var{DB1}::aditi_ui, @var{Arg2}::out, @dots{}) is nondet :- @var{Goal}),
+        pred(@var{DB1}::aditi_mui, @var{Arg2}::out, @dots{}) is nondet :- @var{Goal}),
 aditi_bulk_insert(@var{PredOrFunc} @var{Name}/@var{Arity}, @var{Closure}, @var{DB0}, @var{DB}).
 @end example 
 
@@ -6477,7 +6477,7 @@
 
 @example
 DeleteClosure = (aditi_bottom_up
-        pred(@var{DB1}::aditi_ui, @var{Arg2}::out, @dots{}) is nondet :-
+        pred(@var{DB1}::aditi_mui, @var{Arg2}::out, @dots{}) is nondet :-
         @var{PredName}(@var{DB1}, @var{Arg2}, @dots{}),
         @var{Goal}
 ),
@@ -6498,7 +6498,7 @@
 
 bulk_insert_example_3(DB0, DB) :-
         InsertP = (aditi_bottom_up
-                pred(DB1::aditi_ui, X::out, Y::out) is nondet :-
+                pred(DB1::aditi_mui, X::out, Y::out) is nondet :-
                         ancestor(DB1, X, Y)
                 ),
         aditi_bulk_insert(pred p/3, InsertP, DB0, DB).
@@ -6512,7 +6512,7 @@
 
 bulk_delete_example_2(DB0, DB) :-
         DeleteP = (aditi_bottom_up
-                pred(DB1::aditi_ui, X::out, Y::out) is nondet :-
+                pred(DB1::aditi_mui, X::out, Y::out) is nondet :-
                         p(DB1, X, Y),
                         X > 1,
                         X < 5
@@ -6524,7 +6524,7 @@
 
 bulk_delete_example_4(DB0, DB) :-
         DeleteQ = (aditi_bottom_up
-                func(DB1::aditi_ui, X::out) = (Y::out) is nondet :-
+                func(DB1::aditi_mui, X::out) = (Y::out) is nondet :-
                         q(DB1, X) = Y,
                         X > 1,
                         X < 5
@@ -6534,7 +6534,7 @@
 
 The type of @samp{InsertP} is
 @w{@samp{aditi_bottom_up pred(aditi__state, int, int)}}.
-Its inst is @w{@samp{pred(aditi_ui, out, out) is nondet}},
+Its inst is @w{@samp{pred(aditi_mui, out, out) is nondet}},
 as for a normal lambda expression.
 
 Note that in @samp{bulk_delete_example_1} the extra set of parentheses around
@@ -6595,7 +6595,7 @@
 The original tuple is given by the first set of arguments, which
 have mode @samp{out}. The updated tuple is given by the second set
 of arguments, which have mode @samp{out}. The @samp{aditi__state}
-argument for the original tuple has mode @samp{aditi_ui}.
+argument for the original tuple has mode @samp{aditi_mui}.
 The @samp{aditi__state} argument for the updated tuple has mode
 @samp{unused}.
 
@@ -6613,14 +6613,14 @@
 must have type
 @samp{aditi_bottom_up pred(aditi__state, @var{Type1}, @dots{}, aditi__state, @var{Type1}, @dots{})},
 and inst
- at w{@samp{pred(aditi_ui, out, @dots{}, unused, out, @dots{}) is nondet}}.
+ at w{@samp{pred(aditi_mui, out, @dots{}, unused, out, @dots{}) is nondet}}.
 
 When modifying a function with type declaration
 @w{@samp{:- func p(aditi__state, @var{Type1}, @dots{}) = @var{Type2}}},
 @samp{@var{Closure}} must have type
 @samp{aditi_bottom_up pred(aditi__state, @var{Type1}, @dots{}, @var{Type2}, aditi__state, @var{Type1}, @dots{}, @var{Type2})},
 and inst
- at w{@samp{pred(aditi_ui, out, @dots{}, out, unused, out, @dots{}, out) is nondet}}.
+ at w{@samp{pred(aditi_mui, out, @dots{}, out, unused, out, @dots{}, out) is nondet}}.
 
 It is an error for the closure to return a solution for which the arguments
 corresponding to the original tuple do not match a tuple in the relation
@@ -6648,7 +6648,7 @@
 
 @example
 ModifyClosure =
-        (aditi_bottom_up pred(@var{DB1}::aditi_ui, @var{OldArg1}::out, @var{OldArg2}::out, @dots{},
+        (aditi_bottom_up pred(@var{DB1}::aditi_mui, @var{OldArg1}::out, @var{OldArg2}::out, @dots{},
                 @var{_DB}::unused, @var{NewArg1}::out, @var{NewArg2}::out, @dots{}) is nondet :-
                 @var{PredName}(@var{DB1}, @var{OldArg1}, @var{OldArg2}, @dots{}),
                 @var{Goal}
@@ -6668,11 +6668,11 @@
 
 @example
 DeleteClosure =
-        (aditi_bottom_up pred(DB1::aditi_ui, X1::out, Y1::out) is nondet :-
+        (aditi_bottom_up pred(DB1::aditi_mui, X1::out, Y1::out) is nondet :-
                 Closure(DB1, X1, Y1, _, _)
         ),
 InsertClosure =
-        (aditi_bottom_up pred(DB1::aditi_ui, X2::out, Y2::out) is nondet :-
+        (aditi_bottom_up pred(DB1::aditi_mui, X2::out, Y2::out) is nondet :-
                 Closure(DB1, _, _, X2, Y2)
         ),
 aditi_bulk_delete(pred p/3, DeleteClosure, DB0, DB1),
@@ -6702,7 +6702,7 @@
                 ), DB0, DB).
 
 bulk_modify_example_3(DB0, DB) :-
-        ModifyP = (aditi_bottom_up pred(DB1::aditi_ui, X::in, Y0::in,
+        ModifyP = (aditi_bottom_up pred(DB1::aditi_mui, X::in, Y0::in,
                         _::unused, X::out, Y::out) is nondet :-
                     p(DB1, X, Y0),
                     X > 2,
@@ -6712,7 +6712,7 @@
         aditi_bulk_modify(pred p/3, ModifyP, DB0, DB).
 
 bulk_modify_example_4(DB0, DB) :-
-        ModifyF = (aditi_bottom_up pred(DB1::aditi_ui, X::in, Y0::in,
+        ModifyF = (aditi_bottom_up pred(DB1::aditi_mui, X::in, Y0::in,
                         _::unused, X::out, Y::out) is nondet :-
                     f(DB1, X) = Y0,
                     X > 2, X < 5, Y = Y0 + 1
@@ -6733,7 +6733,7 @@
 
 The type of @samp{ModifyP} is
 @w{@samp{aditi_bottom_up pred(aditi__state, int, int, aditi__state, int, int)}}.
-Its inst is @w{@samp{pred(aditi_ui, out, out, unused, out, out) is nondet}},
+Its inst is @w{@samp{pred(aditi_mui, out, out, unused, out, out) is nondet}},
 as for a normal lambda expression.
 
 @node Aditi glossary
Index: extras/aditi/LIMITATIONS
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/aditi/LIMITATIONS,v
retrieving revision 1.1
diff -u -u -r1.1 LIMITATIONS
--- extras/aditi/LIMITATIONS	1998/12/07 01:32:37	1.1
+++ extras/aditi/LIMITATIONS	2000/05/05 04:04:39
@@ -2,7 +2,7 @@
 The Aditi system is not yet publicly available.
 
 * aditi__state arguments must currently be ground, not unique. This will
-  be fixed when the alias branch is merged in. Use the mode aditi_ui
+  be fixed when the alias branch is merged in. Use the mode aditi_mui
   defined in aditi.m instead for now.
 
 * Only calls to local, non-recursive Mercury predicates are allowed
Index: extras/aditi/aditi.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/aditi/aditi.m,v
retrieving revision 1.7
diff -u -u -r1.7 aditi.m
--- extras/aditi/aditi.m	2000/04/17 04:53:38	1.7
+++ extras/aditi/aditi.m	2000/05/05 04:04:40
@@ -59,7 +59,7 @@
 :- inst aditi_unique = ground.
 :- mode aditi_di :: in(aditi_unique).
 :- mode aditi_uo :: out(aditi_unique).
-:- mode aditi_ui :: in(aditi_unique).
+:- mode aditi_mui :: in(aditi_unique).
 
 :- type aditi__result(T)
 	--->	ok(T)
Index: tests/invalid/aditi.m
===================================================================
RCS file: /home/mercury1/repository/tests/invalid/aditi.m,v
retrieving revision 1.1
diff -u -u -r1.1 aditi.m
--- tests/invalid/aditi.m	1999/07/13 08:55:06	1.1
+++ tests/invalid/aditi.m	2000/05/05 04:10:24
@@ -7,7 +7,7 @@
 :- type aditi__state.
 :- mode aditi_di :: in.
 :- mode aditi_uo :: out.
-:- mode aditi_ui :: in.
+:- mode aditi_mui :: in.
 
 :- implementation.
 
Index: tests/invalid/aditi_errors.m
===================================================================
RCS file: /home/mercury1/repository/tests/invalid/aditi_errors.m,v
retrieving revision 1.1
diff -u -u -r1.1 aditi_errors.m
--- tests/invalid/aditi_errors.m	2000/05/05 02:42:19	1.1
+++ tests/invalid/aditi_errors.m	2000/05/05 04:10:25
@@ -5,7 +5,7 @@
 :- import_module aditi.
 :- import_module list, map.
 
-:- pred aditi_error(aditi__state::aditi_ui,
+:- pred aditi_error(aditi__state::aditi_mui,
 		int::out, int::out, foo::out, map(int, int)::in) is nondet.
 :- pragma aditi(aditi_error/5).
 
@@ -15,10 +15,10 @@
 :- type existq
 	--->	some [T] existq(T).
 
-:- pred p(aditi__state::aditi_ui, int::out, int::out) is nondet.
+:- pred p(aditi__state::aditi_mui, int::out, int::out) is nondet.
 :- pragma base_relation(p/3).
 
-:- pred q(aditi__state::aditi_ui, list(T)::in, existq::out,
+:- pred q(aditi__state::aditi_mui, list(T)::in, existq::out,
 		list(T)::out(list_skel(free))) is nondet.
 :- pragma base_relation(q/4).
 
@@ -27,7 +27,7 @@
 	% are not yet implemented.
 
 :- pred tclass(aditi__state, int, list(int)) <= class(int).
-:- mode tclass(aditi_ui, out, out) is nondet.
+:- mode tclass(aditi_mui, out, out) is nondet.
 :- pragma base_relation(tclass/4).
 
 :- typeclass class(T) where [].
Index: tests/invalid/aditi_state_errors.err_exp
===================================================================
RCS file: /home/mercury1/repository/tests/invalid/aditi_state_errors.err_exp,v
retrieving revision 1.1
diff -u -u -r1.1 aditi_state_errors.err_exp
--- tests/invalid/aditi_state_errors.err_exp	2000/05/05 02:42:19	1.1
+++ tests/invalid/aditi_state_errors.err_exp	2000/05/05 04:10:25
@@ -4,5 +4,5 @@
 aditi_state_errors.m:010: Error: `:- pragma base_relation' declaration for
 aditi_state_errors.m:010:   predicate `aditi_state_errors:output_aditi_state/3'
 aditi_state_errors.m:010:   without an `aditi__state' argument with mode
-aditi_state_errors.m:010:   `aditi_ui'.
+aditi_state_errors.m:010:   `aditi_mui'.
 For more information, try recompiling with `-E'.
Index: tests/invalid/aditi_update_errors.m
===================================================================
RCS file: /home/mercury1/repository/tests/invalid/aditi_update_errors.m,v
retrieving revision 1.2
diff -u -u -r1.2 aditi_update_errors.m
--- tests/invalid/aditi_update_errors.m	2000/04/14 08:39:16	1.2
+++ tests/invalid/aditi_update_errors.m	2000/05/05 04:10:26
@@ -17,13 +17,13 @@
 
 :- import_module int.
 
-:- pred p(aditi__state::aditi_ui, int::out, int::out) is nondet.
+:- pred p(aditi__state::aditi_mui, int::out, int::out) is nondet.
 :- pragma base_relation(p/3).
 
-:- func q(aditi__state::aditi_ui, int::out) = (int::out) is nondet.
+:- func q(aditi__state::aditi_mui, int::out) = (int::out) is nondet.
 :- pragma base_relation(q/2).
 
-:- pred anc(aditi__state::aditi_ui, int::out, int::out) is nondet.
+:- pred anc(aditi__state::aditi_mui, int::out, int::out) is nondet.
 :- pragma aditi(anc/3).
 
 aditi_update_syntax -->
@@ -37,7 +37,7 @@
 	aditi_delete(q(_, X) = _Y, _),
 
 	{ InsertP =
-	    (aditi_bottom_up pred(_::aditi_ui, A1::out, A2::out) is nondet :-
+	    (aditi_bottom_up pred(_::aditi_mui, A1::out, A2::out) is nondet :-
 		( A1 = 1, A2 = 2
 		; A1 = 2, A2 = 3
 		)
@@ -54,7 +54,7 @@
 	),
 
 	{ InsertQ =
-	    (aditi_bottom_up func(_::aditi_ui, A1::out)
+	    (aditi_bottom_up func(_::aditi_mui, A1::out)
 	    		= (A2::out) is nondet :-
 		( A1 = 1, A2 = 2
 		; A1 = 2, A2 = 3
@@ -68,7 +68,7 @@
 	aditi_bulk_modify(q(_, _X0) ==> _Y0),
 
 	{ ModifyP =
-	    (aditi_bottom_up pred(DB::aditi_ui, X0::out, Y0::out,
+	    (aditi_bottom_up pred(DB::aditi_mui, X0::out, Y0::out,
 			_::unused, X::out, Y::out) is nondet :-
 		p(DB, X0, Y0),
 		X0 = 1,
@@ -79,7 +79,7 @@
 	aditi_bulk_modify(pred p/3, ModifyP, foo),
 
 	{ ModifyQ =
-	    (aditi_bottom_up pred(DB::aditi_ui, X0::out, Y0::out,
+	    (aditi_bottom_up pred(DB::aditi_mui, X0::out, Y0::out,
 			_::unused, X::out, Y::out) is nondet :-
 		q(DB, X) = Y,
 		X0 = 1,
@@ -105,7 +105,7 @@
 	aditi_bulk_delete(p(_, X) :- X < 2.0),
 	aditi_bulk_delete(q(_) = Y :- Y < 2),
 
-	{ DeleteP = (aditi_bottom_up pred(_::aditi_ui, 2::out) is nondet) },
+	{ DeleteP = (aditi_bottom_up pred(_::aditi_mui, 2::out) is nondet) },
 	aditi_bulk_delete(pred p/3, DeleteP),
 	aditi_bulk_delete(pred q/2, DeleteP),
 
@@ -116,12 +116,12 @@
 	aditi_bulk_delete(func p/3, DeleteQ),
 
 	{ DeleteQ2 =
-		(func(_::aditi_ui) = (2::out) is nondet)
+		(func(_::aditi_mui) = (2::out) is nondet)
 	},
 	aditi_bulk_delete(func q/2, DeleteQ2),
 
 	{ InsertP =
-	    (aditi_bottom_up pred(_::aditi_ui, A1::out, A2::out) is nondet :-
+	    (aditi_bottom_up pred(_::aditi_mui, A1::out, A2::out) is nondet :-
 		( A1 = 1, A2 = 2.0
 		; A1 = 2, A2 = 3.0
 		)
@@ -131,7 +131,7 @@
 	aditi_bulk_delete(pred q/2, InsertP),
 
 	{ InsertP2 =
-	    (pred(_::aditi_ui, A1::out, A2::out) is nondet :-
+	    (pred(_::aditi_mui, A1::out, A2::out) is nondet :-
 		( A1 = 1, A2 = 2.0
 		; A1 = 2, A2 = 3.0
 		)
@@ -139,7 +139,7 @@
 	aditi_bulk_insert(pred p/3, InsertP2),
 
 	{ InsertQ =
-	    (aditi_bottom_up func(_::aditi_ui, A1::out)
+	    (aditi_bottom_up func(_::aditi_mui, A1::out)
 	    		= (A2::out) is nondet :-
 		( A1 = 1, A2 = 2
 		; A1 = 2, A2 = 3
@@ -154,7 +154,7 @@
 	aditi_bulk_modify(q(_, X0, Y0) ==> q(_, X0 + 1, Y0 + 1)),
 
 	{ ModifyP =
-	    (aditi_bottom_up pred(DB::aditi_ui, X0::out, Y0::out,
+	    (aditi_bottom_up pred(DB::aditi_mui, X0::out, Y0::out,
 			_::unused, X::out, Y::out) is nondet :-
 		p(DB, X0, Y0),
 		X0 = 1.0,
@@ -164,7 +164,7 @@
 	aditi_bulk_modify(pred p/3, ModifyP),
 
 	{ ModifyQ =
-	    (aditi_bottom_up func(DB::aditi_ui, X0::out, Y0::out,
+	    (aditi_bottom_up func(DB::aditi_mui, X0::out, Y0::out,
 			_::unused, X::out) = (Y::out) is nondet :-
 		X0 = 1,
 		X = X0 + Y0,
Index: tests/invalid/aditi_update_mode_errors.err_exp
===================================================================
RCS file: /home/mercury1/repository/tests/invalid/aditi_update_mode_errors.err_exp,v
retrieving revision 1.3
diff -u -u -r1.3 aditi_update_mode_errors.err_exp
--- tests/invalid/aditi_update_mode_errors.err_exp	2000/04/14 08:39:16	1.3
+++ tests/invalid/aditi_update_mode_errors.err_exp	2000/05/05 04:10:27
@@ -76,7 +76,7 @@
 aditi_update_mode_errors.m:125:   in argument 2 of `aditi_bulk_modify' of function `q/2':
 aditi_update_mode_errors.m:125:   mode error: variable `ModifyQ' has instantiatedness `/* unique */(pred((free -> free), (ground -> ground), (ground -> ground), (free -> free), (ground -> ground), (ground -> ground)) is nondet)',
 aditi_update_mode_errors.m:125:   expected instantiatedness was `(pred(in, out, out, unused, out, out) is nondet)'.
-aditi_update_mode_errors.m:047: In clause for `anc((aditi:aditi_ui), out, out)':
+aditi_update_mode_errors.m:047: In clause for `anc((aditi:aditi_mui), out, out)':
 aditi_update_mode_errors.m:047:   in argument 2 of clause head:
 aditi_update_mode_errors.m:047:   mode error in unification of `HeadVar__2' and `X'.
 aditi_update_mode_errors.m:047:   Variable `HeadVar__2' has instantiatedness `free',
Index: tests/invalid/aditi_update_mode_errors.m
===================================================================
RCS file: /home/mercury1/repository/tests/invalid/aditi_update_mode_errors.m,v
retrieving revision 1.2
diff -u -u -r1.2 aditi_update_mode_errors.m
--- tests/invalid/aditi_update_mode_errors.m	2000/04/14 08:39:17	1.2
+++ tests/invalid/aditi_update_mode_errors.m	2000/05/05 04:10:27
@@ -35,13 +35,13 @@
 
 :- import_module int.
 
-:- pred p(aditi__state::aditi_ui, int::out, int::out) is nondet.
+:- pred p(aditi__state::aditi_mui, int::out, int::out) is nondet.
 :- pragma base_relation(p/3).
 
-:- func q(aditi__state::aditi_ui, int::out) = (int::out) is nondet.
+:- func q(aditi__state::aditi_mui, int::out) = (int::out) is nondet.
 :- pragma base_relation(q/2).
 
-:- pred anc(aditi__state::aditi_ui, int::out, int::out) is nondet.
+:- pred anc(aditi__state::aditi_mui, int::out, int::out) is nondet.
 :- pragma aditi(anc/3).
 
 anc(_, X, X).
@@ -79,7 +79,7 @@
 
 aditi_update_modes8 -->
 	{ InsertP =
-	    (aditi_bottom_up pred(_::aditi_ui, A1::in, A2::out) is nondet :-
+	    (aditi_bottom_up pred(_::aditi_mui, A1::in, A2::out) is nondet :-
 		( A1 = 1, A2 = 2
 		; A1 = 2, A2 = 3
 		)
@@ -89,7 +89,7 @@
 
 aditi_update_modes9 -->
 	{ InsertQ =
-	    (aditi_bottom_up func(_::aditi_ui, A1::in)
+	    (aditi_bottom_up func(_::aditi_mui, A1::in)
 	    		= (A2::out) is nondet :-
 		( A1 = 1, A2 = 2
 		; A1 = 2, A2 = 3
Index: tests/valid/aditi.m
===================================================================
RCS file: /home/mercury1/repository/tests/valid/aditi.m,v
retrieving revision 1.1
diff -u -u -r1.1 aditi.m
--- tests/valid/aditi.m	1999/07/13 08:55:27	1.1
+++ tests/valid/aditi.m	2000/05/05 04:11:34
@@ -7,7 +7,7 @@
 :- type aditi__state.
 :- mode aditi_di :: in.
 :- mode aditi_uo :: out.
-:- mode aditi_ui :: in.
+:- mode aditi_mui :: in.
 
 :- implementation.
 
Index: tests/valid/aditi_update.m
===================================================================
RCS file: /home/mercury1/repository/tests/valid/aditi_update.m,v
retrieving revision 1.2
diff -u -u -r1.2 aditi_update.m
--- tests/valid/aditi_update.m	2000/04/14 08:39:24	1.2
+++ tests/valid/aditi_update.m	2000/05/05 04:11:34
@@ -9,10 +9,10 @@
 
 :- import_module int.
 
-:- pred p(aditi__state::aditi_ui, int::out, int::out) is nondet.
+:- pred p(aditi__state::aditi_mui, int::out, int::out) is nondet.
 :- pragma base_relation(p/3).
 
-:- func q(aditi__state::aditi_ui, int::out) = (int::out) is nondet.
+:- func q(aditi__state::aditi_mui, int::out) = (int::out) is nondet.
 :- pragma base_relation(q/2).
 
 aditi_update -->
@@ -33,7 +33,7 @@
 	aditi_bulk_delete(q(_, X) = _ :- X < 2),
 
 	{ InsertP =
-	    (aditi_bottom_up pred(_::aditi_ui, A1::out, A2::out) is nondet :-
+	    (aditi_bottom_up pred(_::aditi_mui, A1::out, A2::out) is nondet :-
 		( A1 = 1, A2 = 2
 		; A1 = 2, A2 = 3
 		)
@@ -50,7 +50,7 @@
 	),
 
 	{ InsertQ =
-	    (aditi_bottom_up func(_::aditi_ui, A1::out)
+	    (aditi_bottom_up func(_::aditi_mui, A1::out)
 	    		= (A2::out) is nondet :-
 		( A1 = 1, A2 = 2
 		; A1 = 2, A2 = 3
@@ -75,7 +75,7 @@
 	aditi_bulk_modify((q(_, X0) = Y0) ==> (q(_, X0 + 1) = (Y0 + 1))),
 
 	{ ModifyP1 =
-	    (aditi_bottom_up pred(DB::aditi_ui, X0::out, Y0::out,
+	    (aditi_bottom_up pred(DB::aditi_mui, X0::out, Y0::out,
 			_::unused, X::out, Y::out) is nondet :-
 		p(DB, X0, Y0),
 		X0 = 1,
@@ -85,7 +85,7 @@
 	aditi_bulk_modify(pred p/3, ModifyP1),
 
 	{ ModifyQ =
-	    (aditi_bottom_up pred(DB::aditi_ui, X0::out, Y0::out,
+	    (aditi_bottom_up pred(DB::aditi_mui, X0::out, Y0::out,
 			_::unused, X::out, Y::out) is nondet :-
 		q(DB, X0) = Y0,
 		X0 = 1,
Index: tests/valid/base_relation.m
===================================================================
RCS file: /home/mercury1/repository/tests/valid/base_relation.m,v
retrieving revision 1.1
diff -u -u -r1.1 base_relation.m
--- tests/valid/base_relation.m	2000/02/21 01:41:41	1.1
+++ tests/valid/base_relation.m	2000/05/05 04:11:36
@@ -5,8 +5,8 @@
 :- import_module aditi.
 
 :- pred base(aditi__state, int, int).
-:- mode base(aditi_ui, in, out) is nondet.
-:- mode base(aditi_ui, out, out) is nondet.
+:- mode base(aditi_mui, in, out) is nondet.
+:- mode base(aditi_mui, out, out) is nondet.
 
 :- pragma base_relation(base/3).
 
Index: tests/valid/base_relation2.m
===================================================================
RCS file: /home/mercury1/repository/tests/valid/base_relation2.m,v
retrieving revision 1.1
diff -u -u -r1.1 base_relation2.m
--- tests/valid/base_relation2.m	2000/04/06 05:33:33	1.1
+++ tests/valid/base_relation2.m	2000/05/05 04:11:36
@@ -13,7 +13,7 @@
 
 :- import_module aditi.
 
-:- pred query(aditi__state::aditi_ui, int::in, int::out) is nondet.
+:- pred query(aditi__state::aditi_mui, int::in, int::out) is nondet.
 
 %-----------------------------------------------------------------------------%
 :- implementation.
Index: tests/valid/context_anc.m
===================================================================
RCS file: /home/mercury1/repository/tests/valid/context_anc.m,v
retrieving revision 1.2
diff -u -u -r1.2 context_anc.m
--- tests/valid/context_anc.m	2000/02/25 04:07:34	1.2
+++ tests/valid/context_anc.m	2000/05/05 04:11:37
@@ -6,19 +6,19 @@
 :- import_module aditi.
 
 :- pred left_anc(aditi:state, int).
-:- mode left_anc(aditi:aditi_ui, out) is nondet.
+:- mode left_anc(aditi:aditi_mui, out) is nondet.
 :- pragma aditi(left_anc/2).
 
 :- pred right_anc(aditi:state, int, int).
-:- mode right_anc(aditi:aditi_ui, in, out) is nondet.
+:- mode right_anc(aditi:aditi_mui, in, out) is nondet.
 :- pragma aditi(right_anc/3).
 
 :- pred multi_anc(aditi:state, int, int).
-:- mode multi_anc(aditi:aditi_ui, in, out) is nondet.
+:- mode multi_anc(aditi:aditi_mui, in, out) is nondet.
 :- pragma aditi(multi_anc/3).
 
 :- pred chain(aditi:state, int, int).
-:- mode chain(aditi:aditi_ui, out, out) is nondet.
+:- mode chain(aditi:aditi_mui, out, out) is nondet.
 :- pragma base_relation(chain/3).
 
 :- implementation.
@@ -28,7 +28,7 @@
 	left_anc(DB, 2, Y).
 
 :- pred left_anc(aditi:state, int, int).
-:- mode left_anc(aditi:aditi_ui, in, out) is nondet.
+:- mode left_anc(aditi:aditi_mui, in, out) is nondet.
 :- pragma aditi(left_anc/3).
 :- pragma aditi_no_memo(left_anc/3).
 :- pragma context(left_anc/3).
Index: tests/valid/ite_to_disj.m
===================================================================
RCS file: /home/mercury1/repository/tests/valid/ite_to_disj.m,v
retrieving revision 1.1
diff -u -u -r1.1 ite_to_disj.m
--- tests/valid/ite_to_disj.m	1999/08/04 02:45:41	1.1
+++ tests/valid/ite_to_disj.m	2000/05/05 04:11:48
@@ -8,7 +8,7 @@
 :- import_module aditi.
 
 :- pred footy_current_name(aditi:state, string, string).
-:- mode footy_current_name(aditi:aditi_ui, in, out) is multi.
+:- mode footy_current_name(aditi:aditi_mui, in, out) is multi.
 :- pragma aditi(footy_current_name/3).
 
 :- implementation.
@@ -24,7 +24,7 @@
 
 % footy_alias(DB, OldTeamName, NewTeamName)
 :- pred footy_alias(aditi:state, string, string).
-:- mode footy_alias(aditi:aditi_ui, out, out) is nondet.
+:- mode footy_alias(aditi:aditi_mui, out, out) is nondet.
 :- pragma base_relation(footy_alias/3).
 :- pragma aditi_index(footy_alias/3,unique_B_tree,[2]).
 % relation name: $USER/footy/footy_alias__3
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------



More information about the developers mailing list