From b623017fea475b7b91c99f462b0fe2458bfe91e7 Mon Sep 17 00:00:00 2001
From: Emilio Jesus Gallego Arias
Date: Tue, 24 Mar 2020 23:52:31 -0400
Subject: [declare] make restrict_ucontext an optional parameter.

The current API does just exist as a workaround for a bug.
---
 vernac/declareDef.ml  | 4 ++--
 vernac/declareDef.mli | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/vernac/declareDef.ml b/vernac/declareDef.ml
index 6e19cf97b0..fc53abdcea 100644
--- a/vernac/declareDef.ml
+++ b/vernac/declareDef.ml
@@ -95,11 +95,11 @@ module Recthm = struct
     }
 end
 
-let declare_mutually_recursive ~opaque ~scope ~kind ~poly ~uctx ~udecl ~ntns ~rec_declaration ~possible_indexes ~restrict_ucontext fixitems =
+let declare_mutually_recursive ~opaque ~scope ~kind ~poly ~uctx ~udecl ~ntns ~rec_declaration ~possible_indexes ?(restrict_ucontext=true) fixitems =
   let vars, fixdecls, indexes =
     mutual_make_bodies ~fixitems ~rec_declaration ~possible_indexes in
   let ubind, univs =
-    (* XXX: Note that obligations don't do this, is that a bug? *)
+    (* XXX: Obligations don't do this, this seems like a bug? *)
     if restrict_ucontext
     then
       let evd = Evd.from_ctx uctx in
diff --git a/vernac/declareDef.mli b/vernac/declareDef.mli
index 995aa0ceff..1d7fd3a3bf 100644
--- a/vernac/declareDef.mli
+++ b/vernac/declareDef.mli
@@ -82,7 +82,9 @@ val declare_mutually_recursive
   -> ntns:Vernacexpr.decl_notation list
   -> rec_declaration:Constr.rec_declaration
   -> possible_indexes:int list list option
-  -> restrict_ucontext:bool
+  -> ?restrict_ucontext:bool
+  (** XXX: restrict_ucontext should be always true, this seems like a
+     bug in obligations, so this parameter should go away *)
   -> Recthm.t list
   -> Names.GlobRef.t list
 
-- 
cgit v1.2.3