Imported Upstream version 8.4dfsgupstream/8.4dfsg

3 files changed, 21 insertions, 7 deletions

diff --git a/test-suite/output/Notations.out b/test-suite/output/Notations.out
index ada524f1..beba8df9 100644
--- a/test-suite/output/Notations.out
+++ b/test-suite/output/Notations.out
@@ -122,3 +122,8 @@ fun x : option Z => match x with
      : option Z -> Z
 s
      : s
+Identifier 'foo' now a keyword
+10
+     : nat
+fun _ : nat => 9
+     : nat -> nat
diff --git a/test-suite/output/Notations.v b/test-suite/output/Notations.v
index 4a2c411e..52f499ab 100644
--- a/test-suite/output/Notations.v
+++ b/test-suite/output/Notations.v
@@ -253,3 +253,12 @@ Check (fun x => match x with SOME3 x => x | NONE3 => 0 end).
 
 Notation s := Type.
 Check s.
+
+(* Test bug #2835: notations were not uniformly managed under prod and lambda *)
+
+Open Scope nat_scope.
+
+Notation "'foo' n" := (S n) (at level 50): nat_scope.
+
+Check (foo 9).
+Check (fun _ : nat => 9).
diff --git a/test-suite/output/ZSyntax.out b/test-suite/output/ZSyntax.out
index 1b7a2903..dc41b0aa 100644
--- a/test-suite/output/ZSyntax.out
+++ b/test-suite/output/ZSyntax.out
@@ -2,19 +2,19 @@
      : Z
 fun f : nat -> Z => (f 0%nat + 0)%Z
      : (nat -> Z) -> Z
-fun x : positive => Zpos x~0
+fun x : positive => Z.pos x~0
      : positive -> Z
-fun x : positive => (Zpos x + 1)%Z
+fun x : positive => (Z.pos x + 1)%Z
      : positive -> Z
-fun x : positive => Zpos x
+fun x : positive => Z.pos x
      : positive -> Z
-fun x : positive => Zneg x~0
+fun x : positive => Z.neg x~0
      : positive -> Z
-fun x : positive => (Zpos x~0 + 0)%Z
+fun x : positive => (Z.pos x~0 + 0)%Z
      : positive -> Z
-fun x : positive => (- Zpos x~0)%Z
+fun x : positive => (- Z.pos x~0)%Z
      : positive -> Z
-fun x : positive => (- Zpos x~0 + 0)%Z
+fun x : positive => (- Z.pos x~0 + 0)%Z
      : positive -> Z
 (Z.of_nat 0 + 1)%Z
      : Z