From 3c199b86ddf919d79ad79eb7d69f4b6f81bb73ab Mon Sep 17 00:00:00 2001
From: Arnaud Spiwack <arnaud@spiwack.net>
Date: Mon, 2 Dec 2013 15:09:00 +0100
Subject: Fix Admitted.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Commit "The commands that initiate proofs…" was a bit hasty in its treatment of Admitted (in an attempt of making things simple, I actually required the proof to be completed for Admitted to go through…).
---
 toplevel/lemmas.ml | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

(limited to 'toplevel')

diff --git a/toplevel/lemmas.ml b/toplevel/lemmas.ml
index b0c04556f..5da651120 100644
--- a/toplevel/lemmas.ml
+++ b/toplevel/lemmas.ml
@@ -307,11 +307,11 @@ let get_proof proof do_guard hook opacity =
 
 let start_proof id kind ?sign c ?init_tac ?(compute_guard=[]) hook =
   let hook = Ephemeron.create hook in
-  let terminator = let open Vernacexpr in function
-    | Admitted,_ ->
+  let terminator = let open Proof_global in function
+    | Admitted ->
         admit hook ();
         Pp.feedback Interface.AddedAxiom
-    | Proved (is_opaque,idopt),proof ->
+    | Proved (is_opaque,idopt,proof) ->
         let proof = get_proof proof compute_guard hook is_opaque in
         begin match idopt with
         | None -> save_named proof
@@ -400,15 +400,18 @@ let start_proof_com kind thms hook =
 
 (* Saving a proof *)
 
-let save_proof ?proof ending =
-  let (proof_obj,terminator) =
-    match proof with
-    | None -> Proof_global.close_proof (fun x -> x)
-    | Some proof -> proof
-  in
-  (* if the proof is given explicitly, nothing has to be deleted *)
-  if Option.is_empty proof then Pfedit.delete_current_proof ();
-  Ephemeron.get terminator (ending,proof_obj)
+let save_proof ?proof = function
+  | Vernacexpr.Admitted ->
+      Ephemeron.get (Proof_global.get_terminator()) Proof_global.Admitted
+  | Vernacexpr.Proved (is_opaque,idopt) ->
+      let (proof_obj,terminator) =
+        match proof with
+        | None -> Proof_global.close_proof (fun x -> x)
+        | Some proof -> proof
+      in
+      (* if the proof is given explicitly, nothing has to be deleted *)
+      if Option.is_empty proof then Pfedit.delete_current_proof ();
+      Ephemeron.get terminator (Proof_global.Proved (is_opaque,idopt,proof_obj))
 
 (* Miscellaneous *)
 
-- 
cgit v1.2.3