# HG changeset patch
# User wenzelm
# Date 1372585054 -7200
# Node ID 48bc24467008fa073c6cb2fdaf126b64bc3fb0e8
# Parent  b1565e37678bfa69a060cb4752d868c14870bbb1
backout dedd7952a62c: static "proofs" value within theory prevents later inferencing with different configuration;

diff -r b1565e37678b -r 48bc24467008 NEWS
--- a/NEWS	Sun Jun 30 11:30:16 2013 +0200
+++ b/NEWS	Sun Jun 30 11:37:34 2013 +0200
@@ -6,12 +6,11 @@
 
 *** General ***
 
-* Uniform management of "quick_and_dirty" and "proofs" as system
-options (see also "isabelle options"), configuration option within the
-context (see also Config.get in Isabelle/ML), and attribute in
-Isabelle/Isar.  Minor INCOMPATIBILITY, need to use more official
-Isabelle means these options, instead of poking into mutable
-references.
+* Uniform management of "quick_and_dirty" as system option (see also
+"isabelle options"), configuration option within the context (see also
+Config.get in Isabelle/ML), and attribute in Isabelle/Isar.  Minor
+INCOMPATIBILITY, need to use more official Isabelle means to access
+quick_and_dirty, instead of historical poking into mutable reference.
 
 * Renamed command 'print_configs' to 'print_options'.  Minor
 INCOMPATIBILITY.
diff -r b1565e37678b -r 48bc24467008 src/Doc/IsarImplementation/Logic.thy
--- a/src/Doc/IsarImplementation/Logic.thy	Sun Jun 30 11:30:16 2013 +0200
+++ b/src/Doc/IsarImplementation/Logic.thy	Sun Jun 30 11:37:34 2013 +0200
@@ -1335,6 +1335,7 @@
   \begin{mldecls}
   @{index_ML_type proof} \\
   @{index_ML_type proof_body} \\
+  @{index_ML proofs: "int Unsynchronized.ref"} \\
   @{index_ML Reconstruct.reconstruct_proof:
   "theory -> term -> proof -> proof"} \\
   @{index_ML Reconstruct.expand_proof: "theory ->
@@ -1344,10 +1345,6 @@
   @{index_ML Proof_Syntax.pretty_proof: "Proof.context -> proof -> Pretty.T"} \\
   \end{mldecls}
 
-  \begin{tabular}{rcll}
-  @{attribute_def proofs} & : & @{text attribute} & default @{text 1} \\
-  \end{tabular}
-
   \begin{description}
 
   \item Type @{ML_type proof} represents proof terms; this is a
@@ -1373,6 +1370,13 @@
   Parallel performance may suffer by inspecting proof terms at
   run-time.
 
+  \item @{ML proofs} specifies the detail of proof recording within
+  @{ML_type thm} values produced by the inference kernel: @{ML 0}
+  records only the names of oracles, @{ML 1} records oracle names and
+  propositions, @{ML 2} additionally records full proof terms.
+  Officially named theorems that contribute to a result are recorded
+  in any case.
+
   \item @{ML Reconstruct.reconstruct_proof}~@{text "thy prop prf"}
   turns the implicit proof term @{text "prf"} into a full proof of the
   given proposition.
@@ -1400,13 +1404,6 @@
   \item @{ML Proof_Syntax.pretty_proof}~@{text "ctxt prf"}
   pretty-prints the given proof term.
 
-  \item @{attribute proofs} specifies the detail of proof recording within
-  @{ML_type thm} values produced by the inference kernel: @{text 0}
-  records only the names of oracles, @{text 1} records oracle names and
-  propositions, @{text 2} additionally records full proof terms.
-  Officially named theorems that contribute to a result are recorded
-  in any case.  %FIXME move to IsarRef
-
   \end{description}
 *}
 
diff -r b1565e37678b -r 48bc24467008 src/HOL/TPTP/ATP_Problem_Import.thy
--- a/src/HOL/TPTP/ATP_Problem_Import.thy	Sun Jun 30 11:30:16 2013 +0200
+++ b/src/HOL/TPTP/ATP_Problem_Import.thy	Sun Jun 30 11:37:34 2013 +0200
@@ -13,7 +13,7 @@
 
 ML_file "sledgehammer_tactics.ML"
 
