# HG changeset patch
# User wenzelm
# Date 1135347413 -3600
# Node ID 24efc1587f9df1f838102efbdf4e3844e497b0d6
# Parent  915105af2e8029bba80c84bdfd84745a1da497c0
Logic.mk_conjunction_list;
PRECISE_CONJUNCTS: two levels;

diff -r 915105af2e80 -r 24efc1587f9d src/Pure/Isar/locale.ML
--- a/src/Pure/Isar/locale.ML	Fri Dec 23 15:16:52 2005 +0100
+++ b/src/Pure/Isar/locale.ML	Fri Dec 23 15:16:53 2005 +0100
@@ -1549,7 +1549,7 @@
 
 fun atomize_spec thy ts =
   let
-    val t = foldr1 Logic.mk_conjunction ts;
+    val t = Logic.mk_conjunction_list ts;
     val body = ObjectLogic.atomize_term thy t;
     val bodyT = Term.fastype_of body;
   in
@@ -1603,7 +1603,7 @@
     val conjuncts =
       (Drule.equal_elim_rule1 OF [Thm.symmetric body_eq,
         Tactic.rewrite_rule [pred_def] (Thm.assume (cert statement))])
-      |> Drule.conj_elim_precise (length ts);
+      |> Drule.conj_elim_precise [length ts] |> hd;
     val axioms = ts ~~ conjuncts |> map (fn (t, ax) =>
       prove_protected defs_thy t
        (Tactic.rewrite_goals_tac defs THEN
@@ -2110,7 +2110,9 @@
 
 val refine_protected =
   Proof.refine (Method.Basic (K (Method.RAW_METHOD
-    (K (ALLGOALS (CONJUNCTS2 ~1 (ALLGOALS (Tactic.rtac Drule.protectI))))))))
+    (K (ALLGOALS
+      (PRECISE_CONJUNCTS ~1 (ALLGOALS
+        (PRECISE_CONJUNCTS ~1 (ALLGOALS (Tactic.rtac Drule.protectI))))))))))
   #> Seq.hd;
 
 fun goal_name thy kind target propss =
@@ -2123,7 +2125,7 @@
   let
     val (propss, activate) = prep_global_registration (prfx, atts) expr insts thy;
     val kind = goal_name thy "interpretation" NONE propss;
-    val after_qed = activate o (prep_result propss);
+    val after_qed = activate o prep_result propss;
   in
     ProofContext.init thy
     |> Proof.theorem_i kind NONE after_qed NONE ("", []) (prep_propp propss)