# HG changeset patch
# User huffman
# Date 1118871343 -7200
# Node ID 294a7864063e55fc220c57b517dba659b6956f3b
# Parent  36f41d5e3b3e1c8c513ab64ddd2116bb87c2236a
Domain package uses ContProc for beta reduction

diff -r 36f41d5e3b3e -r 294a7864063e src/HOLCF/cont_proc.ML
--- a/src/HOLCF/cont_proc.ML	Wed Jun 15 21:48:35 2005 +0200
+++ b/src/HOLCF/cont_proc.ML	Wed Jun 15 23:35:43 2005 +0200
@@ -7,6 +7,7 @@
 sig
   val is_lcf_term: term -> bool
   val cont_thms: term -> thm list
+  val all_cont_thms: term -> thm list
   val cont_proc: theory -> simproc
   val setup: (theory -> theory) list
 end;
@@ -57,20 +58,22 @@
         in (map (fn y => SOME (k y RS Lx)) ys, x') end;
 
   (* first list: cont thm for each dangling bound variable *)
-  (* second list: cont thm for each LAM *)
-  fun cont_thms1 (Const _ $ f $ t) = let
-        val (cs1,ls1) = cont_thms1 f;
-        val (cs2,ls2) = cont_thms1 t;
-        in (zip cs1 cs2, ls1 @ ls2) end
-    | cont_thms1 (Const _ $ Abs (_,_,t)) = let
-        val (cs,ls) = cont_thms1 t;
+  (* second list: cont thm for each LAM in t *)
+  (* if b = false, only return cont thm for outermost LAMs *)
+  fun cont_thms1 b (Const _ $ f $ t) = let
+        val (cs1,ls1) = cont_thms1 b f;
+        val (cs2,ls2) = cont_thms1 b t;
+        in (zip cs1 cs2, if b then ls1 @ ls2 else []) end
+    | cont_thms1 b (Const _ $ Abs (_,_,t)) = let
+        val (cs,ls) = cont_thms1 b t;
         val (cs',l) = lam cs;
         in (cs',l::ls) end
-    | cont_thms1 (Bound n) = (var n, [])
-    | cont_thms1 _ = ([],[]);
+    | cont_thms1 _ (Bound n) = (var n, [])
+    | cont_thms1 _ _ = ([],[]);
 in
   (* precondition: is_lcf_term t = true *)
-  fun cont_thms t = snd (cont_thms1 t);
+  fun cont_thms t = snd (cont_thms1 false t);
+  fun all_cont_thms t = snd (cont_thms1 true t);
 end;
 
 (*
diff -r 36f41d5e3b3e -r 294a7864063e src/HOLCF/domain/theorems.ML
--- a/src/HOLCF/domain/theorems.ML	Wed Jun 15 21:48:35 2005 +0200
+++ b/src/HOLCF/domain/theorems.ML	Wed Jun 15 23:35:43 2005 +0200
@@ -93,36 +93,6 @@
 (* ----- generating beta reduction rules from definitions-------------------- *)
 
 local
-  fun k NONE = cont_const | k (SOME x) = x;
-  
-  fun ap NONE NONE = NONE
-  |   ap x    y    = SOME (standard (cont2cont_Rep_CFun OF [k x, k y]));
-
-  fun var 0 = [SOME cont_id]
-  |   var n = NONE :: var (n-1);
-
-  fun zip []      []      = []
-  |   zip []      (y::ys) = (ap NONE y   ) :: zip [] ys
-  |   zip (x::xs) []      = (ap x    NONE) :: zip xs []
-  |   zip (x::xs) (y::ys) = (ap x    y   ) :: zip xs ys
-
-  fun lam [] = ([], cont_const)
-  |   lam (x::ys) = let val x' = k x
-                        val Lx = x' RS cont2cont_LAM
-                    in  (map (fn y => SOME (k y RS Lx)) ys, x')
-                    end;
-
-  fun term_conts (Bound n) = (var n, [])
-  |   term_conts (Const _) = ([],[])
-  |   term_conts (Const _ $ Abs (_,_,t)) = let
-          val (cs,ls) = term_conts t
-          val (cs',l) = lam cs
-          in  (cs',l::ls)
-          end
-  |   term_conts (Const _ $ f $ t)
-         = (zip (fst (term_conts f)) (fst (term_conts t)), [])
-  |   term_conts t = let val dummy = prin t in ([],[]) end;
-
   fun arglist (Const _ $ Abs (s,_,t)) = let
         val (vars,body) = arglist t
         in  (s :: vars, body) end
@@ -131,12 +101,12 @@
   fun bound_vars 0 = [] | bound_vars i = (Bound (i-1) :: bound_vars (i-1));
 in
   fun appl_of_def def = let
-        val (_ $ con $ lam) = concl_of def
-        val (vars, rhs) = arglist lam
-        val lhs = Library.foldl (op `) (con, bound_vars (length vars));
-        val appl = bind_fun vars (lhs == rhs)
-        val ([],cs) = term_conts lam
-        val betas = map (fn c => mk_meta_eq (c RS beta_cfun)) cs
+        val (_ $ con $ lam) = concl_of def;
+        val (vars, rhs) = arglist lam;
+        val lhs = mk_cRep_CFun (con, bound_vars (length vars));
+        val appl = bind_fun vars (lhs == rhs);
+        val cs = ContProc.cont_thms lam;
+        val betas = map (fn c => mk_meta_eq (c RS beta_cfun)) cs;
         in pg (def::betas) appl [rtac reflexive_thm 1] end;
 end;