[m-rev.] Fix solver type issues in clpr interface

Ralph Becket rafe at cs.mu.OZ.AU
Tue Mar 1 17:31:02 AEDT 2005


Estimated hours taken: 0.25
Branches: main, version-0_12-branch

extras/clpr/cfloat.m:
	Update the solver type syntax.

extras/clpr/samples/tranny.m:
	Remove the list/1 inst which is now provided by list.m.

Index: extras/clpr/cfloat.m
===================================================================
RCS file: /home/mercury1/repository/clpr/cfloat.m,v
retrieving revision 1.36
diff -u -r1.36 cfloat.m
--- extras/clpr/cfloat.m	25 Jul 2003 02:27:34 -0000	1.36
+++ extras/clpr/cfloat.m	1 Mar 2005 06:24:04 -0000
@@ -349,9 +349,13 @@
 
 %----------------------------------------------------------------------------%
 
-:- solver type cfloat ---> cfloat(int)
-	where equality is cfloat__eq.
 	% The cfloat is stored as an int (the CLP(R) solver_id for it).
+:- solver type cfloat
+	where	representation	is int,
+		initialisation	is cfloat__cfloat_init_any,
+		ground		is ground,
+		any		is ground,
+		equality	is cfloat__eq.
 
 :- pragma c_header_code("
 
Index: extras/clpr/samples/tranny.m
===================================================================
RCS file: /home/mercury1/repository/clpr/samples/tranny.m,v
retrieving revision 1.5
diff -u -r1.5 tranny.m
--- extras/clpr/samples/tranny.m	26 Feb 2000 08:44:36 -0000	1.5
+++ extras/clpr/samples/tranny.m	1 Mar 2005 06:26:06 -0000
@@ -21,8 +21,6 @@
 :- import_module cfloat, float_cfloat, cfloat_float, float.
 :- import_module require, std_util, int, list, dump.
 
-:- inst list(I) = list_skel(I).
-
 :- type circuit		==	list(pair(component, list(node))).
 
 :- inst circuit		==	list(pair(component, ground)).
--------------------------------------------------------------------------
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