diff options
| author | Pierre Boutillier | 2015-06-22 11:49:58 +0200 |
|---|---|---|
| committer | Pierre Boutillier | 2015-06-22 11:49:58 +0200 |
| commit | 6bec099f8487b9d3ec5c44079cf69d3474c73b91 (patch) | |
| tree | b23d8983fa887cc7e7255df455c64d5d54130787 /proofs | |
| parent | 07e8eede6670a256a81d9d70133ebbeb64f45fe3 (diff) | |
| parent | 949d027ce8fa94b5c62f938b58c3f85d015b177b (diff) | |
Merge remote-tracking branch 'forge/v8.5'
Diffstat (limited to 'proofs')
| -rw-r--r-- | proofs/proof_global.ml | 5 | ||||
| -rw-r--r-- | proofs/proof_global.mli | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/proofs/proof_global.ml b/proofs/proof_global.ml index 3e2c813e38..8677b854de 100644 --- a/proofs/proof_global.ml +++ b/proofs/proof_global.ml @@ -74,7 +74,7 @@ type proof_object = { } type proof_ending = - | Admitted of Names.Id.t * Decl_kinds.goal_kind * Entries.parameter_entry + | Admitted of Names.Id.t * Decl_kinds.goal_kind * Entries.parameter_entry * proof_universes | Proved of Vernacexpr.opacity_flag * (Vernacexpr.lident * Decl_kinds.theorem_kind option) option * proof_object @@ -665,4 +665,7 @@ let freeze ~marshallable = | `No -> !pstates let unfreeze s = pstates := s; update_proof_mode () let proof_of_state = function { proof }::_ -> proof | _ -> raise NoCurrentProof +let copy_terminators ~src ~tgt = + assert(List.length src = List.length tgt); + List.map2 (fun op p -> { p with terminator = op.terminator }) src tgt diff --git a/proofs/proof_global.mli b/proofs/proof_global.mli index 9d5038a3f9..88e047782c 100644 --- a/proofs/proof_global.mli +++ b/proofs/proof_global.mli @@ -66,7 +66,7 @@ type proof_object = { } type proof_ending = - | Admitted of Names.Id.t * Decl_kinds.goal_kind * Entries.parameter_entry + | Admitted of Names.Id.t * Decl_kinds.goal_kind * Entries.parameter_entry * proof_universes | Proved of Vernacexpr.opacity_flag * (Vernacexpr.lident * Decl_kinds.theorem_kind option) option * proof_object @@ -197,3 +197,4 @@ type state val freeze : marshallable:[`Yes | `No | `Shallow] -> state val unfreeze : state -> unit val proof_of_state : state -> Proof.proof +val copy_terminators : src:state -> tgt:state -> state |