diff options
| author |  letouzey <letouzey@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2013-02-26 18:52:24 +0000 |
|---|---|---|
| committer | letouzey <letouzey@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2013-02-26 18:52:24 +0000 |
| commit | 60de53d159c85b8300226a61aa502a7e0dd2f04b (patch) | |
| tree | e542ed90d58872a75816d451ae26e38fa7b1d9f9 /library | |
| parent | 7dd28b4772251af6ae3641ec63a8251153915e21 (diff) | |
kernel/declarations becomes a pure mli
- constr_substituted and lazy_constr are now in a dedicated kernel/lazyconstr.ml
- the functions that were in declarations.ml (mostly substitution utilities
and hashcons) are now in kernel/declareops.ml
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@16250 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'library')
| -rw-r--r-- | library/assumptions.ml | 10 | ||||
| -rw-r--r-- | library/declaremods.ml | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/library/assumptions.ml b/library/assumptions.ml index ee916c237..2d99aca8c 100644 --- a/library/assumptions.ml +++ b/library/assumptions.ml @@ -151,7 +151,7 @@ let lookup_constant_in_impl cst fallback = let lookup_constant cst = try let cb = Global.lookup_constant cst in - if constant_has_body cb then cb + if Declareops.constant_has_body cb then cb else lookup_constant_in_impl cst (Some cb) with Not_found -> lookup_constant_in_impl cst None @@ -227,8 +227,8 @@ let assumptions ?(add_opaque=false) ?(add_transparent=false) st (* t *) = (s,ContextObjectMap.add cst ctype acc) in let (s,acc) = - if Declarations.constant_has_body cb then - if Declarations.is_opaque cb || not (Cpred.mem kn knst) then + if Declareops.constant_has_body cb then + if Declareops.is_opaque cb || not (Cpred.mem kn knst) then (** it is opaque *) if add_opaque then do_type (Opaque kn) else (s, acc) @@ -237,9 +237,9 @@ let assumptions ?(add_opaque=false) ?(add_transparent=false) st (* t *) = else (s, acc) else (s, acc) in - match Declarations.body_of_constant cb with + match Declareops.body_of_constant cb with | None -> do_type (Axiom kn) - | Some body -> do_constr (Declarations.force body) s acc + | Some body -> do_constr (Lazyconstr.force body) s acc and do_memoize_kn kn = try_and_go (Axiom kn) (add_kn kn) diff --git a/library/declaremods.ml b/library/declaremods.ml index 591567fea..c30b2099f 100644 --- a/library/declaremods.ml +++ b/library/declaremods.ml @@ -524,7 +524,7 @@ let rec seb2mse = function | SEBwith (s,With_module_body (l,mp)) -> MSEwith(seb2mse s,With_Module(l,mp)) | SEBwith (s,With_definition_body(l,cb)) -> (match cb.const_body with - | Def c -> MSEwith(seb2mse s,With_Definition(l,Declarations.force c)) + | Def c -> MSEwith(seb2mse s,With_Definition(l,Lazyconstr.force c)) | _ -> assert false) | _ -> failwith "seb2mse: received a non-atomic seb" |