diff options
| author |  Enrico Tassi <Enrico.Tassi@inria.fr> | 2014-02-24 20:46:32 +0100 |
|---|---|---|
| committer | Enrico Tassi <Enrico.Tassi@inria.fr> | 2014-02-26 14:53:08 +0100 |
| commit | 15b6c9b6fa268a9af6dd4f05961e469545e92a6f (patch) | |
| tree | 2e5aacf72993b448d1e80b0cbfbf0a09091ecb32 /kernel/safe_typing.ml | |
| parent | e6556db92d4c4fe9ba38f26b89f805095d2b2638 (diff) | |
Lazyconstr -> Opaqueproof
Make this module deal only with opaque proofs.
Make discharging/substitution invariant more explicit via a third constructor.
Diffstat (limited to 'kernel/safe_typing.ml')
| -rw-r--r-- | kernel/safe_typing.ml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/safe_typing.ml b/kernel/safe_typing.ml index a93415f92..241e9d565 100644 --- a/kernel/safe_typing.ml +++ b/kernel/safe_typing.ml @@ -283,8 +283,8 @@ let safe_push_named (id,_,_ as d) env = let push_named_def (id,de) senv = let (c,typ,cst) = Term_typing.translate_local_def senv.env id de in let c,cst' = match c with - | Def c -> Lazyconstr.force c, Univ.empty_constraint - | OpaqueDef c -> Lazyconstr.force_opaque_w_constraints c + | Def c -> Mod_subst.force_constr c, Univ.empty_constraint + | OpaqueDef o -> Opaqueproof.force_proof o, Opaqueproof.force_constraints o | _ -> assert false in let senv = add_constraints (Now cst') senv in let senv' = add_constraints (Now cst) senv in @@ -321,7 +321,7 @@ let constraints_of_sfb = function match cb.const_body with | (Undef _ | Def _) -> [] | OpaqueDef lc -> - match Lazyconstr.get_opaque_future_constraints lc with + match Opaqueproof.get_constraints lc with | None -> [] | Some fc -> match Future.peek_val fc with @@ -383,7 +383,7 @@ let add_constant dir l decl senv = | OpaqueDef lc when DirPath.is_empty dir -> (* In coqc, opaque constants outside sections will be stored indirectly in a specific table *) - { cb with const_body = OpaqueDef (Lazyconstr.turn_indirect lc) } + { cb with const_body = OpaqueDef (Opaqueproof.turn_indirect lc) } | _ -> cb in let senv' = add_field (l,SFBconst cb) (C kn) senv in |