-declare [[proofs = 0]]
+ML {* Proofterm.proofs := 0 *}
 
 declare [[show_consts]] (* for Refute *)
 declare [[smt_oracle]]
diff -r b1565e37678b -r 48bc24467008 src/HOL/Tools/Datatype/datatype_realizer.ML
--- a/src/HOL/Tools/Datatype/datatype_realizer.ML	Sun Jun 30 11:30:16 2013 +0200
+++ b/src/HOL/Tools/Datatype/datatype_realizer.ML	Sun Jun 30 11:37:34 2013 +0200
@@ -225,7 +225,7 @@
   end;
 
 fun add_dt_realizers config names thy =
-  if not (Proofterm.proofs_enabled thy) then thy
+  if not (Proofterm.proofs_enabled ()) then thy
   else
     let
       val _ = Datatype_Aux.message config "Adding realizers for induction and case analysis ...";
diff -r b1565e37678b -r 48bc24467008 src/Pure/Isar/attrib.ML
--- a/src/Pure/Isar/attrib.ML	Sun Jun 30 11:30:16 2013 +0200
+++ b/src/Pure/Isar/attrib.ML	Sun Jun 30 11:37:34 2013 +0200
@@ -554,7 +554,6 @@
 
 val _ = Context.>> (Context.map_theory
  (register_config quick_and_dirty_raw #>
-  register_config Proofterm.proofs_raw #>
   register_config Ast.trace_raw #>
   register_config Ast.stats_raw #>
   register_config Printer.show_brackets_raw #>
diff -r b1565e37678b -r 48bc24467008 src/Pure/ROOT.ML
--- a/src/Pure/ROOT.ML	Sun Jun 30 11:30:16 2013 +0200
+++ b/src/Pure/ROOT.ML	Sun Jun 30 11:37:34 2013 +0200
@@ -341,5 +341,6 @@
 
 val cd = File.cd o Path.explode;
 
+Proofterm.proofs := 0;
 Multithreading.max_threads := 0;
 
diff -r b1565e37678b -r 48bc24467008 src/Pure/Tools/build.ML
--- a/src/Pure/Tools/build.ML	Sun Jun 30 11:30:16 2013 +0200
+++ b/src/Pure/Tools/build.ML	Sun Jun 30 11:37:34 2013 +0200
@@ -102,6 +102,7 @@
 
 fun use_theories last_timing options =
   Thy_Info.use_theories {last_timing = last_timing, master_dir = Path.current}
+    |> Unsynchronized.setmp Proofterm.proofs (Options.int options "proofs")
     |> Unsynchronized.setmp print_mode
         (space_explode "," (Options.string options "print_mode") @ print_mode_value ())
     |> Unsynchronized.setmp Goal.parallel_proofs (Options.int options "parallel_proofs")
diff -r b1565e37678b -r 48bc24467008 src/Pure/Tools/proof_general_pure.ML
--- a/src/Pure/Tools/proof_general_pure.ML	Sun Jun 30 11:30:16 2013 +0200
+++ b/src/Pure/Tools/proof_general_pure.ML	Sun Jun 30 11:37:34 2013 +0200
@@ -152,8 +152,8 @@
 val _ =
   ProofGeneral.preference ProofGeneral.category_proof
     NONE
-    (fn () => Markup.print_bool (Markup.parse_int (Options.get_default @{option proofs}) >= 2))
-    (fn s => Options.put_default @{option proofs} (if Markup.parse_bool s then "2" else "1"))
+    (Markup.print_bool o Proofterm.proofs_enabled)
+    (fn s => Proofterm.proofs := (if Markup.parse_bool s then 2 else 1))
     ProofGeneral.pgipbool
     "full-proofs"
     "Record full proof objects internally";
diff -r b1565e37678b -r 48bc24467008 src/Pure/proofterm.ML
--- a/src/Pure/proofterm.ML	Sun Jun 30 11:30:16 2013 +0200
+++ b/src/Pure/proofterm.ML	Sun Jun 30 11:37:34 2013 +0200
@@ -8,6 +8,8 @@
 
 signature BASIC_PROOFTERM =
 sig
+  val proofs: int Unsynchronized.ref
+
   datatype proof =
      MinProof
    | PBound of int
@@ -33,10 +35,6 @@
 sig
   include BASIC_PROOFTERM
 
-  val proofs_raw: Config.raw
-  val proofs: int Config.T
-  val proofs_enabled: theory -> bool
-
   type oracle = string * term
   type pthm = serial * (string * term * proof_body future)
   val proof_of: proof_body -> proof
@@ -61,6 +59,7 @@
   val decode_body: proof_body XML.Decode.T
 
   (** primitive operations **)
+  val proofs_enabled: unit -> bool
   val proof_combt: proof * term list -> proof
   val proof_combt': proof * term option list -> proof
   val proof_combP: proof * proof list -> proof
@@ -130,12 +129,11 @@
    {classrel_proof: theory -> class * class -> proof,
     arity_proof: theory -> string * sort list * class -> proof} -> unit
   val axm_proof: string -> term -> proof
-  val oracle_proof: theory -> string -> term -> oracle * proof
+  val oracle_proof: string -> term -> oracle * proof
 
   (** rewriting on proof terms **)
   val add_prf_rrule: proof * proof -> theory -> theory
-  val add_prf_rproc: (typ list -> term option list -> proof -> (proof * proof) option) ->
-    theory -> theory
+  val add_prf_rproc: (typ list -> term option list -> proof -> (proof * proof) option) -> theory -> theory
   val no_skel: proof
   val normal_skel: proof
   val rewrite_proof: theory -> (proof * proof) list *
@@ -157,16 +155,6 @@
 structure Proofterm : PROOFTERM =
 struct
 
-(***** options *****)
-
-val proofs_raw = Config.declare_option_global "proofs";
-val proofs = Config.int proofs_raw;
-
-fun proofs_enabled thy = Config.get_global thy proofs >= 2;
-
-val _ = Options.put_default "proofs" "2";  (*compile-time value for Pure*)
-
-
 (***** datatype proof *****)
 
 datatype proof =
@@ -1082,6 +1070,9 @@
 
 (***** axioms and theorems *****)
 
+val proofs = Unsynchronized.ref 2;
+fun proofs_enabled () = ! proofs >= 2;
+
 fun vars_of t = map Var (rev (Term.add_vars t []));
 fun frees_of t = map Free (rev (Term.add_frees t []));
 
@@ -1148,9 +1139,8 @@
 
 val axm_proof = gen_axm_proof PAxm;
 
-fun oracle_proof thy name prop =
-  if Config.get_global thy proofs = 0
-  then ((name, Term.dummy), Oracle (name, Term.dummy, NONE))
+fun oracle_proof name prop =
+  if ! proofs = 0 then ((name, Term.dummy), Oracle (name, Term.dummy, NONE))
   else ((name, prop), gen_axm_proof Oracle name prop);
 
 fun shrink_proof thy =
@@ -1561,7 +1551,7 @@
 
     fun make_body0 proof0 = PBody {oracles = oracles0, thms = thms0, proof = proof0};
     val body0 =
-      if not (proofs_enabled thy) then Future.value (make_body0 MinProof)
+      if not (proofs_enabled ()) then Future.value (make_body0 MinProof)
       else if Context.is_draft thy then Future.value (make_body0 (full_proof0 ()))
       else
         (singleton o Future.cond_forks)
diff -r b1565e37678b -r 48bc24467008 src/Pure/thm.ML
--- a/src/Pure/thm.ML	Sun Jun 30 11:30:16 2013 +0200
+++ b/src/Pure/thm.ML	Sun Jun 30 11:37:34 2013 +0200
@@ -485,7 +485,7 @@
 
 fun promise_ord ((i, _), (j, _)) = int_ord (j, i);
 
-fun deriv_rule2 thy f
+fun deriv_rule2 f
     (Deriv {promises = ps1, body = PBody {oracles = oras1, thms = thms1, proof = prf1}})
     (Deriv {promises = ps2, body = PBody {oracles = oras2, thms = thms2, proof = prf2}}) =
   let
@@ -493,15 +493,15 @@
     val oras = Proofterm.unions_oracles [oras1, oras2];
     val thms = Proofterm.unions_thms [thms1, thms2];
     val prf =
-      (case Config.get_global thy Proofterm.proofs of
+      (case ! Proofterm.proofs of
         2 => f prf1 prf2
       | 1 => MinProof
       | 0 => MinProof
       | i => error ("Illegal level of detail for proof objects: " ^ string_of_int i));
   in make_deriv ps oras thms prf end;
 
-fun deriv_rule1 thy f = deriv_rule2 thy (K f) empty_deriv;
-fun deriv_rule0 thy prf = deriv_rule1 thy I (make_deriv [] [] [] prf);
+fun deriv_rule1 f = deriv_rule2 (K f) empty_deriv;
+fun deriv_rule0 prf = deriv_rule1 I (make_deriv [] [] [] prf);
 
 fun deriv_rule_unconditional f (Deriv {promises, body = PBody {oracles, thms, proof}}) =
   make_deriv promises oracles thms (f proof);
@@ -615,7 +615,7 @@
       Symtab.lookup (Theory.axiom_table thy) name
       |> Option.map (fn prop =>
            let
-             val der = deriv_rule0 theory (Proofterm.axm_proof name prop);
+             val der = deriv_rule0 (Proofterm.axm_proof name prop);
              val maxidx = maxidx_of_term prop;
              val shyps = Sorts.insert_term prop [];
            in
@@ -647,7 +647,7 @@
 fun norm_proof (Thm (der, args as {thy_ref, ...})) =
   let
     val thy = Theory.deref thy_ref;
-    val der' = deriv_rule1 thy (Proofterm.rew_proof thy) der;
+    val der' = deriv_rule1 (Proofterm.rew_proof thy) der;
     val _ = Theory.check_thy thy;
   in Thm (der', args) end;
 
@@ -673,7 +673,7 @@
       raise THM ("assume: prop", 0, [])
     else if maxidx <> ~1 then
       raise THM ("assume: variables", maxidx, [])
-    else Thm (deriv_rule0 (Theory.deref thy_ref) (Proofterm.Hyp prop),
+    else Thm (deriv_rule0 (Proofterm.Hyp prop),
      {thy_ref = thy_ref,
       tags = [],
       maxidx = ~1,
@@ -696,16 +696,14 @@
   if T <> propT then
     raise THM ("implies_intr: assumptions must have type prop", 0, [th])
   else
-    let val thy_ref = merge_thys1 ct th in
-      Thm (deriv_rule1 (Theory.deref thy_ref) (Proofterm.implies_intr_proof A) der,
-       {thy_ref = thy_ref,
-        tags = [],
-        maxidx = Int.max (maxidxA, maxidx),
-        shyps = Sorts.union sorts shyps,
-        hyps = remove_hyps A hyps,
-        tpairs = tpairs,
-        prop = Logic.mk_implies (A, prop)})
-    end;
+    Thm (deriv_rule1 (Proofterm.implies_intr_proof A) der,
+     {thy_ref = merge_thys1 ct th,
+      tags = [],
+      maxidx = Int.max (maxidxA, maxidx),
+      shyps = Sorts.union sorts shyps,
+      hyps = remove_hyps A hyps,
+      tpairs = tpairs,
+      prop = Logic.mk_implies (A, prop)});
 
 
 (*Implication elimination
@@ -719,13 +717,12 @@
       prop = propA, ...}) = thA
     and Thm (der, {maxidx, hyps, shyps, tpairs, prop, ...}) = thAB;
     fun err () = raise THM ("implies_elim: major premise", 0, [thAB, thA]);
-    val thy_ref = merge_thys2 thAB thA;
   in
     case prop of
       Const ("==>", _) $ A $ B =>
         if A aconv propA then
-          Thm (deriv_rule2 (Theory.deref thy_ref) (curry Proofterm.%%) der derA,
-           {thy_ref = thy_ref,
+          Thm (deriv_rule2 (curry Proofterm.%%) der derA,
+           {thy_ref = merge_thys2 thAB thA,
             tags = [],
             maxidx = Int.max (maxA, maxidx),
             shyps = Sorts.union shypsA shyps,
@@ -747,10 +744,9 @@
     (ct as Cterm {t = x, T, sorts, ...})
     (th as Thm (der, {maxidx, shyps, hyps, tpairs, prop, ...})) =
   let
-    val thy_ref = merge_thys1 ct th;
     fun result a =
-      Thm (deriv_rule1 (Theory.deref thy_ref) (Proofterm.forall_intr_proof x a) der,
-       {thy_ref = thy_ref,
+      Thm (deriv_rule1 (Proofterm.forall_intr_proof x a) der,
+       {thy_ref = merge_thys1 ct th,
         tags = [],
         maxidx = maxidx,
         shyps = Sorts.union sorts shyps,
@@ -781,16 +777,14 @@
       if T <> qary then
         raise THM ("forall_elim: type mismatch", 0, [th])
       else
-        let val thy_ref = merge_thys1 ct th in
-          Thm (deriv_rule1 (Theory.deref thy_ref) (Proofterm.% o rpair (SOME t)) der,
-           {thy_ref = thy_ref,
-            tags = [],
-            maxidx = Int.max (maxidx, maxt),
-            shyps = Sorts.union sorts shyps,
-            hyps = hyps,
-            tpairs = tpairs,
-            prop = Term.betapply (A, t)})
-        end
+        Thm (deriv_rule1 (Proofterm.% o rpair (SOME t)) der,
+         {thy_ref = merge_thys1 ct th,
+          tags = [],
+          maxidx = Int.max (maxidx, maxt),
+          shyps = Sorts.union sorts shyps,
+          hyps = hyps,
+          tpairs = tpairs,
+          prop = Term.betapply (A, t)})
   | _ => raise THM ("forall_elim: not quantified", 0, [th]));
 
 
@@ -800,7 +794,7 @@
   t == t
 *)
 fun reflexive (Cterm {thy_ref, t, T = _, maxidx, sorts}) =
-  Thm (deriv_rule0 (Theory.deref thy_ref) Proofterm.reflexive,
+  Thm (deriv_rule0 Proofterm.reflexive,
    {thy_ref = thy_ref,
     tags = [],
     maxidx = maxidx,
@@ -817,7 +811,7 @@
 fun symmetric (th as Thm (der, {thy_ref, maxidx, shyps, hyps, tpairs, prop, ...})) =
   (case prop of
     (eq as Const ("==", _)) $ t $ u =>
-      Thm (deriv_rule1 (Theory.deref thy_ref) Proofterm.symmetric der,
+      Thm (deriv_rule1 Proofterm.symmetric der,
        {thy_ref = thy_ref,
         tags = [],
         maxidx = maxidx,
@@ -839,14 +833,13 @@
     and Thm (der2, {maxidx = max2, hyps = hyps2, shyps = shyps2, tpairs = tpairs2,
       prop = prop2, ...}) = th2;
     fun err msg = raise THM ("transitive: " ^ msg, 0, [th1, th2]);
-    val thy_ref = merge_thys2 th1 th2;
   in
     case (prop1, prop2) of
       ((eq as Const ("==", Type (_, [T, _]))) $ t1 $ u, Const ("==", _) $ u' $ t2) =>
         if not (u aconv u') then err "middle term"
         else
-          Thm (deriv_rule2 (Theory.deref thy_ref) (Proofterm.transitive u T) der1 der2,
-           {thy_ref = thy_ref,
+          Thm (deriv_rule2 (Proofterm.transitive u T) der1 der2,
+           {thy_ref = merge_thys2 th1 th2,
             tags = [],
             maxidx = Int.max (max1, max2),
             shyps = Sorts.union shyps1 shyps2,
@@ -867,7 +860,7 @@
       (case t of Abs (_, _, bodt) $ u => subst_bound (u, bodt)
       | _ => raise THM ("beta_conversion: not a redex", 0, []));
   in
-    Thm (deriv_rule0 (Theory.deref thy_ref) Proofterm.reflexive,
+    Thm (deriv_rule0 Proofterm.reflexive,
      {thy_ref = thy_ref,
       tags = [],
       maxidx = maxidx,
@@ -878,7 +871,7 @@
   end;
 
 fun eta_conversion (Cterm {thy_ref, t, T = _, maxidx, sorts}) =
-  Thm (deriv_rule0 (Theory.deref thy_ref) Proofterm.reflexive,
+  Thm (deriv_rule0 Proofterm.reflexive,
    {thy_ref = thy_ref,
     tags = [],
     maxidx = maxidx,
@@ -888,7 +881,7 @@
     prop = Logic.mk_equals (t, Envir.eta_contract t)});
 
 fun eta_long_conversion (Cterm {thy_ref, t, T = _, maxidx, sorts}) =
-  Thm (deriv_rule0 (Theory.deref thy_ref) Proofterm.reflexive,
+  Thm (deriv_rule0 Proofterm.reflexive,
    {thy_ref = thy_ref,
     tags = [],
     maxidx = maxidx,
@@ -910,7 +903,7 @@
     val (t, u) = Logic.dest_equals prop
       handle TERM _ => raise THM ("abstract_rule: premise not an equality", 0, [th]);
     val result =
-      Thm (deriv_rule1 (Theory.deref thy_ref) (Proofterm.abstract_rule x a) der,
+      Thm (deriv_rule1 (Proofterm.abstract_rule x a) der,
        {thy_ref = thy_ref,
         tags = [],
         maxidx = maxidx,
@@ -948,14 +941,13 @@
             raise THM ("combination: types", 0, [th1, th2])
           else ()
       | _ => raise THM ("combination: not function type", 0, [th1, th2]));
-    val thy_ref = merge_thys2 th1 th2;
   in
     case (prop1, prop2) of
       (Const ("==", Type ("fun", [fT, _])) $ f $ g,
        Const ("==", Type ("fun", [tT, _])) $ t $ u) =>
         (chktypes fT tT;
-          Thm (deriv_rule2 (Theory.deref thy_ref) (Proofterm.combination f g t u fT) der1 der2,
-           {thy_ref = thy_ref,
+          Thm (deriv_rule2 (Proofterm.combination f g t u fT) der1 der2,
+           {thy_ref = merge_thys2 th1 th2,
             tags = [],
             maxidx = Int.max (max1, max2),
             shyps = Sorts.union shyps1 shyps2,
@@ -977,13 +969,12 @@
     and Thm (der2, {maxidx = max2, shyps = shyps2, hyps = hyps2, tpairs = tpairs2,
       prop = prop2, ...}) = th2;
     fun err msg = raise THM ("equal_intr: " ^ msg, 0, [th1, th2]);
-    val thy_ref = merge_thys2 th1 th2;
   in
     case (prop1, prop2) of
       (Const("==>", _) $ A $ B, Const("==>", _) $ B' $ A') =>
         if A aconv A' andalso B aconv B' then
-          Thm (deriv_rule2 (Theory.deref thy_ref) (Proofterm.equal_intr A B) der1 der2,
-           {thy_ref = thy_ref,
+          Thm (deriv_rule2 (Proofterm.equal_intr A B) der1 der2,
+           {thy_ref = merge_thys2 th1 th2,
             tags = [],
             maxidx = Int.max (max1, max2),
             shyps = Sorts.union shyps1 shyps2,
@@ -1006,13 +997,12 @@
     and Thm (der2, {maxidx = max2, shyps = shyps2, hyps = hyps2,
       tpairs = tpairs2, prop = prop2, ...}) = th2;
     fun err msg = raise THM ("equal_elim: " ^ msg, 0, [th1, th2]);
-    val thy_ref = merge_thys2 th1 th2;
   in
     case prop1 of
       Const ("==", _) $ A $ B =>
         if prop2 aconv A then
-          Thm (deriv_rule2 (Theory.deref thy_ref) (Proofterm.equal_elim A B) der1 der2,
-           {thy_ref = thy_ref,
+          Thm (deriv_rule2 (Proofterm.equal_elim A B) der1 der2,
+           {thy_ref = merge_thys2 th1 th2,
             tags = [],
             maxidx = Int.max (max1, max2),
             shyps = Sorts.union shyps1 shyps2,
@@ -1041,7 +1031,7 @@
             val tpairs' = tpairs |> map (pairself (Envir.norm_term env))
               (*remove trivial tpairs, of the form t==t*)
               |> filter_out (op aconv);
-            val der' = deriv_rule1 thy (Proofterm.norm_proof' env) der;
+            val der' = deriv_rule1 (Proofterm.norm_proof' env) der;
             val prop' = Envir.norm_term env prop;
             val maxidx = maxidx_tpairs tpairs' (maxidx_of_term prop');
             val shyps = Envir.insert_sorts env shyps;
@@ -1081,7 +1071,7 @@
         val tpairs' = map (pairself gen) tpairs;
         val maxidx' = maxidx_tpairs tpairs' (maxidx_of_term prop');
       in
-        Thm (deriv_rule1 (Theory.deref thy_ref) (Proofterm.generalize (tfrees, frees) idx) der,
+        Thm (deriv_rule1 (Proofterm.generalize (tfrees, frees) idx) der,
          {thy_ref = thy_ref,
           tags = [],
           maxidx = maxidx',
@@ -1152,7 +1142,7 @@
         val (tpairs', maxidx') =
           fold_map (fn (t, u) => fn i => subst t i ||>> subst u) tpairs maxidx1;
       in
-        Thm (deriv_rule1 (Theory.deref thy_ref')
+        Thm (deriv_rule1
           (fn d => Proofterm.instantiate (map (apsnd #1) instT', map (apsnd #1) inst') d) der,
          {thy_ref = thy_ref',
           tags = [],
@@ -1186,7 +1176,7 @@
   if T <> propT then
     raise THM ("trivial: the term must have type prop", 0, [])
   else
-    Thm (deriv_rule0 (Theory.deref thy_ref) (Proofterm.AbsP ("H", NONE, Proofterm.PBound 0)),
+    Thm (deriv_rule0 (Proofterm.AbsP ("H", NONE, Proofterm.PBound 0)),
      {thy_ref = thy_ref,
       tags = [],
       maxidx = maxidx,
@@ -1208,7 +1198,7 @@
     val Cterm {t = prop, maxidx, sorts, ...} = cterm_of thy (Logic.mk_of_class (T, c));
   in
     if Sign.of_sort thy (T, [c]) then
-      Thm (deriv_rule0 thy (Proofterm.OfClass (T, c)),
+      Thm (deriv_rule0 (Proofterm.OfClass (T, c)),
        {thy_ref = Theory.check_thy thy,
         tags = [],
         maxidx = maxidx,
@@ -1276,7 +1266,7 @@
     val (al, prop2) = Type.varify_global tfrees prop1;
     val (ts, prop3) = Logic.strip_prems (length tpairs, [], prop2);
   in
-    (al, Thm (deriv_rule1 (Theory.deref thy_ref) (Proofterm.varify_proof prop tfrees) der,
+    (al, Thm (deriv_rule1 (Proofterm.varify_proof prop tfrees) der,
      {thy_ref = thy_ref,
       tags = [],
       maxidx = Int.max (0, maxidx),
@@ -1295,7 +1285,7 @@
     val prop2 = Type.legacy_freeze prop1;
     val (ts, prop3) = Logic.strip_prems (length tpairs, [], prop2);
   in
-    Thm (deriv_rule1 (Theory.deref thy_ref) (Proofterm.legacy_freezeT prop1) der,
+    Thm (deriv_rule1 (Proofterm.legacy_freezeT prop1) der,
      {thy_ref = thy_ref,
       tags = [],
       maxidx = maxidx_of_term prop2,
@@ -1316,7 +1306,7 @@
   handle TERM _ => raise THM("dest_state", i, [state]);
 
 (*Prepare orule for resolution by lifting it over the parameters and
-  assumptions of goal.*)
+assumptions of goal.*)
 fun lift_rule goal orule =
   let
     val Cterm {t = gprop, T, maxidx = gmax, sorts, ...} = goal;
@@ -1325,12 +1315,11 @@
     val lift_all = Logic.lift_all inc gprop;
     val Thm (der, {maxidx, shyps, hyps, tpairs, prop, ...}) = orule;
     val (As, B) = Logic.strip_horn prop;
-    val thy_ref = merge_thys1 goal orule;
   in
     if T <> propT then raise THM ("lift_rule: the term must have type prop", 0, [])
     else
-      Thm (deriv_rule1 (Theory.deref thy_ref) (Proofterm.lift_proof gprop inc prop) der,
-       {thy_ref = thy_ref,
+      Thm (deriv_rule1 (Proofterm.lift_proof gprop inc prop) der,
+       {thy_ref = merge_thys1 goal orule,
         tags = [],
         maxidx = maxidx + inc,
         shyps = Sorts.union shyps sorts,  (*sic!*)
@@ -1343,7 +1332,7 @@
   if i < 0 then raise THM ("negative increment", 0, [thm])
   else if i = 0 then thm
   else
-    Thm (deriv_rule1 (Theory.deref thy_ref) (Proofterm.incr_indexes i) der,
+    Thm (deriv_rule1 (Proofterm.incr_indexes i) der,
      {thy_ref = thy_ref,
       tags = [],
       maxidx = maxidx + i,
@@ -1359,7 +1348,7 @@
     val thy = Theory.deref thy_ref;
     val (tpairs, Bs, Bi, C) = dest_state (state, i);
     fun newth n (env, tpairs) =
-      Thm (deriv_rule1 thy
+      Thm (deriv_rule1
           ((if Envir.is_empty env then I else (Proofterm.norm_proof' env)) o
             Proofterm.assumption_proof Bs Bi n) der,
        {tags = [],
@@ -1398,7 +1387,7 @@
     (case find_index (fn asm => Envir.aeconv (asm, concl)) asms of
       ~1 => raise THM ("eq_assumption", 0, [state])
     | n =>
-        Thm (deriv_rule1 (Theory.deref thy_ref) (Proofterm.assumption_proof Bs Bi (n + 1)) der,
+        Thm (deriv_rule1 (Proofterm.assumption_proof Bs Bi (n + 1)) der,
          {thy_ref = thy_ref,
           tags = [],
           maxidx = maxidx,
@@ -1427,7 +1416,7 @@
         in Logic.list_all (params, Logic.list_implies (qs @ ps, concl)) end
       else raise THM ("rotate_rule", k, [state]);
   in
-    Thm (deriv_rule1 (Theory.deref thy_ref) (Proofterm.rotate_proof Bs Bi m) der,
+    Thm (deriv_rule1 (Proofterm.rotate_proof Bs Bi m) der,
      {thy_ref = thy_ref,
       tags = [],
       maxidx = maxidx,
@@ -1458,7 +1447,7 @@
         in Logic.list_implies (fixed_prems @ qs @ ps, concl) end
       else raise THM ("permute_prems: k", k, [rl]);
   in
-    Thm (deriv_rule1 (Theory.deref thy_ref) (Proofterm.permute_prems_proof prems j m) der,
+    Thm (deriv_rule1 (Proofterm.permute_prems_proof prems j m) der,
      {thy_ref = thy_ref,
       tags = [],
       maxidx = maxidx,
@@ -1652,7 +1641,7 @@
                   (ntps, (map normt (Bs @ As), normt C))
              end
            val th =
-             Thm (deriv_rule2 thy
+             Thm (deriv_rule2
                    ((if Envir.is_empty env then I
                      else if Envir.above env smax then
                        (fn f => fn der => f (Proofterm.norm_proof' env der))
@@ -1676,7 +1665,7 @@
          else
            let val rename = rename_bvars dpairs tpairs B As0
            in (map (rename strip_apply) As0,
-             deriv_rule1 thy (Proofterm.map_proof_terms (rename K) I) rder)
+             deriv_rule1 (Proofterm.map_proof_terms (rename K) I) rder)
            end;
        in (map (if flatten then (Logic.flatten_params n) else I) As1, As1, rder', n)
           handle TERM _ =>
@@ -1765,12 +1754,9 @@
     if T <> propT then
       raise THM ("Oracle's result must have type prop: " ^ name, 0, [])
     else
-      let
-        val thy_ref = Theory.merge_refs (thy_ref1, thy_ref2);
-        val (ora, prf) = Proofterm.oracle_proof (Theory.deref thy_ref) name prop;
-      in
+      let val (ora, prf) = Proofterm.oracle_proof name prop in
         Thm (make_deriv [] [ora] [] prf,
-         {thy_ref = thy_ref,
+         {thy_ref = Theory.merge_refs (thy_ref1, thy_ref2),
           tags = [],
           maxidx = maxidx,
           shyps = sorts,