# HG changeset patch # User regensbu # Date 813945209 -3600 # Node ID e5b95ee2616bd928ac9503ad32bed772c73ada7c # Parent ea8b657a9c9209e33bcb82ec2b92b2ff28d03387 removed incompatibility with sml diff -r ea8b657a9c92 -r e5b95ee2616b src/HOLCF/ax_ops/holcflogic.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 diff -r ea8b657a9c92 -r e5b95ee2616b src/HOLCF/ax_ops/thy_ops.ML --- 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 = diff -r ea8b657a9c92 -r e5b95ee2616b src/HOLCF/domain/interface.ML --- 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 *) +