From 26f216653aed171a70513d3f5ece059ab30bcd73 Mon Sep 17 00:00:00 2001
From: Hugo Herbelin
Date: Wed, 4 Oct 2017 23:55:54 +0200
Subject: Fixing #5762 (supporting imp. args. in "where" clause of an inductive
 def.).

This allows e.g. the following to work:

Reserved Notation "* a" (at level 70).
Inductive P {n : nat} : nat -> Prop := c m : *m where "* m" := (P m).

We seize this opportunity to make main calls to Metasyntax to depend
on an arbitrary env rather than on Global.env.

Incidentally, this fixes a little coqdoc bug in classifying the
inductive type referred to in the "where" clause.
---
 interp/constrintern.ml  | 4 +---
 interp/constrintern.mli | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'interp')

diff --git a/interp/constrintern.ml b/interp/constrintern.ml
index 6f7c6c8277..d19f3b7f65 100644
--- a/interp/constrintern.ml
+++ b/interp/constrintern.ml
@@ -2133,8 +2133,7 @@ let intern_constr_pattern env ?(as_type=false) ?(ltacvars=empty_ltac_sign) c =
             ~pattern_mode:true ~ltacvars env c in
   pattern_of_glob_constr c
 
-let interp_notation_constr ?(impls=empty_internalization_env) nenv a =
-  let env = Global.env () in
+let interp_notation_constr env ?(impls=empty_internalization_env) nenv a =
   (* [vl] is intended to remember the scope of the free variables of [a] *)
   let vl = Id.Map.map (fun typ -> (ref true, ref None, typ)) nenv.ninterp_var_type in
   let c = internalize (Global.env()) {ids = extract_ids env; unb = false;
@@ -2213,4 +2212,3 @@ let interp_context_evars ?(global_level=false) ?(impl_env=empty_internalization_
   let int_env,bl = intern_context global_level env impl_env params in
   let x = interp_glob_context_evars env evdref shift bl in
   int_env, x
-
diff --git a/interp/constrintern.mli b/interp/constrintern.mli
index 0a4eaf8382..75e99dd9b1 100644
--- a/interp/constrintern.mli
+++ b/interp/constrintern.mli
@@ -182,7 +182,7 @@ val global_reference_in_absolute_module : DirPath.t -> Id.t -> Globnames.global_
 
 (** Interprets a term as the left-hand side of a notation. The returned map is
     guaranteed to have the same domain as the input one. *)
-val interp_notation_constr : ?impls:internalization_env ->
+val interp_notation_constr : env -> ?impls:internalization_env ->
   notation_interp_env -> constr_expr ->
   (bool * subscopes * notation_var_internalization_type) Id.Map.t *
   notation_constr * reversibility_flag
-- 
cgit v1.2.3