diff -r 71b760618f30 -r 241838c01caf TFL/utils.sml
--- a/TFL/utils.sml	Tue May 20 11:47:33 1997 +0200
+++ b/TFL/utils.sml	Tue May 20 11:49:57 1997 +0200
@@ -1,10 +1,9 @@
 (*---------------------------------------------------------------------------
- * Some common utilities. This strucuture is parameterized over
- * "int_to_string" because there is a difference between the string 
- * operations of SML/NJ versions 93 and 109.
+ * Some common utilities.
  *---------------------------------------------------------------------------*)
 
-functor UTILS (val int_to_string : int -> string) :Utils_sig = 
+
+structure Utils = 
 struct
 
 (* Standard exception for TFL. *)
@@ -19,40 +18,18 @@
 val MESG_string = info_string "Message"
 end;
 
-fun Raise (e as ERR sss) = (output(std_out, ERR_string sss);  raise e)
+fun Raise (e as ERR sss) = (TextIO.output(TextIO.stdOut, ERR_string sss);  
+                            raise e)
   | Raise e = raise e;
 
 
-(* option type *)
-datatype 'a option = SOME of 'a | NONE
-
-
 (* Simple combinators *)
 
-infix 3 ##
-fun f ## g = (fn (x,y) => (f x, g y))
-
-fun W f x = f x x
 fun C f x y = f y x
-fun I x = x
-
-fun curry f x y = f(x,y)
-fun uncurry f (x,y) = f x y
-
-fun fst(x,y) = x
-fun snd(x,y) = y;
 
 val concat = curry (op ^)
 fun quote s = "\""^s^"\"";
 
-fun map2 f L1 L2 =
- let fun mp2 [] [] L = rev L
-       | mp2 (a1::rst1) (a2::rst2) L = mp2 rst1 rst2 (f a1 a2::L)
-       | mp2 _ _ _ = raise UTILS_ERR{func="map2",mesg="different length lists"}
-   in mp2 L1 L2 []
-   end;
-
-
 fun itlist f L base_value =
    let fun it [] = base_value
          | it (a::rst) = f a (it rst)
@@ -81,8 +58,6 @@
  in  it (L1,L2)
  end;
 
-fun filter p L = itlist (fn x => fn y => if (p x) then x::y else y) L []
-
 fun mapfilter f alist = itlist (fn i=>fn L=> (f i::L) handle _ => L) alist [];
 
 fun pluck p  =
@@ -104,24 +79,6 @@
   in grab
   end;
 
-fun all p =
-   let fun every [] = true
-         | every (a::rst) = (p a) andalso every rst       
-   in every 
-   end;
-
-fun exists p =
-   let fun ex [] = false
-         | ex (a::rst) = (p a) orelse ex rst       
-   in ex 
-   end;
-
-fun zip [] [] = []
-  | zip (a::b) (c::d) = (a,c)::(zip b d)
-  | zip _ _ = raise UTILS_ERR{func = "zip",mesg = "different length lists"};
-
-fun unzip L = itlist (fn (x,y) => fn (l1,l2) =>((x::l1),(y::l2))) L ([],[]);
-
 fun zip3 [][][] = []
   | zip3 (x::l1) (y::l2) (z::l3) = (x,y,z)::zip3 l1 l2 l3
   | zip3 _ _ _ = raise UTILS_ERR{func="zip3",mesg="different lengths"};
@@ -131,18 +88,8 @@
 fun holds P x = P x handle _ => false;
 
 
-fun assert p x = 
- if (p x) then x else raise UTILS_ERR{func="assert", mesg="predicate not true"}
-
-fun assoc1 eq item =
-   let fun assc ((entry as (key,_))::rst) = 
-             if eq(item,key) then SOME entry else assc rst
-         | assc [] = NONE
-    in assc
-    end;
-
 (* Set ops *)
-nonfix mem union;  (* Gag Barf Choke *)
+nonfix mem;  (* Gag Barf Choke *)
 fun mem eq_func i =
    let val eqi = eq_func i
        fun mm [] = false
@@ -150,14 +97,6 @@
    in mm
    end;
 
-fun union eq_func =
-   let val mem = mem eq_func
-       fun un S1 []  = S1
-         | un [] S1  = S1
-         | un (a::rst) S2 = if (mem a S2) then (un rst S2) else (a::un rst S2)
-   in un
-   end;
-
 fun mk_set eq_func =
    let val mem = mem eq_func
        fun mk [] = []
@@ -165,17 +104,9 @@
    in mk
    end;
 
-(* Union of a family of sets *)
-fun Union eq_func set_o_sets = itlist (union eq_func) set_o_sets [];
-
-fun intersect eq_func S1 S2 = mk_set eq_func (filter (C (mem eq_func) S2) S1);
-
 (* All the elements in the first set that are not also in the second set. *)
 fun set_diff eq_func S1 S2 = filter (fn x => not (mem eq_func x S2)) S1
 
-fun set_eq eq_func S1 S2 = 
-   null(set_diff eq_func S1 S2) andalso null(set_diff eq_func S2 S1);
-
 
 fun sort R = 
 let fun part (m, []) = ([],[])
@@ -192,6 +123,5 @@
 end;
 
 
-val int_to_string = int_to_string;
 
 end; (* Utils *)