# HG changeset patch
# User wenzelm
# Date 1564647298 -7200
# Node ID fa933b98d64d47c795a3308205e1574f7af81bb1
# Parent  492cb3aaa56281141602d3fba35a48db4e7f5003
clarified module structure;

diff -r 492cb3aaa562 -r fa933b98d64d src/Pure/Tools/build.scala
--- a/src/Pure/Tools/build.scala	Thu Aug 01 09:55:37 2019 +0200
+++ b/src/Pure/Tools/build.scala	Thu Aug 01 10:14:58 2019 +0200
@@ -289,6 +289,7 @@
             }
 
           process.result(
+            progress_stderr = Output.writeln(_),
             progress_stdout = (line: String) =>
               Library.try_unprefix("\floading_theory = ", line) match {
                 case Some(theory) =>
diff -r 492cb3aaa562 -r fa933b98d64d src/Pure/proofterm.ML
--- a/src/Pure/proofterm.ML	Thu Aug 01 09:55:37 2019 +0200
+++ b/src/Pure/proofterm.ML	Thu Aug 01 10:14:58 2019 +0200
@@ -2064,6 +2064,11 @@
 
 fun prepare_thm_proof unconstrain thy name shyps hyps concl promises body =
   let
+(*
+    val FIXME =
+      Output.physical_stderr ("pthm " ^ quote name ^ " " ^ Position.here (Position.thread_data ()) ^ "\n");
+*)
+
     val named = name <> "";
 
     val prop = Logic.list_implies (hyps, concl);
diff -r 492cb3aaa562 -r fa933b98d64d src/Pure/thm.ML
--- a/src/Pure/thm.ML	Thu Aug 01 09:55:37 2019 +0200
+++ b/src/Pure/thm.ML	Thu Aug 01 10:14:58 2019 +0200
@@ -111,6 +111,9 @@
   val map_tags: (Properties.T -> Properties.T) -> thm -> thm
   val norm_proof: thm -> thm
   val adjust_maxidx_thm: int -> thm -> thm
+  (*oracles*)
+  val add_oracle: binding * ('a -> cterm) -> theory -> (string * ('a -> thm)) * theory
+  val extern_oracles: bool -> Proof.context -> (Markup.T * xstring) list
   (*inference rules*)
   val assume: cterm -> thm
   val implies_intr: cterm -> thm -> thm
@@ -152,9 +155,6 @@
   val bicompose: Proof.context option -> {flatten: bool, match: bool, incremented: bool} ->
     bool * thm * int -> int -> thm -> thm Seq.seq
   val biresolution: Proof.context option -> bool -> (bool * thm) list -> int -> thm -> thm Seq.seq
-  (*oracles*)
-  val extern_oracles: bool -> Proof.context -> (Markup.T * xstring) list
-  val add_oracle: binding * ('a -> cterm) -> theory -> (string * ('a -> thm)) * theory
 end;
 
 structure Thm: THM =
@@ -815,6 +815,51 @@
 
 
 
+(*** Theory data ***)
+
+structure Data = Theory_Data
+(
+  type T =
+    unit Name_Space.table;  (*oracles: authentic derivation names*)
+  val empty : T = Name_Space.empty_table "oracle";
+  val extend = I;
+  fun merge data : T = Name_Space.merge_tables data;
+);
+
+val get_oracles = Data.get;
+val map_oracles = Data.map;
+
+
+
+(*** Oracles ***)
+
+fun add_oracle (b, oracle_fn) thy =
+  let
+    val (name, oracles') = Name_Space.define (Context.Theory thy) true (b, ()) (get_oracles thy);
+    val thy' = map_oracles (K oracles') thy;
+    fun invoke_oracle arg =
+      let val Cterm {cert = cert2, t = prop, T, maxidx, sorts} = oracle_fn arg in
+        if T <> propT then
+          raise THM ("Oracle's result must have type prop: " ^ name, 0, [])
+        else
+          let val (oracle, prf) = Proofterm.oracle_proof name prop in
+            Thm (make_deriv [] [oracle] [] prf,
+             {cert = Context.join_certificate (Context.Certificate thy', cert2),
+              tags = [],
+              maxidx = maxidx,
+              shyps = sorts,
+              hyps = [],
+              tpairs = [],
+              prop = prop})
+          end
+      end;
+  in ((name, invoke_oracle), thy') end;
+
+fun extern_oracles verbose ctxt =
+  map #1 (Name_Space.markup_table verbose ctxt (get_oracles (Proof_Context.theory_of ctxt)));
+
+
+
 (*** Meta rules ***)
 
 (** primitive rules **)
@@ -1865,49 +1910,6 @@
               else res brules
     in  Seq.flat (res brules)  end;
 
-
-
-(*** Oracles ***)
-
-(* oracle rule *)
-
-fun invoke_oracle thy1 name oracle arg =
-  let val Cterm {cert = cert2, t = prop, T, maxidx, sorts} = oracle arg in
-    if T <> propT then
-      raise THM ("Oracle's result must have type prop: " ^ name, 0, [])
-    else
-      let val (ora, prf) = Proofterm.oracle_proof name prop in
-        Thm (make_deriv [] [ora] [] prf,
-         {cert = Context.join_certificate (Context.Certificate thy1, cert2),
-          tags = [],
-          maxidx = maxidx,
-          shyps = sorts,
-          hyps = [],
-          tpairs = [],
-          prop = prop})
-      end
-  end;
-
-
-(* authentic derivation names *)
-
-structure Oracles = Theory_Data
-(
-  type T = unit Name_Space.table;
-  val empty : T = Name_Space.empty_table "oracle";
-  val extend = I;
-  fun merge data : T = Name_Space.merge_tables data;
-);
-
-fun extern_oracles verbose ctxt =
-  map #1 (Name_Space.markup_table verbose ctxt (Oracles.get (Proof_Context.theory_of ctxt)));
-
-fun add_oracle (b, oracle) thy =
-  let
-    val (name, tab') = Name_Space.define (Context.Theory thy) true (b, ()) (Oracles.get thy);
-    val thy' = Oracles.put tab' thy;
-  in ((name, invoke_oracle thy' name oracle), thy') end;
-
 end;
 
 structure Basic_Thm: BASIC_THM = Thm;