From f147f7826aad760920efa7001586aa63002847d6 Mon Sep 17 00:00:00 2001
From: Emilio Jesus Gallego Arias
Date: Tue, 11 Jun 2019 02:26:27 +0200
Subject: [equations] [proof] Remove reference to evar_map

Small refactoring to pass the `sigma` functionally.
---
 vernac/lemmas.ml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/vernac/lemmas.ml b/vernac/lemmas.ml
index a1345f444b..2b204cb3de 100644
--- a/vernac/lemmas.ml
+++ b/vernac/lemmas.ml
@@ -581,7 +581,7 @@ let finish_derived ~f ~name ~idopt ~opaque ~entries =
   in
   ignore (Declare.declare_constant name lemma_def)
 
-let finish_proved_equations opaque lid proof_obj hook i types wits sigma =
+let finish_proved_equations opaque lid proof_obj hook i types wits sigma0 =
 
   let open Decl_kinds in
   let obls = ref 1 in
@@ -589,22 +589,21 @@ let finish_proved_equations opaque lid proof_obj hook i types wits sigma =
     | DefinitionBody d -> IsDefinition d
     | Proof p -> IsProof p
   in
-  let evd = ref sigma in
-  let recobls =
-    CList.map2 (fun (wit, (evar_env, ev, evi, local_context, type_)) entry ->
+  let sigma, recobls =
+    CList.fold_left2_map (fun sigma (wit, (evar_env, ev, evi, local_context, type_)) entry ->
         let id =
-          match Evd.evar_ident ev sigma with
+          match Evd.evar_ident ev sigma0 with
           | Some id -> id
           | None -> let n = !obls in incr obls; add_suffix i ("_obligation_" ^ string_of_int n)
         in
         let entry, args = Abstract.shrink_entry local_context entry in
         let cst = Declare.declare_constant id (Entries.DefinitionEntry entry, kind) in
-        let sigma, app = Evarutil.new_global !evd (ConstRef cst) in
-        evd := Evd.define ev (EConstr.applist (app, List.map EConstr.of_constr args)) sigma;
-        cst)
+        let sigma, app = Evarutil.new_global sigma (ConstRef cst) in
+        let sigma = Evd.define ev (EConstr.applist (app, List.map EConstr.of_constr args)) sigma in
+        sigma, cst) sigma0
       (CList.combine (List.rev !wits) types) proof_obj.Proof_global.entries
   in
-  hook recobls !evd
+  hook recobls sigma
 
 let save_lemma_proved ?proof ?lemma ~opaque ~idopt =
   (* Invariant (uh) *)
-- 
cgit v1.2.3