# HG changeset patch
# User wenzelm
# Date 760280175 -3600
# Node ID ee132db916815b05b5feaaf8880b8e4f5e95598f
# Parent  b1fcd27fcac4636671002a4b34a3edda3edf1a2f
added if_none, parents, commas, gen_duplicates, duplicates, assoc2;
changed cat_lines: no final "\n";

diff -r b1fcd27fcac4 -r ee132db91681 src/Pure/library.ML
--- a/src/Pure/library.ML	Thu Feb 03 13:55:42 1994 +0100
+++ b/src/Pure/library.ML	Thu Feb 03 13:56:15 1994 +0100
@@ -45,6 +45,9 @@
 fun the (Some x) = x
   | the None = raise OPTION "the";
 
+fun if_none None y = y
+  | if_none (Some x) _ = x;
+
 fun is_some (Some _) = true
   | is_some None = false;
 
@@ -256,7 +259,6 @@
 fun split_list (l: ('a * 'b) list) = (map #1 l, map #2 l);
 
 
-
 (* prefixes, suffixes *)
 
 infix prefix;
@@ -268,8 +270,8 @@
    where xi is the first element that does not satisfy the predicate*)
 fun take_prefix (pred : 'a -> bool)  (xs: 'a list) : 'a list * 'a list =
   let fun take (rxs, []) = (rev rxs, [])
-        | take (rxs, x::xs) =
-            if  pred x  then  take(x::rxs, xs)  else  (rev rxs, x::xs)
+        | take (rxs, x :: xs) =
+            if  pred x  then  take(x :: rxs, xs)  else  (rev rxs, x :: xs)
   in  take([], xs)  end;
 
 (* [x1, ..., xi, ..., xn]  --->  ([x1, ..., xi], [x(i+1), ..., xn])
@@ -374,14 +376,19 @@
   in implode o (map lower) o explode end;
 
 
+(*parentesize*)
+fun parents lpar rpar str = lpar ^ str ^ rpar;
+
 (*simple quoting (does not escape special chars)*)
-fun quote s = "\"" ^ s ^ "\"";
+val quote = parents "\"" "\"";
 
 (*space_implode "..." (explode "hello"); gives "h...e...l...l...o"*)
 fun space_implode a bs = implode (separate a bs);
 
+val commas = space_implode ", ";
+
 (*concatenate messages, one per line, into a string*)
-val cat_lines = implode o (map (apr (op ^, "\n")));
+val cat_lines = space_implode "\n";
 
 
 
@@ -468,6 +475,24 @@
   | findrep (x :: xs) = if x mem xs then x :: xs else findrep xs;
 
 
+(*returns a list containing all repeated elements exactly once; preserves
+  order, takes first of equal elements*)
+fun gen_duplicates eq lst =
+  let
+    val memb = gen_mem eq;
+
+    fun dups (rev_dups, []) = rev rev_dups
+      | dups (rev_dups, x :: xs) =
+          if memb (x, rev_dups) orelse not (memb (x, xs)) then
+            dups (rev_dups, xs)
+          else dups (x :: rev_dups, xs);
+  in
+    dups ([], lst)
+  end;
+
+val duplicates = gen_duplicates (op =);
+
+
 
 (** association lists **)
 
@@ -481,6 +506,12 @@
     None => []
   | Some ys => ys);
 
+(*two-fold association list lookup*)
+fun assoc2 (aal, (key1, key2)) =
+  (case assoc (aal, key1) of
+    Some al => assoc (al, key2)
+  | None => None);
+
 (*generalized association list lookup*)
 fun gen_assoc eq ([], key) = None
   | gen_assoc eq ((keyi, xi) :: pairs, key) =