# HG changeset patch
# User wenzelm
# Date 1162664743 -3600
# Node ID e8228486aa03335d181562e37ed5a76ee4c5e177
# Parent  5ec545dbad6fbcd95b77aa4a6c43d839b76eb335
removed checkpoint interface;
moved back to copy/checkpoint instead of checkpoint/checkpoint
 (NB 1: checkpoint is idempotent, i.e. impure data is being shared, which is inappropriate;
  NB 2: copying a checkpoint always produces a related theory);
present_proof: proper treatment of history;
tuned;

diff -r 5ec545dbad6f -r e8228486aa03 src/Pure/Isar/toplevel.ML
--- a/src/Pure/Isar/toplevel.ML	Sat Nov 04 19:25:43 2006 +0100
+++ b/src/Pure/Isar/toplevel.ML	Sat Nov 04 19:25:43 2006 +0100
@@ -47,7 +47,6 @@
   exception RESTART
   val exn_message: exn -> string
   val program: (unit -> 'a) -> 'a
-  val checkpoint: state -> state
   type transition
   val undo_limit: bool -> int option
   val empty: transition
@@ -83,11 +82,11 @@
   val theory_to_proof: (theory -> Proof.state) -> transition -> transition
   val end_proof: (bool -> Proof.state -> Proof.context) -> transition -> transition
   val forget_proof: transition -> transition
-  val proof: (Proof.state -> Proof.state) -> transition -> transition
-  val proofs: (Proof.state -> Proof.state Seq.seq) -> transition -> transition
+  val present_proof: (bool -> node -> unit) -> transition -> transition
+  val proofs': (bool -> Proof.state -> Proof.state Seq.seq) -> transition -> transition
   val proof': (bool -> Proof.state -> Proof.state) -> transition -> transition
-  val proofs': (bool -> Proof.state -> Proof.state Seq.seq) -> transition -> transition
-  val present_proof: (bool -> node -> unit) -> transition -> transition
+  val proofs: (Proof.state -> Proof.state Seq.seq) -> transition -> transition
+  val proof: (Proof.state -> Proof.state) -> transition -> transition
   val actual_proof: (ProofHistory.T -> ProofHistory.T) -> transition -> transition
   val skip_proof: (int History.T -> int History.T) -> transition -> transition
   val skip_proof_to_theory: (int -> bool) -> transition -> transition
@@ -343,9 +342,9 @@
 
 val stale_theory = ERROR "Stale theory encountered after succesful execution!";
 
-fun checkpoint_node (Theory (gthy, _)) = Theory
-      (Context.mapping Theory.checkpoint (LocalTheory.raw_theory Theory.checkpoint) gthy, NONE)
-  | checkpoint_node node = node;
+fun map_theory f = History.map
+  (fn Theory (gthy, _) => Theory (Context.mapping f (LocalTheory.raw_theory f) gthy, NONE)
+    | node => node);
 
 fun return (result, NONE) = result
   | return (result, SOME exn) = raise FAILURE (result, exn);
@@ -354,8 +353,8 @@
 
 fun transaction hist f (node, term) =
   let
-    val cont_node = History.map checkpoint_node node;
-    val back_node = History.map checkpoint_node cont_node;
+    val cont_node = map_theory Theory.checkpoint node;
+    val back_node = map_theory Theory.copy cont_node;
     fun state nd = State (SOME (nd, term));
     fun normal_state nd = (state nd, NONE);
     fun error_state nd exn = (state nd, SOME exn);
@@ -363,7 +362,7 @@
     val (result, err) =
       cont_node
       |> (f
-          |> (if hist then History.apply_copy checkpoint_node else History.map)
+          |> (if hist then History.apply' (History.current back_node) else History.map)
           |> controlled_execution)
       |> normal_state
       handle exn => error_state cont_node exn;
@@ -373,11 +372,6 @@
     else return (result, err)
   end;
 
-fun mapping f (State (SOME (node, term))) = State (SOME (History.map f node, term))
-  | mapping _ state = state;
-
-val checkpoint = mapping checkpoint_node;
-
 end;
 
 
@@ -630,6 +624,11 @@
     | SkipProof (_, (_, orig_gthy)) => Theory (orig_gthy, NONE)
     | _ => raise UNDEF));
 
+fun present_proof f = map_current (fn int =>
+  (fn Proof (prf, x) => Proof (ProofHistory.apply I prf, x)
+    | SkipProof (h, x) => SkipProof (History.apply I h, x)
+    | _ => raise UNDEF) #> tap (f int));
+
 fun proofs' f = map_current (fn int =>
   (fn Proof (prf, x) => Proof (ProofHistory.applys (f int) prf, x)
     | SkipProof (h, x) => SkipProof (History.apply I h, x)
@@ -639,11 +638,6 @@
 val proofs = proofs' o K;
 val proof = proof' o K;
 
-fun present_proof f = map_current (fn int =>
-  (fn node as Proof _ => node
-    | node as SkipProof _ => node
-    | _ => raise UNDEF) #> tap (f int));
-
 fun actual_proof f = map_current (fn _ =>
   (fn Proof (prf, x) => Proof (f prf, x)
     | _ => raise UNDEF));