From 69a3d310349eb3697b037cb4c8637cec408802ee Mon Sep 17 00:00:00 2001
From: Hugo Herbelin
Date: Mon, 13 Jul 2020 10:42:37 +0200
Subject: Propagating scope information in indirect application to a reference.

This allows the following to interpret "0" in the expected scope:

Notation "0" := true : bool_scope.
Axiom f : bool -> bool -> nat.
Record R := { p : bool -> nat }.
Check (@f 0) 0.
Check fun r => r.(@p) 0.
---
 interp/constrintern.ml          | 10 +++++++---
 test-suite/success/Notations2.v |  4 ++--
 test-suite/success/Scopes.v     | 12 ++++++++++++
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/interp/constrintern.ml b/interp/constrintern.ml
index 06cf19b4f7..28bb7ee506 100644
--- a/interp/constrintern.ml
+++ b/interp/constrintern.ml
@@ -2092,9 +2092,13 @@ let internalize globalenv env pattern_mode (_, ntnvars as lvar) c =
           assert (Option.is_empty isproj);
           let c = intern_notation intern env ntnvars loc ntn ntnargs in
           find_appl_head_data c, args
-        | _ -> assert (Option.is_empty isproj); (intern_no_implicit env f,[],[]), args in
-      apply_impargs c env impargs args_scopes
-        args loc
+        | _ ->
+           assert (Option.is_empty isproj);
+           let f = intern_no_implicit env f in
+           let f, _, args_scopes = find_appl_head_data f in
+           (f,[],args_scopes), args
+      in
+      apply_impargs c env impargs args_scopes args loc
 
     | CRecord fs ->
        let st = Evar_kinds.Define (not (Program.get_proofs_transparency ())) in
diff --git a/test-suite/success/Notations2.v b/test-suite/success/Notations2.v
index 382c252727..fb8bbfd043 100644
--- a/test-suite/success/Notations2.v
+++ b/test-suite/success/Notations2.v
@@ -51,8 +51,8 @@ Check fun A (x : prod' bool A) => match x with (@pair' _ 0) _ y 0%bool => 2 | _
 Notation c3 x := ((@pair') _ x).
 Check (@pair') _ 0%bool _ 0%bool 0%bool : prod' bool bool. (* @ is blocking implicit and scopes *)
 Check ((@pair') _ 0%bool) _ 0%bool 0%bool : prod' bool bool. (* parentheses and @ are blocking implicit and scopes *)
-Check c3 0 0 0 : prod' nat bool. (* First scope is blocked but not the last two scopes *)
-Check fun A (x :prod' nat A) => match x with c3 0 y 0 => 2 | _ => 1 end.
+Check c3 0 0 0 : prod' bool bool.
+Check fun A (x :prod' bool A) => match x with c3 0 y 0 => 2 | _ => 1 end.
 
 (* 4. Abbreviations do not stop implicit arguments to be inserted and scopes to be used *)
 (* unless an atomic @ is given *)
diff --git a/test-suite/success/Scopes.v b/test-suite/success/Scopes.v
index 06697af901..8b7d239dcd 100644
--- a/test-suite/success/Scopes.v
+++ b/test-suite/success/Scopes.v
@@ -26,3 +26,15 @@ Definition c := ε : U.
 Goal True.
 assert (nat * nat).
 Abort.
+
+(* Check propagation of scopes in indirect applications to references *)
+
+Module PropagateIndirect.
+Notation "0" := true : bool_scope.
+
+Axiom f : bool -> bool -> nat.
+Check (@f 0) 0.
+
+Record R := { p : bool -> nat }.
+Check fun r => r.(@p) 0.
+End PropagateIndirect.
-- 
cgit v1.2.3


From 4a6a7ea381192d86dfb63d2dce37fcabad5e6a3b Mon Sep 17 00:00:00 2001
From: Hugo Herbelin
Date: Sat, 26 Sep 2020 21:22:56 +0200
Subject: Adding change log for #12685.

---
 .../12685-master+propagate-scope-in-indirect-applied-ref.rst        | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 doc/changelog/03-notations/12685-master+propagate-scope-in-indirect-applied-ref.rst

diff --git a/doc/changelog/03-notations/12685-master+propagate-scope-in-indirect-applied-ref.rst b/doc/changelog/03-notations/12685-master+propagate-scope-in-indirect-applied-ref.rst
new file mode 100644
index 0000000000..048835a0e9
--- /dev/null
+++ b/doc/changelog/03-notations/12685-master+propagate-scope-in-indirect-applied-ref.rst
@@ -0,0 +1,6 @@
+- **Changed:**
+  Scope information is propagated in indirect applications to a
+  reference prefixed with :g:`@@`; this covers for instance the case
+  :g:`r.(@@p) t` where scope information from :g:`p` is now taken into
+  account for interpreting :g:`t` (`#12685
+  <https://github.com/coq/coq/pull/12685>`_, by Hugo Herbelin).
-- 
cgit v1.2.3