From c4d3daaeb75a746b2a2717d2aaf21a65ebcc7775 Mon Sep 17 00:00:00 2001
From: Hugo Herbelin
Date: Wed, 10 Oct 2018 14:26:12 +0200
Subject: Adding a functional version of constant_of_delta_kn.

---
 kernel/safe_typing.ml  |  6 ++++++
 kernel/safe_typing.mli |  3 +++
 library/global.ml      | 12 ++----------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/kernel/safe_typing.ml b/kernel/safe_typing.ml
index 820c5b3a2b..625b7e5073 100644
--- a/kernel/safe_typing.ml
+++ b/kernel/safe_typing.ml
@@ -168,6 +168,12 @@ let is_initial senv =
 
 let delta_of_senv senv = senv.modresolver,senv.paramresolver
 
+let constant_of_delta_kn_senv senv kn =
+  Mod_subst.constant_of_deltas_kn senv.paramresolver senv.modresolver kn
+
+let mind_of_delta_kn_senv senv kn =
+  Mod_subst.mind_of_deltas_kn senv.paramresolver senv.modresolver kn
+
 (** The safe_environment state monad *)
 
 type safe_transformer0 = safe_environment -> safe_environment
diff --git a/kernel/safe_typing.mli b/kernel/safe_typing.mli
index 0f150ea971..26fa91adbd 100644
--- a/kernel/safe_typing.mli
+++ b/kernel/safe_typing.mli
@@ -204,6 +204,9 @@ val exists_objlabel : Label.t -> safe_environment -> bool
 val delta_of_senv :
   safe_environment -> Mod_subst.delta_resolver * Mod_subst.delta_resolver
 
+val constant_of_delta_kn_senv : safe_environment -> KerName.t -> Constant.t
+val mind_of_delta_kn_senv : safe_environment -> KerName.t -> MutInd.t
+
 (** {6 Retroknowledge / Native compiler } *)
 
 open Retroknowledge
diff --git a/library/global.ml b/library/global.ml
index 0e236e6d34..53a72a4e49 100644
--- a/library/global.ml
+++ b/library/global.ml
@@ -147,18 +147,10 @@ let body_of_constant cst = body_of_constant_body (lookup_constant cst)
 (** Operations on kernel names *)
 
 let constant_of_delta_kn kn =
-  let resolver,resolver_param = Safe_typing.delta_of_senv (safe_env ())
-  in
-  (* TODO : are resolver and resolver_param orthogonal ?
-     the effect of resolver is lost if resolver_param isn't
-     trivial at that spot. *)
-  Mod_subst.constant_of_deltas_kn resolver_param resolver kn
+  Safe_typing.constant_of_delta_kn_senv (safe_env ()) kn
 
 let mind_of_delta_kn kn =
-  let resolver,resolver_param = Safe_typing.delta_of_senv (safe_env ())
-  in
-  (* TODO idem *)
-  Mod_subst.mind_of_deltas_kn resolver_param resolver kn
+  Safe_typing.mind_of_delta_kn_senv (safe_env ()) kn
 
 (** Operations on libraries *)
 
-- 
cgit v1.2.3