# HG changeset patch
# User wenzelm
# Date 1178813432 -7200
# Node ID fb6917e426dab9994685f8d98f86262a1b4a465c
# Parent  86b4a7d04d43f5e6d2776198af68ba7e534eadaf
more conversions;
tuned;

diff -r 86b4a7d04d43 -r fb6917e426da src/Pure/conv.ML
--- a/src/Pure/conv.ML	Thu May 10 15:51:59 2007 +0200
+++ b/src/Pure/conv.ML	Thu May 10 18:10:32 2007 +0200
@@ -5,17 +5,28 @@
 Conversions: primitive equality reasoning.
 *)
 
-infix 1 AND;
-infix 0 OR;
+infix 1 thenc;
+infix 0 orelsec;
 
 signature CONV =
 sig
   type conv = cterm -> thm
   val no_conv: conv
   val all_conv: conv
-  val option_conv: conv -> cterm -> thm option
-  val AND: conv * conv -> conv
-  val OR: conv * conv -> conv
+  val thenc: conv * conv -> conv
+  val orelsec: conv * conv -> conv
+  val first_conv: conv list -> conv
+  val every_conv: conv list -> conv
+  val tryc: conv -> conv
+  val repeatc: conv -> conv
+  val cache_conv: conv -> conv
+  val abs_conv: conv -> conv
+  val combination_conv: conv -> conv -> conv
+  val comb_conv: conv -> conv
+  val arg_conv: conv -> conv
+  val fun_conv: conv -> conv
+  val arg1_conv: conv -> conv
+  val fun2_conv: conv -> conv
   val forall_conv: int -> conv -> conv
   val concl_conv: int -> conv -> conv
   val prems_conv: int -> (int -> conv) -> conv
@@ -28,33 +39,69 @@
 
 (* conversionals *)
 
-type conv = cterm -> thm
+type conv = cterm -> thm;
 
 fun no_conv _ = raise CTERM ("no conversion", []);
 val all_conv = Thm.reflexive;
 
 val is_refl = op aconv o Logic.dest_equals o Thm.prop_of;
 
-fun option_conv conv ct =
-  (case try conv ct of
-    NONE => NONE
-  | SOME eq => if is_refl eq then NONE else SOME eq);
-
-fun (conv1 AND conv2) ct =
+fun (cv1 thenc cv2) ct =
   let
-    val eq1 = conv1 ct;
-    val eq2 = conv2 (Thm.rhs_of eq1);
+    val eq1 = cv1 ct;
+    val eq2 = cv2 (Thm.rhs_of eq1);
   in
     if is_refl eq1 then eq2
     else if is_refl eq2 then eq1
     else Thm.transitive eq1 eq2
   end;
 
-fun (conv1 OR conv2) ct =
-  (case try conv1 ct of SOME eq => eq | NONE => conv2 ct);
+fun (cv1 orelsec cv2) ct =
+  (case try cv1 ct of SOME eq => eq | NONE => cv2 ct);
+
+fun first_conv cvs = fold_rev (curry op orelsec) cvs no_conv;
+fun every_conv cvs = fold_rev (curry op thenc) cvs all_conv;
+
+fun tryc cv = cv orelsec all_conv;
+fun repeatc cv ct = tryc (cv thenc repeatc cv) ct;
+
+fun cache_conv cv =
+  let
+    val cache = ref Termtab.empty;
+    fun conv ct =
+      (case Termtab.lookup (! cache) (term_of ct) of
+        SOME th => th
+      | NONE =>
+          let val th = cv ct
+          in change cache (Termtab.update (term_of ct, th)); th end);
+ in conv end;
+
 
 
-(* Pure conversions *)
+(** Pure conversions **)
+
+(* lambda terms *)
+
+fun abs_conv cv ct =
+  (case term_of ct of
+    Abs (x, _, _) =>
+      let val (v, ct') = Thm.dest_abs (SOME (gensym "abs_")) ct
+      in Thm.abstract_rule x v (cv ct') end
+  | _ => raise CTERM ("abs_conv", [ct]));
+
+fun combination_conv cv1 cv2 ct =
+  let val (ct1, ct2) = Thm.dest_comb ct
+  in Thm.combination (cv1 ct1) (cv2 ct2) end;
+
+fun comb_conv cv = combination_conv cv cv;
+fun arg_conv cv = combination_conv all_conv cv;
+fun fun_conv cv = combination_conv cv all_conv;
+
+val arg1_conv = fun_conv o arg_conv;
+val fun2_conv = fun_conv o fun_conv;
+
+
+(* logic *)
 
 (*rewrite B in !!x1 ... xn. B*)
 fun forall_conv 0 cv ct = cv ct
@@ -65,7 +112,7 @@
           (case (term_of A, term_of B) of
             (Const ("all", _), Abs (x, _, _)) =>
               let val (v, B') = Thm.dest_abs (SOME (gensym "all_")) B in
-                Thm.combination (Thm.reflexive A)
+                Thm.combination (all_conv A)
                   (Thm.abstract_rule x v (forall_conv (n - 1) cv B'))
               end
           | _ => cv ct));
@@ -75,17 +122,17 @@
   | concl_conv n cv ct =
       (case try Thm.dest_implies ct of
         NONE => cv ct
-      | SOME (A, B) => Drule.imp_cong_rule (reflexive A) (concl_conv (n - 1) cv B));
+      | SOME (A, B) => Drule.imp_cong_rule (all_conv A) (concl_conv (n - 1) cv B));
 
 (*rewrite the A's in A1 ==> ... ==> An ==> B*)
-fun prems_conv 0 _ = reflexive
+fun prems_conv 0 _ = all_conv
   | prems_conv n cv =
       let
         fun conv i ct =
-          if i = n + 1 then reflexive ct
+          if i = n + 1 then all_conv ct
           else
             (case try Thm.dest_implies ct of
-              NONE => reflexive ct
+              NONE => all_conv ct
             | SOME (A, B) => Drule.imp_cong_rule (cv i A) (conv (i + 1) B));
   in conv 1 end;