From 9aefd708109658a8a17412e1fd7cc95bff454050 Mon Sep 17 00:00:00 2001
From: Hugo Herbelin
Date: Mon, 30 Dec 2019 17:18:33 +0100
Subject: If a custom entry has global, an argument-free abbreviation is valid
 in this entry.

Parsing was automatically supporting this. This commit adds support for printing.

Note: It would be more delicate to recognize that some given entry
support applicative nodes hence abbreviations with arguments.
---
 interp/constrextern.ml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'interp/constrextern.ml')

diff --git a/interp/constrextern.ml b/interp/constrextern.ml
index 0c29806774..0396e556cf 100644
--- a/interp/constrextern.ml
+++ b/interp/constrextern.ml
@@ -615,6 +615,10 @@ let is_projection nargs r =
 
 let is_hole = function CHole _ | CEvar _ -> true | _ -> false
 
+let isCRef_no_univ = function
+  | CRef (_,None) -> true
+  | _ -> false
+
 let is_significant_implicit a =
   not (is_hole (a.CAst.v))
 
@@ -1284,9 +1288,6 @@ and extern_notation (custom,scopes as allscopes) vars t rules =
                   let args = extern_args (extern true) vars args in
                   CAst.make ?loc @@ extern_applied_notation nallargs argsimpls c args)
           | SynDefRule kn ->
-             match availability_of_entry_coercion custom InConstrEntrySomeLevel with
-             | None -> raise No_match
-             | Some coercion ->
               let l =
                 List.map (fun (c,(subentry,(scopt,scl))) ->
                   extern true (subentry,(scopt,scl@snd scopes)) vars c)
@@ -1296,7 +1297,10 @@ and extern_notation (custom,scopes as allscopes) vars t rules =
               let args = fill_arg_scopes args argsscopes allscopes in
               let args = extern_args (extern true) vars args in
               let c = CAst.make ?loc @@ extern_applied_syntactic_definition nallargs argsimpls (a,cf) l args in
-              insert_entry_coercion coercion c
+              if isCRef_no_univ c.CAst.v && entry_has_global custom then c
+             else match availability_of_entry_coercion custom InConstrEntrySomeLevel with
+             | None -> raise No_match
+             | Some coercion -> insert_entry_coercion coercion c
       with
           No_match -> extern_notation allscopes vars t rules
 
-- 
cgit v1.2.3