From da7787ff4f1b5192b5465ca17ece64f5ebd4f72a Mon Sep 17 00:00:00 2001
From: Pierre Roux
Date: Tue, 20 Oct 2020 19:07:22 +0200
Subject: Allow multiple primitive notation on the same scope and triggers

Until now, declaring a number or string notation on some trigger
removed all previous notations on the same scope.

Bug discovered by Jason Gross while reviewing #12218.
---
 test-suite/output/StringSyntax.out |  6 ++++++
 test-suite/output/StringSyntax.v   | 20 ++++++++++++++++++++
 2 files changed, 26 insertions(+)

(limited to 'test-suite')

diff --git a/test-suite/output/StringSyntax.out b/test-suite/output/StringSyntax.out
index 125c1bc927..68ee7cfeb5 100644
--- a/test-suite/output/StringSyntax.out
+++ b/test-suite/output/StringSyntax.out
@@ -1096,3 +1096,9 @@ Expects a single character or a three-digit ASCII code.
      : nat
 The command has indeed failed with message:
 Expects a single character or a three-digit ASCII code.
+"abc"
+     : string2
+"abc" : string2
+     : string2
+"abc" : string1
+     : string1
diff --git a/test-suite/output/StringSyntax.v b/test-suite/output/StringSyntax.v
index 49584487a3..a1ffe69527 100644
--- a/test-suite/output/StringSyntax.v
+++ b/test-suite/output/StringSyntax.v
@@ -95,3 +95,23 @@ Check "255".
 Fail Check "256".
 
 End Test3.
+
+(* Test overlapping string notations *)
+Module Test4.
+
+Notation string1 := (list Byte.byte).
+Definition id_string1 := @id string1.
+
+String Notation string1 id_string1 id_string1 : list_scope.
+
+Notation string2 := (list Ascii.ascii).
+Definition a2b := List.map byte_of_ascii.
+Definition b2a := List.map ascii_of_byte.
+
+String Notation string2 b2a a2b : list_scope.
+
+Check "abc"%list.
+Check ["a";"b";"c"]%char%list : string2.
+Check ["a";"b";"c"]%byte%list : string1.
+
+End Test4.
-- 
cgit v1.2.3