merged

--- a/src/HOL/Tools/hologic.ML	Tue Dec 21 08:37:48 2010 +0100
+++ b/src/HOL/Tools/hologic.ML	Tue Dec 21 08:38:03 2010 +0100
@@ -8,6 +8,7 @@
 sig
   val typeS: sort
   val typeT: typ
+  val mk_id: typ -> term
   val mk_comp: term * term -> term
   val boolN: string
   val boolT: typ
@@ -145,6 +146,8 @@
 
 (* functions *)
 
+fun mk_id T = Const ("Fun.id", T --> T);
+
 fun mk_comp (f, g) =
   let
     val fT = fastype_of f;