From b6e796a8ef956fa25bfeba84545f25b2cfb3aaf9 Mon Sep 17 00:00:00 2001
From: Pierre-Marie Pédrot
Date: Tue, 3 May 2016 15:06:11 +0200
Subject: Fix bug #3825: Universe annotations on notations should pass through
 or be rejected.

---
 interp/constrintern.ml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'interp')

diff --git a/interp/constrintern.ml b/interp/constrintern.ml
index a7b1bb4128..ead68bd92f 100644
--- a/interp/constrintern.ml
+++ b/interp/constrintern.ml
@@ -767,7 +767,15 @@ let intern_qualid loc qid intern env lvar us args =
       let subst = (terms, Id.Map.empty, Id.Map.empty) in
       let infos = (Id.Map.empty, env) in
       let projapp = match c with NRef _ -> true | _ -> false in
-	subst_aconstr_in_glob_constr loc intern lvar subst infos c, projapp, args2
+      let c = subst_aconstr_in_glob_constr loc intern lvar subst infos c in
+      let c = match us, c with
+      | None, _ -> c
+      | Some _, GRef (loc, ref, None) -> GRef (loc, ref, us)
+      | Some _, _ ->
+        user_err_loc (loc, "", str "Notation " ++ pr_qualid qid ++
+          str " cannot have a universe instance")
+      in
+      c, projapp, args2
 
 (* Rule out section vars since these should have been found by intern_var *)
 let intern_non_secvar_qualid loc qid intern env lvar us args =
-- 
cgit v1.2.3