ranamed CodegenData.lazy to lazy_thms (avoid clash with Alice keywords);

--- a/src/HOL/Tools/datatype_codegen.ML	Tue Apr 03 17:05:52 2007 +0200
+++ b/src/HOL/Tools/datatype_codegen.ML	Tue Apr 03 19:24:10 2007 +0200
@@ -623,7 +623,7 @@
         val const = ("op =", SOME dtco);
         val get_thms = (fn () => get_eq (Theory.deref thy_ref) dtco |> rev);
       in
-        CodegenData.add_funcl (const, CodegenData.lazy get_thms) thy
+        CodegenData.add_funcl (const, CodegenData.lazy_thms get_thms) thy
       end;
   in
     prove_codetypes_arities (ClassPackage.intro_classes_tac [])

--- a/src/Pure/Tools/codegen_data.ML	Tue Apr 03 17:05:52 2007 +0200
+++ b/src/Pure/Tools/codegen_data.ML	Tue Apr 03 19:24:10 2007 +0200
@@ -8,7 +8,7 @@
 
 signature CODEGEN_DATA =
 sig
-  val lazy: (unit -> thm list) -> thm list Susp.T
+  val lazy_thms: (unit -> thm list) -> thm list Susp.T
   val eval_always: bool ref
 
   val add_func: bool -> thm -> theory -> theory
@@ -62,7 +62,7 @@
 
 val eval_always = ref false;
 
-fun lazy f = if !eval_always
+fun lazy_thms f = if !eval_always
   then Susp.value (f ())
   else Susp.delay f;
 
@@ -79,7 +79,7 @@
    of SOME thms => (Susp.value o f thy) thms
      | NONE => let
           val thy_ref = Theory.self_ref thy;
-        in lazy (fn () => (f (Theory.deref thy_ref) o Susp.force) r) end;
+        in lazy_thms (fn () => (f (Theory.deref thy_ref) o Susp.force) r) end;
 
 fun merge' _ ([], []) = (false, [])
   | merge' _ ([], ys) = (true, ys)
@@ -100,7 +100,7 @@
    of SOME [] => (true, r2)
     | _ => case Susp.peek r2
        of SOME [] => (true, r1)
-        | _ => (apsnd (lazy o K)) (merge_thms (Susp.force r1, Susp.force r2));
+        | _ => (apsnd (lazy_thms o K)) (merge_thms (Susp.force r1, Susp.force r2));
 
 
 
@@ -128,7 +128,7 @@
   apfst Susp.value (add_drop_redundant thm (Susp.force sels, dels));
 
 fun add_lthms lthms (sels, []) =
-      (lazy (fn () => fold add_drop_redundant
+      (lazy_thms (fn () => fold add_drop_redundant
         (Susp.force lthms) (Susp.force sels, []) |> fst), [])
         (*FIXME*)
   | add_lthms lthms (sels, dels) =
@@ -146,7 +146,7 @@
     then let
       val (_, sels) = merge_thms (Susp.force sels1, subtract Thm.eq_thm dels1 (Susp.force sels2))
       val (_, dels) = merge_thms (dels1, subtract Thm.eq_thm (Susp.force sels1) dels2)
-    in (true, ((lazy o K) sels, dels)) end
+    in (true, ((lazy_thms o K) sels, dels)) end
     else let
       val (sels_t, sels) = merge_lthms (sels1, sels2)
     in (sels_t, (sels, dels)) end