Merging a branch that adds "Context.Named.Declaration.to_rel" function.

2 files changed, 13 insertions, 2 deletions

diff --git a/kernel/context.ml b/kernel/context.ml
index 269bf2143..43be9fc4f 100644
--- a/kernel/context.ml
+++ b/kernel/context.ml
@@ -351,6 +351,12 @@ struct
           LocalAssum (f na, t)
       | Rel.Declaration.LocalDef (na,v,t) ->
           LocalDef (f na, v, t)
+            
+    let to_rel = function
+      | LocalAssum (id,t) ->
+          Rel.Declaration.LocalAssum (Name id, t)
+      | LocalDef (id,v,t) ->
+          Rel.Declaration.LocalDef (Name id,v,t)
   end
 
   (** Named-context is represented as a list of declarations.
@@ -404,7 +410,7 @@ struct
       | _ -> None
     in
     List.map_filter filter
-  end
+end
 
 module NamedList =
   struct
diff --git a/kernel/context.mli b/kernel/context.mli
index b8a7bf6a3..7c652ac5c 100644
--- a/kernel/context.mli
+++ b/kernel/context.mli
@@ -197,8 +197,13 @@ sig
     val to_tuple : t -> Id.t * Constr.t option * Constr.t
     val of_tuple : Id.t * Constr.t option * Constr.t -> t
 
-    (** Convert [Rel.Declaration.t] value to the corresponding [Named.Declaration.t] value. *)
+    (** Convert [Rel.Declaration.t] value to the corresponding [Named.Declaration.t] value.
+        The function provided as the first parameter determines how to translate "names" to "ids". *)
     val of_rel : (Name.t -> Id.t) -> Rel.Declaration.t -> t
+
+    (** Convert [Named.Declaration.t] value to the corresponding [Rel.Declaration.t] value. *)
+    (* TODO: Move this function to [Rel.Declaration] module and rename it to [of_named]. *)
+    val to_rel : t -> Rel.Declaration.t
   end
 
   (** Rel-context is represented as a list of declarations.