[m-rev.] diff: replace deprecated mode and inst syntax

[Julien Fischer]

Estimated hours taken: 0.1
Branches: main, release

browser/declarative_execution.m:
browser/declarative_tree.m:
compiler/mode_constraints.m:
compiler/prog_io.m:
compiler/rl_file.pp:
	Replace deprecated mode and inst syntax.

Julien.

Index: browser/declarative_execution.m
===================================================================
RCS file: /home/mercury1/repository/mercury/browser/declarative_execution.m,v
retrieving revision 1.36
diff -u -r1.36 declarative_execution.m
--- browser/declarative_execution.m	1 Feb 2005 07:11:26 -0000	1.36
+++ browser/declarative_execution.m	7 Feb 2005 11:13:30 -0000
@@ -305,7 +305,7 @@
 :- pred neg_node_from_id(S::in, R::in, trace_node(R)::out(trace_node_neg))
 	is det <= annotated_trace(S, R).

-:- inst trace_node_first_disj = bound(first_disj(ground, ground)).
+:- inst trace_node_first_disj ---> first_disj(ground, ground).

 :- pred first_disj_node_from_id(S::in, R::in,
 	trace_node(R)::out(trace_node_first_disj)) is det
Index: browser/declarative_tree.m
===================================================================
RCS file: /home/mercury1/repository/mercury/browser/declarative_tree.m,v
retrieving revision 1.19
diff -u -r1.19 declarative_tree.m
--- browser/declarative_tree.m	1 Feb 2005 07:11:27 -0000	1.19
+++ browser/declarative_tree.m	7 Feb 2005 11:14:09 -0000
@@ -1622,10 +1622,10 @@
 	SeqNo = CallNode ^ call_seq,
 	CallPreceding = CallNode ^ call_preceding.

-:- inst edt_return_node =
-		bound(	exit(ground, ground, ground, ground, ground, ground)
-		;	fail(ground, ground, ground, ground)
-		;	excp(ground, ground, ground, ground, ground)).
+:- inst edt_return_node
+	--->	exit(ground, ground, ground, ground, ground, ground)
+	;	fail(ground, ground, ground, ground)
+	;	excp(ground, ground, ground, ground, ground).

 :- pred det_edt_return_node_from_id(S::in, R::in,
 	trace_node(R)::out(edt_return_node)) is det <= annotated_trace(S, R).
Index: compiler/mode_constraints.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/mode_constraints.m,v
retrieving revision 1.4
diff -u -r1.4 mode_constraints.m
--- compiler/mode_constraints.m	19 Jan 2005 03:10:46 -0000	1.4
+++ compiler/mode_constraints.m	7 Feb 2005 11:16:17 -0000
@@ -758,7 +758,7 @@

 :- type constrain_var == pred(prog_var, mode_constraint, mode_constraint,
 	mode_constraint_info, mode_constraint_info).
-:- inst constrain_var = (pred(in, in, out, in, out) is det).
+:- inst constrain_var == (pred(in, in, out, in, out) is det).

 :- pred mode_constraints__process_inst(module_info::in, inst_graph::in,
 	constrain_var::in(constrain_var), constrain_var::in(constrain_var),
Index: compiler/prog_io.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/prog_io.m,v
retrieving revision 1.235
diff -u -r1.235 prog_io.m
--- compiler/prog_io.m	1 Feb 2005 07:11:36 -0000	1.235
+++ compiler/prog_io.m	7 Feb 2005 11:12:29 -0000
@@ -3498,7 +3498,7 @@
 %-----------------------------------------------------------------------------%

 :- type maker(T1, T2) == pred(T1, T2).
-:- mode maker         :: pred(in, out) is det.
+:- mode maker == (pred(in, out) is det).

 :- pred parse_symlist_decl(parser(T)::parser, maker(list(T), sym_list)::maker,
 	maker(sym_list, module_defn)::maker,
Index: compiler/rl_file.pp
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/rl_file.pp,v
retrieving revision 1.8
diff -u -r1.8 rl_file.pp
--- compiler/rl_file.pp	2 Feb 2005 04:28:43 -0000	1.8
+++ compiler/rl_file.pp	7 Feb 2005 11:17:00 -0000
@@ -16,7 +16,7 @@
 :- import_module io.

 :- type byte_writer == (pred(int, io__state, io__state)).
-:- mode byte_writer :: (pred(in, di, uo) is det).
+:- mode byte_writer == (pred(in, di, uo) is det).

 	% Given a predicate to write a byte, write an RL file
 	% to the current binary output stream, returning the number
@@ -123,7 +123,7 @@
 :- type rl_state == pair(int, io__state).

 :- type writer == (pred(int, rl_state, rl_state)).
-:- mode writer :: (pred(in, di, uo) is det).
+:- mode writer == (pred(in, di, uo) is det).

 	%
 	% Write the binary representation of the file to <module>.rlo.

--------------------------------------------------------------------------
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
--------------------------------------------------------------------------