removed incompatibility with sml
authorregensbu
Tue, 17 Oct 1995 16:53:29 +0100
changeset 1284 e5b95ee2616b
parent 1283 ea8b657a9c92
child 1285 4dd0651d692d
removed incompatibility with sml
src/HOLCF/ax_ops/holcflogic.ML
src/HOLCF/ax_ops/thy_ops.ML
src/HOLCF/domain/interface.ML
--- a/src/HOLCF/ax_ops/holcflogic.ML	Tue Oct 17 12:09:46 1995 +0100
+++ b/src/HOLCF/ax_ops/holcflogic.ML	Tue Oct 17 16:53:29 1995 +0100
@@ -51,7 +51,7 @@
 (* Ops application (f ` x) *)
 fun mkOpApp (f as Const(_,ft as Type("->",[xt,rt]))) x =
      Const("fapp",ft --> xt --> rt) $ f $ x
-  | mkOpApp f x = (print(f);error("Internal error: mkOpApp: wrong args"));
+  | mkOpApp f x = (error("Internal error: mkOpApp: wrong args"));
 
 (* cpair constructor *)
 fun mkCPair x y = let val tx = fastype_of x
--- a/src/HOLCF/ax_ops/thy_ops.ML	Tue Oct 17 12:09:46 1995 +0100
+++ b/src/HOLCF/ax_ops/thy_ops.ML	Tue Oct 17 16:53:29 1995 +0100
@@ -241,7 +241,7 @@
 (* generates for the type t the type of the fapp constant 
    that will be applied to t *)
 fun mk_fapp_typ (typ as Type("->",argl)) = Type("fun",[typ,Type("fun",argl)]) 
-  | mk_fapp_typ t = (print t;
+  | mk_fapp_typ t = (
                     error("Internal error:mk_fapp_typ: wrong argument\n"));
                     
 fun mk_arg_tupel_UU uu_pos [typ] n = 
--- a/src/HOLCF/domain/interface.ML	Tue Oct 17 12:09:46 1995 +0100
+++ b/src/HOLCF/domain/interface.ML	Tue Oct 17 16:53:29 1995 +0100
@@ -66,8 +66,15 @@
 
 (* ----- generation of argument string for calling add_domain --------------------- *)
 
+
+     fun string_of_sort_emb [] = ""
+     |   string_of_sort_emb [x] = x
+	|   string_of_sort_emb (x::xs) = x^","^(string_of_sort_emb xs);
+
+	fun string_of_sort l = "["^ (string_of_sort_emb l)^"]";
+
     fun mk_tnv (n,v) = mk_pair(quote n,mk_list(map mk_typ v))
-    and mk_typ (TFree(name,sort)) = "TFree"^mk_pair(quote name,makestring sort)
+    and mk_typ (TFree(name,sort)) = "TFree"^mk_pair(quote name,string_of_sort sort)
     |   mk_typ (Type (name,args)) = "Type" ^mk_tnv(name,args)
     |   mk_typ _                  = Imposs "interface:mk_typ";
     fun mk_conslist cons' = mk_list (map 
@@ -162,4 +169,5 @@
 
 structure ThySyn = ThySynFun(ThySynData); (* overwrites old version of ThySyn!!!!!! *)
 
-end; (* local *)
\ No newline at end of file
+end; (* local *)
+