diff options
| author | Matthieu Sozeau | 2014-03-25 18:29:28 +0100 |
|---|---|---|
| committer | Matthieu Sozeau | 2014-05-06 09:58:58 +0200 |
| commit | 62fb849cf9410ddc2d9f355570f4fb859f3044c3 (patch) | |
| tree | 2f350ca302a46e18840638d20e7ff89beaf2b1f0 /stm | |
| parent | ca318cd0d21ce157a3042b600ded99df6face25e (diff) | |
Adapt universe polymorphic branch to new handling of futures for delayed proofs.
Diffstat (limited to 'stm')
| -rw-r--r-- | stm/lemmas.ml | 2 | ||||
| -rw-r--r-- | stm/stm.ml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/stm/lemmas.ml b/stm/lemmas.ml index 4f9bc8c444..e9831f8347 100644 --- a/stm/lemmas.ml +++ b/stm/lemmas.ml @@ -171,7 +171,7 @@ let save id const cstrs do_guard (locality,poly,kind) hook = let const = adjust_guardness_conditions const do_guard in let k = Kindops.logical_kind_of_goal_kind kind in (* Add global constraints necessary to check the type of the proof *) - let () = Global.add_constraints cstrs in + let () = Global.push_context (snd cstrs) in let l,r = match locality with | Discharge when Lib.sections_are_opened () -> let c = SectionLocalDef const in diff --git a/stm/stm.ml b/stm/stm.ml index 69e73089e5..8c034c030e 100644 --- a/stm/stm.ml +++ b/stm/stm.ml @@ -744,7 +744,7 @@ end = struct | Declarations.SEsubproof(_, { Declarations.const_body = Declarations.OpaqueDef f; const_universes = univs } ) -> - Opaqueproof.join_opaque f; ignore (Future.join univs) (* FIXME: MS: needed?*) + Opaqueproof.join_opaque f | _ -> ()) se) (fst l); l, Unix.gettimeofday () -. wall_clock in @@ -808,7 +808,7 @@ end = struct | Declarations.OpaqueDef lc -> let uc = Option.get (Opaqueproof.get_constraints lc) in let uc = - Future.chain ~greedy:true ~pure:true uc Univ.hcons_constraints in + Future.chain ~greedy:true ~pure:true uc Univ.hcons_universe_context in let pr = Opaqueproof.get_proof lc in let pr = Future.chain ~greedy:true ~pure:true pr discharge in let pr = Future.chain ~greedy:true ~pure:true pr Constr.hcons in @@ -816,7 +816,7 @@ end = struct let extra = Future.join uc in u.(bucket) <- uc; p.(bucket) <- pr; - u, Univ.union_constraint cst extra, false + u, Univ.UContext.union cst extra, false | _ -> assert false let check_task name l i = |