[m-rev.] diff: replace deprecated mode and inst syntax in test suite
Julien Fischer
juliensf at cs.mu.OZ.AU
Tue Aug 24 21:39:33 AEST 2004
Estimated hours taken: 2
Branches: main
Replace deprecated mode and inst syntax in most
of the test suite.
TODO:
Alter valid/mode_syntax.m when we start
issuing warnings about the deprecated syntax.
tests/*/*.m:
Replace deprecated mode and inst syntax.
Replace some uses of `:' as the module
qualifier.
Julien.
Index: dppd/run.m
===================================================================
RCS file: /home/mercury1/repository/tests/dppd/run.m,v
retrieving revision 1.3
diff -u -r1.3 run.m
--- dppd/run.m 10 Jan 2003 14:00:07 -0000 1.3
+++ dppd/run.m 24 Aug 2004 07:51:33 -0000
@@ -97,7 +97,7 @@
:- mode benchmark_list = list_skel_out(benchmark).
:- type benchmark == pair(string, pred).
-:- inst benchmark = pair(ground, (pred) is semidet).
+:- inst benchmark == pair(ground, (pred) is semidet).
use(_) :- semidet_succeed.
Index: dppd/transpose_impl.m
===================================================================
RCS file: /home/mercury1/repository/tests/dppd/transpose_impl.m,v
retrieving revision 1.2
diff -u -r1.2 transpose_impl.m
--- dppd/transpose_impl.m 25 Sep 2001 09:37:12 -0000 1.2
+++ dppd/transpose_impl.m 24 Aug 2004 07:54:32 -0000
@@ -9,8 +9,8 @@
:- mode transpose(in(matrix9), out) is nondet.
:- mode transpose(in, out) is nondet.
-:- inst matrix9 = bound([list9, ground, ground]).
-:- inst list9 = bound([ground, ground, ground, ground, ground, ground, ground,
+:- inst matrix9 == bound([list9, ground, ground]).
+:- inst list9 == bound([ground, ground, ground, ground, ground, ground, ground,
ground, ground]).
Index: general/prune_switch.m
===================================================================
RCS file: /home/mercury1/repository/tests/general/prune_switch.m,v
retrieving revision 1.2
diff -u -r1.2 prune_switch.m
--- general/prune_switch.m 15 Aug 1997 07:37:21 -0000 1.2
+++ general/prune_switch.m 24 Aug 2004 07:52:47 -0000
@@ -32,7 +32,7 @@
create_switch_var(Var) :-
create_switch_var_2(Var).
-:- pred create_switch_var_2(t :: (free->bound(f(ground);g(ground)))) is det.
+:- pred create_switch_var_2(t :: (free >> bound(f(ground);g(ground)))) is det.
:- pragma no_inline(create_switch_var_2/1).
create_switch_var_2(f(1)).
Index: hard_coded/agg.m
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/agg.m,v
retrieving revision 1.3
diff -u -r1.3 agg.m
--- hard_coded/agg.m 8 Jul 2004 05:56:38 -0000 1.3
+++ hard_coded/agg.m 24 Aug 2004 05:51:07 -0000
@@ -8,9 +8,9 @@
:- import_module std_util.
:- type agg_func(T, S) ---> agg(S, func(S, T) = S).
-:- inst agg_mode = bound(agg(ground, func(in, in) = out is det)).
-:- mode agg_in :: agg_mode -> agg_mode.
-:- mode agg_out :: free -> agg_mode.
+:- inst agg_mode == bound(agg(ground, func(in, in) = out is det)).
+:- mode agg_in == agg_mode >> agg_mode.
+:- mode agg_out == free >> agg_mode.
:- pred aggregate(pred(T), agg_func(T, S), S).
:- mode aggregate(pred(out) is multi, agg_in, out) is det.
Index: hard_coded/bidirectional.m
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/bidirectional.m,v
retrieving revision 1.2
diff -u -r1.2 bidirectional.m
--- hard_coded/bidirectional.m 3 Jul 1997 08:47:08 -0000 1.2
+++ hard_coded/bidirectional.m 24 Aug 2004 08:50:01 -0000
@@ -16,8 +16,8 @@
format_list_of_int(write, List).
:- type rw ---> read ; write.
-:- mode read :: in(bound(read)).
-:- mode write :: in(bound(write)).
+:- mode read == in(bound(read)).
+:- mode write == in(bound(write)).
:- pred format_list_of_int(rw, list(int), io__state, io__state).
:- mode format_list_of_int(write, in, di, uo) is det.
Index: hard_coded/contravariance_bug.m
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/contravariance_bug.m,v
retrieving revision 1.1
diff -u -r1.1 contravariance_bug.m
--- hard_coded/contravariance_bug.m 28 Jul 2003 21:50:45 -0000 1.1
+++ hard_coded/contravariance_bug.m 24 Aug 2004 08:54:09 -0000
@@ -19,12 +19,12 @@
:- inst list ---> [ground|list] ; [].
:- pred p(intlist, intlist).
-:- mode p((list -> nonempty), (free -> nonempty)) is semidet.
+:- mode p((list >> nonempty), (free >> nonempty)) is semidet.
p([X], [X]).
p([X,Y|Zs], [Y,X|Zs]).
:- pred q(pred(intlist, intlist)).
-:- mode q(pred((nonempty -> nonempty), (free -> list)) is semidet) is semidet.
+:- mode q(pred((nonempty >> nonempty), (free >> list)) is semidet) is semidet.
q(P) :- P([1], L), L \= [].
Index: hard_coded/contravariance_poly.m
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/contravariance_poly.m,v
retrieving revision 1.1
diff -u -r1.1 contravariance_poly.m
--- hard_coded/contravariance_poly.m 28 Jul 2003 21:50:45 -0000 1.1
+++ hard_coded/contravariance_poly.m 24 Aug 2004 08:54:48 -0000
@@ -21,13 +21,13 @@
:- inst bit == bound(0 ; 1).
:- pred p(intlist, intlist).
-:- mode p((list(I) -> nonempty(I)), (free -> nonempty(I))) is semidet.
+:- mode p((list(I) >> nonempty(I)), (free >> nonempty(I))) is semidet.
p([X], [X]).
p([X,Y|Zs], [Y,X|Zs]).
:- pred q(pred(intlist, intlist)).
-:- mode q(pred((nonempty(bit) -> nonempty(bit)), (free -> list(bit)))
+:- mode q(pred((nonempty(bit) >> nonempty(bit)), (free >> list(bit)))
is semidet) is semidet.
q(P) :- P([1], L), L \= [].
Index: hard_coded/curry.m
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/curry.m,v
retrieving revision 1.2
diff -u -r1.2 curry.m
--- hard_coded/curry.m 8 Jul 1999 10:03:54 -0000 1.2
+++ hard_coded/curry.m 24 Aug 2004 10:13:24 -0000
@@ -18,7 +18,7 @@
:- func my_append(list(T), list(T)) = list(T).
my_append(A, B) = C :- list__append(A, B, C).
-:- inst func1 = (func(in) = out is det).
+:- inst func1 == (func(in) = out is det).
:- func curry2(func(T1, T2) = T3) = (func(T1) = (func(T2) = T3)).
:- mode curry2(func(in, in) = out is det) =
Index: hard_coded/curry2_test.m
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/curry2_test.m,v
retrieving revision 1.1
diff -u -r1.1 curry2_test.m
--- hard_coded/curry2_test.m 9 Dec 1996 14:31:49 -0000 1.1
+++ hard_coded/curry2_test.m 24 Aug 2004 09:01:35 -0000
@@ -5,17 +5,17 @@
:- interface.
:- pred n(pred(int, T2, T3), pred(T2, T3)).
-:- mode n(pred(in, in, out) is det, free->pred(in, out) is det) is det.
+:- mode n(pred(in, in, out) is det, free >> (pred(in, out) is det)) is det.
:- pred p(pred(int, T2, T3), pred(T2, T3)).
-:- mode p(pred(in, in, out) is det, free->pred(in, out) is det) is det.
+:- mode p(pred(in, in, out) is det, free >> (pred(in, out) is det)) is det.
:- pred q(pred(int, T2, T3), pred(T2, T3)).
-:- mode q(pred(in, in, out) is det, free->pred(in, out) is det) is semidet.
+:- mode q(pred(in, in, out) is det, free >> (pred(in, out) is det)) is semidet.
:- pred r(pred(int, int, int), int, pred(int, int)).
-:- mode r(pred(in, in, out) is det, in, free->pred(in, out) is det) is det.
+:- mode r(pred(in, in, out) is det, in, free >> (pred(in, out) is det)) is det.
:- pred s(pred(int, int, int), int, pred(int, int)).
-:- mode s(pred(in, out, in) is det, in, free->pred(out, in) is det) is det.
+:- mode s(pred(in, out, in) is det, in, free >> (pred(out, in) is det)) is det.
:- pred t(pred(int, int, int), int, pred(int, int)).
-:- mode t(pred(in, out, in) is det, in, free->pred(in, out) is det) is det.
+:- mode t(pred(in, out, in) is det, in, free >> (pred(in, out) is det)) is det.
:- implementation.
Index: hard_coded/free_free_mode.m
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/free_free_mode.m,v
retrieving revision 1.2
diff -u -r1.2 free_free_mode.m
--- hard_coded/free_free_mode.m 23 Dec 1996 04:58:19 -0000 1.2
+++ hard_coded/free_free_mode.m 24 Aug 2004 08:40:35 -0000
@@ -4,8 +4,8 @@
:- inst f == free.
-:- pred foo(int::(f->f)) is det.
-:- pred bar(int::(f->f)) is det.
+:- pred foo(int::(f>>f)) is det.
+:- pred bar(int::(f>>f)) is det.
:- pred main(io__state::di, io__state::uo) is det.
Index: hard_coded/func_test.m
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/func_test.m,v
retrieving revision 1.2
diff -u -r1.2 func_test.m
--- hard_coded/func_test.m 26 May 2003 09:01:07 -0000 1.2
+++ hard_coded/func_test.m 24 Aug 2004 08:56:05 -0000
@@ -19,7 +19,7 @@
io__write_int(g(f(test2))),
io__write_string("\n").
-:- mode test2 :: out.
+:- mode test2 == out.
:- func f(int) = int.
:- mode f(in) = test2 is det.
Index: hard_coded/ho_func_reg.m
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/ho_func_reg.m,v
retrieving revision 1.2
diff -u -r1.2 ho_func_reg.m
--- hard_coded/ho_func_reg.m 24 Jul 1997 01:02:16 -0000 1.2
+++ hard_coded/ho_func_reg.m 24 Aug 2004 05:50:06 -0000
@@ -18,7 +18,7 @@
:- pred main(io__state::di, io__state::uo) is det.
:- type bar == (func(int) = int).
-:- inst bar = (func(in) = out is det).
+:- inst bar == (func(in) = out is det).
:- func foo(bar, int) = int.
:- mode foo(in(bar), in) = out is det.
Index: hard_coded/ho_solns.m
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/ho_solns.m,v
retrieving revision 1.3
diff -u -r1.3 ho_solns.m
--- hard_coded/ho_solns.m 28 Nov 2002 16:33:44 -0000 1.3
+++ hard_coded/ho_solns.m 24 Aug 2004 05:54:09 -0000
@@ -28,7 +28,7 @@
use_list(List).
:- type mypred == (pred(int, int, int)).
-:- inst mypred = (pred(in, in, out) is det).
+:- inst mypred == (pred(in, in, out) is det).
:- pred convert_list(list(T), list(T)).
:- mode convert_list(in, out(list_skel(mypred))) is det.
Index: hard_coded/ho_univ_to_type.m
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/ho_univ_to_type.m,v
retrieving revision 1.3
diff -u -r1.3 ho_univ_to_type.m
--- hard_coded/ho_univ_to_type.m 28 Nov 2002 16:33:44 -0000 1.3
+++ hard_coded/ho_univ_to_type.m 24 Aug 2004 05:54:37 -0000
@@ -25,7 +25,7 @@
:- type mypred == (pred(int, int, int)).
:- type mypred2 == (pred(float, int, int)).
-:- inst mypred = (pred(in, in, out) is det).
+:- inst mypred == (pred(in, in, out) is det).
main -->
{ foo(Pred0) },
Index: hard_coded/imported_no_tag.m
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/imported_no_tag.m,v
retrieving revision 1.1
diff -u -r1.1 imported_no_tag.m
--- hard_coded/imported_no_tag.m 8 Apr 1997 02:28:31 -0000 1.1
+++ hard_coded/imported_no_tag.m 24 Aug 2004 05:53:08 -0000
@@ -3,9 +3,9 @@
:- interface.
:- type printable(T) ---> class(pred(T)).
-:- inst printable_data = bound(class(pred(in) is semidet)).
-:- mode printable :: in(printable_data).
-:- mode new_printable :: out(printable_data).
+:- inst printable_data == bound(class(pred(in) is semidet)).
+:- mode printable == in(printable_data).
+:- mode new_printable == out(printable_data).
:- pred pwrite(printable(T)::printable, T::in) is semidet.
Index: hard_coded/quantifier.m
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/quantifier.m,v
retrieving revision 1.2
diff -u -r1.2 quantifier.m
--- hard_coded/quantifier.m 14 Jul 2004 05:39:12 -0000 1.2
+++ hard_coded/quantifier.m 24 Aug 2004 08:41:32 -0000
@@ -18,7 +18,7 @@
:- pred foo(pred(int)).
-:- mode foo(free->pred(out) is det) is det.
+:- mode foo(free >> (pred(out) is det)) is det.
foo(sum([1,2,3])).
Index: hard_coded/quantifier2.m
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/quantifier2.m,v
retrieving revision 1.2
diff -u -r1.2 quantifier2.m
--- hard_coded/quantifier2.m 14 Jul 2004 05:39:12 -0000 1.2
+++ hard_coded/quantifier2.m 24 Aug 2004 10:16:01 -0000
@@ -18,7 +18,7 @@
:- pred foo(pred(int, int)).
-:- mode foo(free->pred(in, out) is semidet) is det.
+:- mode foo(free >> (pred(in, out) is semidet)) is det.
foo(testsum([1,2,3])).
Index: hard_coded/reorder_di.m
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/reorder_di.m,v
retrieving revision 1.1
diff -u -r1.1 reorder_di.m
--- hard_coded/reorder_di.m 21 Jan 1998 06:11:20 -0000 1.1
+++ hard_coded/reorder_di.m 24 Aug 2004 08:49:19 -0000
@@ -27,10 +27,10 @@
; X = 2, Str = "baz\n"
}.
-:- pred q(int::(free -> bound(1 ; 2))) is det.
+:- pred q(int::(free >> bound(1 ; 2))) is det.
q(1).
-:- pred r(int::(free -> bound(1 ; 2))) is det.
+:- pred r(int::(free >> bound(1 ; 2))) is det.
r(1).
Index: hard_coded/tim_qual1.m
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/tim_qual1.m,v
retrieving revision 1.3
diff -u -r1.3 tim_qual1.m
--- hard_coded/tim_qual1.m 1 Dec 2003 15:56:08 -0000 1.3
+++ hard_coded/tim_qual1.m 24 Aug 2004 08:48:39 -0000
@@ -12,11 +12,11 @@
:- pred main(io__state::di, io__state::uo) is det.
-:- pred test(tim_qual2:test_type::tim_qual3:test_mode) is det.
+:- pred test(tim_qual2__test_type::tim_qual3__test_mode) is det.
-:- pred test2(tim_qual2:test_type::test_mode2) is det.
+:- pred test2(tim_qual2__test_type::test_mode2) is det.
-:- mode test_mode2 :: tim_qual2:inst1 -> tim_qual3:inst1.
+:- mode test_mode2 == tim_qual2__inst1 >> tim_qual3__inst1.
:- implementation.
Index: hard_coded/tim_qual2.m
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/tim_qual2.m,v
retrieving revision 1.1
diff -u -r1.1 tim_qual2.m
--- hard_coded/tim_qual2.m 11 Jun 1996 06:32:55 -0000 1.1
+++ hard_coded/tim_qual2.m 24 Aug 2004 05:51:48 -0000
@@ -5,6 +5,6 @@
:- type test_type
---> ok.
-:- mode test_mode :: in.
+:- mode test_mode == in.
-:- inst inst1 = free.
+:- inst inst1 == free.
Index: hard_coded/tim_qual3.m
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/tim_qual3.m,v
retrieving revision 1.1
diff -u -r1.1 tim_qual3.m
--- hard_coded/tim_qual3.m 11 Jun 1996 06:32:56 -0000 1.1
+++ hard_coded/tim_qual3.m 24 Aug 2004 05:52:06 -0000
@@ -5,6 +5,6 @@
:- type test_type
---> error.
-:- mode test_mode :: out.
+:- mode test_mode == out.
-:- inst inst1 = ground.
+:- inst inst1 == ground.
Index: invalid/aditi.m
===================================================================
RCS file: /home/mercury1/repository/tests/invalid/aditi.m,v
retrieving revision 1.3
diff -u -r1.3 aditi.m
--- invalid/aditi.m 23 Aug 2003 14:01:53 -0000 1.3
+++ invalid/aditi.m 24 Aug 2004 10:19:35 -0000
@@ -5,10 +5,10 @@
:- interface.
:- type aditi__state.
-:- mode aditi_di :: in.
-:- mode aditi_uo :: out.
-:- mode aditi_mui :: in.
-:- mode aditi_ui :: in.
+:- mode aditi_di == in.
+:- mode aditi_uo == out.
+:- mode aditi_mui == in.
+:- mode aditi_ui == in.
:- implementation.
Index: invalid/any_mode.m
===================================================================
RCS file: /home/mercury1/repository/tests/invalid/any_mode.m,v
retrieving revision 1.2
diff -u -r1.2 any_mode.m
--- invalid/any_mode.m 25 Jul 2003 02:27:36 -0000 1.2
+++ invalid/any_mode.m 24 Aug 2004 09:03:54 -0000
@@ -2,7 +2,7 @@
:- interface.
-:- mode p(any -> ground).
+:- mode p(any >> ground).
p(X) :- q(X).
:- mode q(in).
Index: invalid/duplicate_modes.m
===================================================================
RCS file: /home/mercury1/repository/tests/invalid/duplicate_modes.m,v
retrieving revision 1.2
diff -u -r1.2 duplicate_modes.m
--- invalid/duplicate_modes.m 17 Jan 2003 03:58:25 -0000 1.2
+++ invalid/duplicate_modes.m 24 Aug 2004 09:04:44 -0000
@@ -5,7 +5,7 @@
p.
:- pred q(int, int).
-:- mode q(ground -> ground, free -> ground) is det.
+:- mode q(ground >> ground, free >> ground) is det.
:- mode q(in, out) is det.
:- mode q(in, out) is det.
q(X, X).
Index: invalid/inst_list_dup.m
===================================================================
RCS file: /home/mercury1/repository/tests/invalid/inst_list_dup.m,v
retrieving revision 1.2
diff -u -r1.2 inst_list_dup.m
--- invalid/inst_list_dup.m 27 Dec 1999 11:07:33 -0000 1.2
+++ invalid/inst_list_dup.m 24 Aug 2004 09:05:05 -0000
@@ -1,3 +1,3 @@
:- module inst_list_dup.
:- interface.
-:- inst inst1 = bound(ground-unique ; ground-ground).
+:- inst inst1 == bound(ground-unique ; ground-ground).
Index: invalid/merge_ground_any.m
===================================================================
RCS file: /home/mercury1/repository/tests/invalid/merge_ground_any.m,v
retrieving revision 1.1
diff -u -r1.1 merge_ground_any.m
--- invalid/merge_ground_any.m 13 Sep 2001 23:18:17 -0000 1.1
+++ invalid/merge_ground_any.m 24 Aug 2004 09:05:24 -0000
@@ -2,7 +2,7 @@
:- interface.
:- type hpair(A,B) ---> (A-B) ; (A+B).
-:- inst hpair(A,B) = bound(A-B).
+:- inst hpair(A,B) == bound(A-B).
:- pred pass(hpair(A,B),hpair(A,B),hpair(A,B)).
:- mode pass(in,in(hpair(ground,any)),out(hpair(ground,any))) is multi.
Index: invalid/modes_erroneous.m
===================================================================
RCS file: /home/mercury1/repository/tests/invalid/modes_erroneous.m,v
retrieving revision 1.1
diff -u -r1.1 modes_erroneous.m
--- invalid/modes_erroneous.m 11 Jul 1995 13:12:04 -0000 1.1
+++ invalid/modes_erroneous.m 24 Aug 2004 09:06:10 -0000
@@ -3,7 +3,7 @@
:- type foo.
:- pred p(foo, foo).
-:- mode p(ground -> ground, free -> ground).
+:- mode p(ground >> ground, free >> ground).
p(_, X) :-
p(_, X).
Index: invalid/polymorphic_unification.m
===================================================================
RCS file: /home/mercury1/repository/tests/invalid/polymorphic_unification.m,v
retrieving revision 1.1
diff -u -r1.1 polymorphic_unification.m
--- invalid/polymorphic_unification.m 9 Nov 1998 05:28:40 -0000 1.1
+++ invalid/polymorphic_unification.m 24 Aug 2004 09:06:35 -0000
@@ -14,7 +14,7 @@
:- import_module list.
:- pred p(T, T).
-:- mode p(in, list_skel->dead).
+:- mode p(in, list_skel >> dead).
p(X, X).
Index: invalid/spurious_mode_error.m
===================================================================
RCS file: /home/mercury1/repository/tests/invalid/spurious_mode_error.m,v
retrieving revision 1.1
diff -u -r1.1 spurious_mode_error.m
--- invalid/spurious_mode_error.m 29 Oct 1998 03:55:28 -0000 1.1
+++ invalid/spurious_mode_error.m 24 Aug 2004 06:02:18 -0000
@@ -16,7 +16,7 @@
; c(pred(float, T, T))
.
-:- inst opt = bound((
+:- inst opt == bound((
a(pred(in, in, out) is det)
; b(pred(in, in, out) is det)
; c(pred(in, in, out) is det)
@@ -29,9 +29,9 @@
maybe(pred(float, T, T))
).
-:- inst m(I) = bound((no ; yes(I))).
+:- inst m(I) == bound((no ; yes(I))).
-:- inst f = bound(f(
+:- inst f == bound(f(
m(pred(in, in, out) is det),
m(pred(in, in, out) is det),
m(pred(in, in, out) is det)
Index: invalid/undef_type.m
===================================================================
RCS file: /home/mercury1/repository/tests/invalid/undef_type.m,v
retrieving revision 1.3
diff -u -r1.3 undef_type.m
--- invalid/undef_type.m 10 Sep 1999 09:42:58 -0000 1.3
+++ invalid/undef_type.m 24 Aug 2004 05:59:29 -0000
@@ -2,7 +2,7 @@
:- type t1 ---> a ; b ; c ; d(undef1).
-:- inst x = bound(a ; b ; c).
+:- inst x == bound(a ; b ; c).
:- pred p.
p.
Index: invalid/with_type.m
===================================================================
RCS file: /home/mercury1/repository/tests/invalid/with_type.m,v
retrieving revision 1.1
diff -u -r1.1 with_type.m
--- invalid/with_type.m 15 Mar 2002 07:32:22 -0000 1.1
+++ invalid/with_type.m 24 Aug 2004 05:58:58 -0000
@@ -5,15 +5,15 @@
:- import_module list.
:- type map_pred(T, U) == pred(T, U).
-:- inst map_pred = (pred(in, out) is det).
+:- inst map_pred == (pred(in, out) is det).
:- type foldl_pred(T, U) == pred(T, U, U).
-:- inst foldl_pred = (pred(in, in, out) is det).
+:- inst foldl_pred == (pred(in, in, out) is det).
:- pred with_type_1(T, list(_)) `with_type` int.
:- mode with_type_1(in, in) `with_inst` ground.
:- type map_func(T, U) == (func(T) = U).
-:- inst map_func = (func(in) = out is det).
+:- inst map_func == (func(in) = out is det).
:- func with_type_2(T, list(_)) `with_type` map_pred(string, string).
:- mode with_type_2(in, in) `with_inst` map_func.
Index: recompilation/unchanged_with_type_nr_2.m.1
===================================================================
RCS file: /home/mercury1/repository/tests/recompilation/unchanged_with_type_nr_2.m.1,v
retrieving revision 1.2
diff -u -r1.2 unchanged_with_type_nr_2.m.1
--- recompilation/unchanged_with_type_nr_2.m.1 9 Apr 2002 09:00:33 -0000 1.2
+++ recompilation/unchanged_with_type_nr_2.m.1 24 Aug 2004 10:42:02 -0000
@@ -5,14 +5,14 @@
:- import_module list.
:- type map_pred(T, U) == pred(T, U).
-:- inst map_pred = (pred(in, out) is det).
+:- inst map_pred == (pred(in, out) is det).
:- pred with_type_1(T, list(_)) `with_type` map_pred(string, string).
:- mode with_type_1(in, in) `with_inst` map_pred.
:- pragma type_spec(with_type_1/4, T = list(_)).
:- type map_func(T, U) == (func(T) = U).
-:- inst map_func = (func(in) = out is det).
+:- inst map_func == (func(in) = out is det).
:- func with_type_2(T, list(_)) `with_type` map_func(string, string).
:- mode with_type_2(in, in) `with_inst` map_func.
Index: recompilation/unchanged_with_type_nr_2.m.2
===================================================================
RCS file: /home/mercury1/repository/tests/recompilation/unchanged_with_type_nr_2.m.2,v
retrieving revision 1.2
diff -u -r1.2 unchanged_with_type_nr_2.m.2
--- recompilation/unchanged_with_type_nr_2.m.2 9 Apr 2002 09:00:33 -0000 1.2
+++ recompilation/unchanged_with_type_nr_2.m.2 24 Aug 2004 10:42:25 -0000
@@ -5,14 +5,14 @@
:- import_module list.
:- type map_pred(T, U) == pred(T, U).
-:- inst map_pred = (pred(in, out) is det).
+:- inst map_pred == (pred(in, out) is det).
:- pred with_type_1(T, list(_)) `with_type` map_pred(string, string).
:- mode with_type_1(in, in) `with_inst` map_pred.
:- pragma type_spec(with_type_1/4, T = list(_)).
:- type map_func(T, U) == (func(T) = U).
-:- inst map_func = (func(in) = out is det).
+:- inst map_func == (func(in) = out is det).
:- func with_type_2(T, list(_)) `with_type` map_func(string, string).
:- mode with_type_2(in, in) `with_inst` map_func.
Index: recompilation/with_type_re_2.m.1
===================================================================
RCS file: /home/mercury1/repository/tests/recompilation/with_type_re_2.m.1,v
retrieving revision 1.1
diff -u -r1.1 with_type_re_2.m.1
--- recompilation/with_type_re_2.m.1 15 Mar 2002 07:32:26 -0000 1.1
+++ recompilation/with_type_re_2.m.1 24 Aug 2004 10:41:08 -0000
@@ -5,13 +5,13 @@
:- import_module list.
:- type map_pred(T, U) == pred(T, U).
-:- inst map_pred = (pred(in, out) is det).
+:- inst map_pred == (pred(in, out) is det).
:- pred with_type_1(T, list(_)) `with_type` map_pred(string, string).
:- mode with_type_1(in, in) `with_inst` map_pred.
:- type map_func(T, U) == (func(T) = U).
-:- inst map_func = (func(in) = out is det).
+:- inst map_func == (func(in) = out is det).
:- func with_type_2(T, list(int)) `with_type` map_func(string, string).
:- mode with_type_2(in, in) `with_inst` map_func.
Index: recompilation/with_type_re_2.m.2
===================================================================
RCS file: /home/mercury1/repository/tests/recompilation/with_type_re_2.m.2,v
retrieving revision 1.1
diff -u -r1.1 with_type_re_2.m.2
--- recompilation/with_type_re_2.m.2 15 Mar 2002 07:32:27 -0000 1.1
+++ recompilation/with_type_re_2.m.2 24 Aug 2004 10:41:26 -0000
@@ -5,13 +5,13 @@
:- import_module list.
:- type map_pred(T, U) == pred(T, T, U).
-:- inst map_pred = (pred(in, in, out) is det).
+:- inst map_pred == (pred(in, in, out) is det).
:- pred with_type_1(T, list(_)) `with_type` map_pred(string, string).
:- mode with_type_1(in, in) `with_inst` map_pred.
:- type map_func(T, U) == (func(T) = U).
-:- inst map_func = (func(in) = out is det).
+:- inst map_func == (func(in) = out is det).
:- func with_type_2(T, list(_)) `with_type` map_func(string, string).
:- mode with_type_2(in, in) `with_inst` map_func.
Index: valid/aditi.m
===================================================================
RCS file: /home/mercury1/repository/tests/valid/aditi.m,v
retrieving revision 1.3
diff -u -r1.3 aditi.m
--- valid/aditi.m 23 Aug 2003 14:01:58 -0000 1.3
+++ valid/aditi.m 24 Aug 2004 09:02:35 -0000
@@ -5,10 +5,10 @@
:- interface.
:- type aditi__state.
-:- mode aditi_di :: in.
-:- mode aditi_uo :: out.
-:- mode aditi_mui :: in.
-:- mode aditi_ui :: in.
+:- mode aditi_di == in.
+:- mode aditi_uo == out.
+:- mode aditi_mui == in.
+:- mode aditi_ui == in.
:- implementation.
Index: valid/aditi_query.m
===================================================================
RCS file: /home/mercury1/repository/tests/valid/aditi_query.m,v
retrieving revision 1.1
diff -u -r1.1 aditi_query.m
--- valid/aditi_query.m 19 Aug 2000 12:31:53 -0000 1.1
+++ valid/aditi_query.m 24 Aug 2004 10:35:38 -0000
@@ -3,7 +3,7 @@
:- interface.
:- import_module aditi.
-:- mode query(aditi:aditi_mui ,out) is nondet.
+:- mode query(aditi__aditi_mui, out) is nondet.
:- pragma aditi(query/2).
:- implementation.
Index: valid/agc_ho_pred.m
===================================================================
RCS file: /home/mercury1/repository/tests/valid/agc_ho_pred.m,v
retrieving revision 1.2
diff -u -r1.2 agc_ho_pred.m
--- valid/agc_ho_pred.m 14 Jul 2004 05:39:13 -0000 1.2
+++ valid/agc_ho_pred.m 24 Aug 2004 07:48:21 -0000
@@ -39,7 +39,7 @@
maybe_option_table(OptionType))
).
-:- inst option_ops =
+:- inst option_ops ==
bound((
option_ops(
pred(in, out) is semidet, % short_option
Index: valid/any_inst_merge.m
===================================================================
RCS file: /home/mercury1/repository/tests/valid/any_inst_merge.m,v
retrieving revision 1.1
diff -u -r1.1 any_inst_merge.m
--- valid/any_inst_merge.m 30 Mar 2001 06:04:27 -0000 1.1
+++ valid/any_inst_merge.m 24 Aug 2004 07:48:43 -0000
@@ -7,7 +7,7 @@
:- type hpair(A,B) ---> (A-B).
-:- inst hpair(A,B) = bound(A-B).
+:- inst hpair(A,B) == bound(A-B).
:- pred pass(hpair(A,B),hpair(A,B),hpair(A,B)).
:- mode pass(in,in(hpair(ground,any)),out(any)) is multi.
Index: valid/context_anc.m
===================================================================
RCS file: /home/mercury1/repository/tests/valid/context_anc.m,v
retrieving revision 1.3
diff -u -r1.3 context_anc.m
--- valid/context_anc.m 5 May 2000 06:08:21 -0000 1.3
+++ valid/context_anc.m 24 Aug 2004 07:47:28 -0000
@@ -5,20 +5,20 @@
:- import_module aditi.
-:- pred left_anc(aditi:state, int).
-:- mode left_anc(aditi:aditi_mui, out) is nondet.
+:- pred left_anc(aditi__state, int).
+:- 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_mui, in, out) is nondet.
+:- pred right_anc(aditi__state, int, int).
+:- 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_mui, in, out) is nondet.
+:- pred multi_anc(aditi__state, int, int).
+:- 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_mui, out, out) is nondet.
+:- pred chain(aditi__state, int, int).
+:- mode chain(aditi__aditi_mui, out, out) is nondet.
:- pragma base_relation(chain/3).
:- implementation.
@@ -27,8 +27,8 @@
left_anc(DB, Y) :-
left_anc(DB, 2, Y).
-:- pred left_anc(aditi:state, int, int).
-:- mode left_anc(aditi:aditi_mui, in, out) is nondet.
+:- pred left_anc(aditi__state, int, int).
+:- 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: valid/deforest_loop.m
===================================================================
RCS file: /home/mercury1/repository/tests/valid/deforest_loop.m,v
retrieving revision 1.2
diff -u -r1.2 deforest_loop.m
--- valid/deforest_loop.m 1 Dec 2003 15:56:14 -0000 1.2
+++ valid/deforest_loop.m 24 Aug 2004 08:45:36 -0000
@@ -45,7 +45,7 @@
:- type ray == int.
:- type object == pred(int, int).
-:- inst object = (pred(in, out) is nondet).
+:- inst object == (pred(in, out) is nondet).
:- implementation.
Index: valid/ho_func_call.m
===================================================================
RCS file: /home/mercury1/repository/tests/valid/ho_func_call.m,v
retrieving revision 1.1
diff -u -r1.1 ho_func_call.m
--- valid/ho_func_call.m 1 Sep 1997 14:09:03 -0000 1.1
+++ valid/ho_func_call.m 24 Aug 2004 09:08:19 -0000
@@ -27,15 +27,15 @@
; closure(func(io__state) = iostocks)
.
-:- inst iostocks = unique(ios(unique, stocks)).
-:- inst stocks =
+:- inst iostocks == unique(ios(unique, stocks)).
+:- inst stocks ==
bound( []
; [ground | stocks]
; closure(func(di) = is_out is det)
).
-:- mode is_in :: di(iostocks).
-:- mode is_out :: out(iostocks).
+:- mode is_in == di(iostocks).
+:- mode is_out == out(iostocks).
:- func putStocks(iostocks) = io__state.
:- mode putStocks(is_in) = uo is det.
Index: valid/intermod_lambda2.m
===================================================================
RCS file: /home/mercury1/repository/tests/valid/intermod_lambda2.m,v
retrieving revision 1.6
diff -u -r1.6 intermod_lambda2.m
--- valid/intermod_lambda2.m 14 Jul 2004 05:39:13 -0000 1.6
+++ valid/intermod_lambda2.m 24 Aug 2004 10:22:04 -0000
@@ -15,7 +15,7 @@
:- implementation.
-:- mode in2 :: in.
+:- mode in2 == in.
sol(Generator, List) :-
Test = ((pred) is semidet),
Index: valid/intermod_test.m
===================================================================
RCS file: /home/mercury1/repository/tests/valid/intermod_test.m,v
retrieving revision 1.4
diff -u -r1.4 intermod_test.m
--- valid/intermod_test.m 14 Jul 2004 05:39:13 -0000 1.4
+++ valid/intermod_test.m 24 Aug 2004 10:10:39 -0000
@@ -22,7 +22,7 @@
local(Lambda, X),
intermod_test2__baz(X).
-:- mode int_mode :: out.
+:- mode int_mode == out.
:- pred local(pred(int), int).
:- mode local(pred(int_mode) is det, out) is det.
Index: valid/intermod_test2.m
===================================================================
RCS file: /home/mercury1/repository/tests/valid/intermod_test2.m,v
retrieving revision 1.4
diff -u -r1.4 intermod_test2.m
--- valid/intermod_test2.m 3 Dec 1999 12:55:22 -0000 1.4
+++ valid/intermod_test2.m 24 Aug 2004 10:23:01 -0000
@@ -17,8 +17,8 @@
% in the `.opt' file.
:- type int1 ---> int1(int).
-:- mode int_mode :: int_mode1.
-:- mode int_mode1 :: in.
+:- mode int_mode == int_mode1.
+:- mode int_mode1 == in.
baz(X) :- T = f(1), bar(T, X).
@@ -36,5 +36,5 @@
% -- bromage 20 Nov 1997
:- pragma inline(plusone/1).
-plusone(Int0) = Int :- Int is Int0 + 1.
+plusone(Int0) = Int :- Int = Int0 + 1.
Index: valid/intermod_typeclass.m
===================================================================
RCS file: /home/mercury1/repository/tests/valid/intermod_typeclass.m,v
retrieving revision 1.2
diff -u -r1.2 intermod_typeclass.m
--- valid/intermod_typeclass.m 14 Jul 2004 05:39:13 -0000 1.2
+++ valid/intermod_typeclass.m 24 Aug 2004 10:11:25 -0000
@@ -22,7 +22,7 @@
local(Lambda, X),
intermod_typeclass2__baz(X).
-:- mode int_mode :: out.
+:- mode int_mode == out.
:- pred local(pred(int), int).
:- mode local(pred(int_mode) is det, out) is det.
Index: valid/intermod_typeclass2.m
===================================================================
RCS file: /home/mercury1/repository/tests/valid/intermod_typeclass2.m,v
retrieving revision 1.1
diff -u -r1.1 intermod_typeclass2.m
--- valid/intermod_typeclass2.m 3 Dec 1999 12:55:23 -0000 1.1
+++ valid/intermod_typeclass2.m 24 Aug 2004 10:12:22 -0000
@@ -18,8 +18,8 @@
% in the `.opt' file.
:- type int1 ---> int1(int).
-:- mode int_mode :: int_mode1.
-:- mode int_mode1 :: in.
+:- mode int_mode == int_mode1.
+:- mode int_mode1 == in.
baz(X) :- T = f(1), bar(T, X), method(X).
@@ -37,7 +37,7 @@
% -- bromage 20 Nov 1997
:- pragma inline(plusone/1).
-plusone(Int0) = Int :- Int is Int0 + 1.
+plusone(Int0) = Int :- Int = Int0 + 1.
:- typeclass class(T) where [
pred method(T::in) is semidet
Index: valid/ite_to_disj.m
===================================================================
RCS file: /home/mercury1/repository/tests/valid/ite_to_disj.m,v
retrieving revision 1.2
diff -u -r1.2 ite_to_disj.m
--- valid/ite_to_disj.m 5 May 2000 06:08:23 -0000 1.2
+++ valid/ite_to_disj.m 24 Aug 2004 07:46:22 -0000
@@ -7,8 +7,8 @@
:- import_module aditi.
-:- pred footy_current_name(aditi:state, string, string).
-:- mode footy_current_name(aditi:aditi_mui, in, out) is multi.
+:- pred footy_current_name(aditi__state, string, string).
+:- mode footy_current_name(aditi__aditi_mui, in, out) is multi.
:- pragma aditi(footy_current_name/3).
:- implementation.
@@ -23,8 +23,8 @@
).
% footy_alias(DB, OldTeamName, NewTeamName)
-:- pred footy_alias(aditi:state, string, string).
-:- mode footy_alias(aditi:aditi_mui, out, out) is nondet.
+:- pred footy_alias(aditi__state, string, string).
+:- 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
Index: valid/lambda_inference.m
===================================================================
RCS file: /home/mercury1/repository/tests/valid/lambda_inference.m,v
retrieving revision 1.2
diff -u -r1.2 lambda_inference.m
--- valid/lambda_inference.m 14 Jul 2004 05:39:13 -0000 1.2
+++ valid/lambda_inference.m 24 Aug 2004 10:09:53 -0000
@@ -5,7 +5,7 @@
:- pred ok(int, pred(int)).
-:- mode ok(in, free -> pred(in) is semidet) is semidet.
+:- mode ok(in, free >> (pred(in) is semidet)) is semidet.
:- implementation.
Index: valid/lambda_switch.m
===================================================================
RCS file: /home/mercury1/repository/tests/valid/lambda_switch.m,v
retrieving revision 1.1
diff -u -r1.1 lambda_switch.m
--- valid/lambda_switch.m 10 Dec 1996 01:20:07 -0000 1.1
+++ valid/lambda_switch.m 24 Aug 2004 08:47:03 -0000
@@ -9,9 +9,9 @@
:- import_module std_util.
:- type agg_func(T, S) ---> agg(S, func(S, T) = S).
-:- inst agg_mode = bound(agg(ground, func(in, in) = out is det)).
-:- mode agg_in :: agg_mode -> agg_mode.
-:- mode agg_out :: free -> agg_mode.
+:- inst agg_mode == bound(agg(ground, func(in, in) = out is det)).
+:- mode agg_in == agg_mode >> agg_mode.
+:- mode agg_out == free >> agg_mode.
:- func min(func(T) = int) = agg_func(T, maybe(int)).
:- mode min(func(in) = out is det) = agg_out is det.
Index: valid/merge_ground_any.m
===================================================================
RCS file: /home/mercury1/repository/tests/valid/merge_ground_any.m,v
retrieving revision 1.1
diff -u -r1.1 merge_ground_any.m
--- valid/merge_ground_any.m 13 Sep 2001 23:18:17 -0000 1.1
+++ valid/merge_ground_any.m 24 Aug 2004 08:46:28 -0000
@@ -2,7 +2,7 @@
:- interface.
:- type hpair(A,B) ---> (A-B).
-:- inst hpair(A,B) = bound(A-B).
+:- inst hpair(A,B) == bound(A-B).
:- pred pass(hpair(A,B),hpair(A,B),hpair(A,B)).
:- mode pass(in,in(hpair(ground,any)),out(hpair(ground,any))) is multi.
Index: valid/module_e.m
===================================================================
RCS file: /home/mercury1/repository/tests/valid/module_e.m,v
retrieving revision 1.1
diff -u -r1.1 module_e.m
--- valid/module_e.m 7 Feb 1998 09:55:52 -0000 1.1
+++ valid/module_e.m 24 Aug 2004 08:38:32 -0000
@@ -3,4 +3,4 @@
:- interface.
:- use_module io.
-:- mode e :: out.
+:- mode e == out.
Index: valid/mostly_uniq_bug.m
===================================================================
RCS file: /home/mercury1/repository/tests/valid/mostly_uniq_bug.m,v
retrieving revision 1.1
diff -u -r1.1 mostly_uniq_bug.m
--- valid/mostly_uniq_bug.m 22 Feb 2000 08:59:59 -0000 1.1
+++ valid/mostly_uniq_bug.m 24 Aug 2004 08:38:12 -0000
@@ -11,8 +11,8 @@
:- type foo ---> f(int).
-:- pred p(foo::mostly_unique -> dead) is det.
-:- pred q(foo::unique(f(unique(42))) -> dead) is det.
+:- pred p(foo::mostly_unique >> dead) is det.
+:- pred q(foo::unique(f(unique(42))) >> dead) is det.
p(_).
q(X) :- p(X).
Index: valid/same_length_2.m
===================================================================
RCS file: /home/mercury1/repository/tests/valid/same_length_2.m,v
retrieving revision 1.2
diff -u -r1.2 same_length_2.m
--- valid/same_length_2.m 14 May 1996 13:49:56 -0000 1.2
+++ valid/same_length_2.m 24 Aug 2004 08:37:28 -0000
@@ -2,9 +2,9 @@
:- interface.
:- import_module list.
-:- mode my_input_list_skel :: list_skel -> list_skel.
-:- mode my_output_list_skel :: free -> list_skel.
-:- mode my_list_skel_output :: list_skel -> ground.
+:- mode my_input_list_skel == list_skel >> list_skel.
+:- mode my_output_list_skel == free >> list_skel.
+:- mode my_list_skel_output == list_skel >> ground.
:- pred p is semidet.
Index: valid/soln_context.m
===================================================================
RCS file: /home/mercury1/repository/tests/valid/soln_context.m,v
retrieving revision 1.1
diff -u -r1.1 soln_context.m
--- valid/soln_context.m 22 Jul 1996 09:04:08 -0000 1.1
+++ valid/soln_context.m 24 Aug 2004 08:36:31 -0000
@@ -13,7 +13,7 @@
q :- p1(X, Y), p2(X, Y).
:- pred p1(int, int).
-:- mode p1(free -> free, out) is nondet.
+:- mode p1(free >> free, out) is nondet.
:- pred p2(int, int).
:- mode p2(out, in) is nondet.
Index: valid/subtype_switch.m
===================================================================
RCS file: /home/mercury1/repository/tests/valid/subtype_switch.m,v
retrieving revision 1.5
diff -u -r1.5 subtype_switch.m
--- valid/subtype_switch.m 7 Nov 2002 12:52:59 -0000 1.5
+++ valid/subtype_switch.m 24 Aug 2004 06:04:33 -0000
@@ -20,7 +20,7 @@
; fill_color(string)
.
-:- inst widget = bound((
+:- inst widget == bound((
text(ground)
; width(ground)
; height(ground)
Index: valid/two_way_unif.m
===================================================================
RCS file: /home/mercury1/repository/tests/valid/two_way_unif.m,v
retrieving revision 1.1
diff -u -r1.1 two_way_unif.m
--- valid/two_way_unif.m 5 Nov 1996 04:53:16 -0000 1.1
+++ valid/two_way_unif.m 24 Aug 2004 08:36:05 -0000
@@ -16,7 +16,7 @@
:- implementation.
:- pred p(face_vertex).
-:- mode p(mostly_unique(vertex(ground, free)) -> bound(vertex(ground, ground))) is semidet.
+:- mode p(mostly_unique(vertex(ground, free)) >> bound(vertex(ground, ground))) is semidet.
p(vertex(I, V)) :-
I = 0,
Index: warnings/inf_recursion_lambda.m
===================================================================
RCS file: /home/mercury1/repository/tests/warnings/inf_recursion_lambda.m,v
retrieving revision 1.1
diff -u -r1.1 inf_recursion_lambda.m
--- warnings/inf_recursion_lambda.m 28 Jul 1997 04:31:31 -0000 1.1
+++ warnings/inf_recursion_lambda.m 24 Aug 2004 07:44:38 -0000
@@ -7,7 +7,7 @@
:- interface.
:- type closure ---> closure((func) = closure).
-:- inst closure = bound(closure((func) = out(closure) is det)).
+:- inst closure == bound(closure((func) = out(closure) is det)).
:- func return_me = (closure :: out(closure)) is det.
--------------------------------------------------------------------------
mercury-reviews mailing list
post: mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------
More information about the reviews
mailing list