From 4c39126f0a0a97152f67a3a5e7c86db860f48e39 Mon Sep 17 00:00:00 2001
From: Pierre Roux
Date: Fri, 24 Apr 2020 21:52:37 +0200
Subject: Fix #12159 (Numeral Notations do not play well with multiple scopes
 for the same inductive)

Numeral Notations now play better with multiple scopes for the same
inductive. Previously, when multiple numeral notations where defined
for the same inductive, only the last one was considered for
printing. Now, we proceed as follows
1. keep only uninterpreters that produce an output (first
   List.map_filter)
2. keep only uninterpretation for scopes that either have a scope
   delimiter or are open (second List.map_filter)
3. the final selection is made according to the order of open scopes,
   (find_uninterpretation) or or according to the last defined
   notation if no appropriate scope is open (head of list at the end)
---
 plugins/ssr/ssrparser.mlg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/ssr/ssrparser.mlg b/plugins/ssr/ssrparser.mlg
index 442b40221b..9c83f9fa4e 100644
--- a/plugins/ssr/ssrparser.mlg
+++ b/plugins/ssr/ssrparser.mlg
@@ -349,8 +349,8 @@ let interp_index ist gl idx =
         begin match Tacinterp.Value.to_constr v with
         | Some c ->
           let rc = Detyping.detype Detyping.Now false Id.Set.empty (pf_env gl) (project gl) c in
-          begin match Notation.uninterp_prim_token rc with
-          | _, Constrexpr.Numeral n when NumTok.Signed.is_int n ->
+          begin match Notation.uninterp_prim_token rc (None, []) with
+          | Constrexpr.Numeral n, _ when NumTok.Signed.is_int n ->
             int_of_string (NumTok.Signed.to_string n)
           | _ -> raise Not_found
           end
-- 
cgit v1.2.3