[m-rev.] trivial diff: resolve ambiguous overloading

Julien Fischer juliensf at cs.mu.OZ.AU
Tue Sep 7 02:44:52 AEST 2004


Estimated hours taken: 0.5
Branches: main

compiler/inst_util.m:
	Resolve ambiguous overloadings that were causing
	the nightly builds to fail on jupiter.

Julien.

Index: inst_util.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/inst_util.m,v
retrieving revision 1.30
diff -u -r1.30 inst_util.m
--- inst_util.m	5 Sep 2004 23:52:11 -0000	1.30
+++ inst_util.m	6 Sep 2004 16:39:06 -0000
@@ -1810,22 +1810,22 @@
 %-----------------------------------------------------------------------------%

 inst_contains_unconstrained_var(bound(_Uniqueness, BoundInsts)) :-
-	member(BoundInst, BoundInsts),
+	list.member(BoundInst, BoundInsts),
 	BoundInst = functor(_ConsId, ArgInsts),
-	member(ArgInst, ArgInsts),
+	list.member(ArgInst, ArgInsts),
 	inst_contains_unconstrained_var(ArgInst).

 inst_contains_unconstrained_var(ground(_Uniqueness, GroundInstInfo)) :-
 	GroundInstInfo = higher_order(PredInstInfo),
 	PredInstInfo = pred_inst_info(_PredOrFunc, Modes, _Detism),
-	member(Mode, Modes),
+	list.member(Mode, Modes),
 	(
 		Mode = (Inst -> _)
 	;
 		Mode = (_ -> Inst)
 	;
 		Mode = user_defined_mode(_SymName, Insts),
-		member(Inst, Insts)
+		list.member(Inst, Insts)
 	),
 	inst_contains_unconstrained_var(Inst).

@@ -1834,7 +1834,7 @@
 inst_contains_unconstrained_var(defined_inst(InstName)) :-
 	(
 		InstName = user_inst(_, Insts),
-		member(Inst, Insts),
+		list.member(Inst, Insts),
 		inst_contains_unconstrained_var(Inst)
 	;
 		InstName = merge_inst(Inst, _),
@@ -1866,7 +1866,7 @@
 	).

 inst_contains_unconstrained_var(abstract_inst(_SymName, Insts)) :-
-	member(Inst, Insts),
+	list.member(Inst, Insts),
 	inst_contains_unconstrained_var(Inst).

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