Imported Upstream version 8.4pl3dfsgupstream/8.4pl3dfsg

4 files changed, 64 insertions, 0 deletions

diff --git a/test-suite/bugs/closed/3003.v b/test-suite/bugs/closed/3003.v
new file mode 100644
index 00000000..2f8bcdae
--- /dev/null
+++ b/test-suite/bugs/closed/3003.v
@@ -0,0 +1,12 @@
+(* This used to raise an anomaly in 8.4 and trunk up to 17 April 2013 *)
+
+Set Implicit Arguments.
+
+Inductive path (V : Type) (E : V -> V -> Type) (s : V) : V -> Type :=
+  | NoEdges : path E s s
+  | AddEdge : forall d d' : V, path E s d -> E d d' -> path E s d'.
+Inductive G_Vertex := G_v0 | G_v1.
+Inductive G_Edge : G_Vertex -> G_Vertex -> Set := G_e : G_Edge G_v0 G_v1.
+Goal forall x1 : G_Edge G_v1 G_v1, @AddEdge _ G_Edge G_v1 _ _ (NoEdges _ _) x1 = NoEdges _ _.
+intro x1.
+try destruct x1. (* now raises a typing error *)
diff --git a/test-suite/bugs/closed/3023.v b/test-suite/bugs/closed/3023.v
new file mode 100644
index 00000000..ed489511
--- /dev/null
+++ b/test-suite/bugs/closed/3023.v
@@ -0,0 +1,31 @@
+(* Checking use of eta on Flexible/Rigid and SemiFlexible/Rigid unif problems *)
+
+Set Implicit Arguments.
+Generalizable All Variables.
+
+Record Category {obj : Type} :=
+  {
+    Morphism : obj -> obj -> Type;
+
+    Identity : forall x, Morphism x x;
+    Compose : forall s d d', Morphism d d' -> Morphism s d -> Morphism s d';
+    LeftIdentity : forall a b (f : Morphism a b), Compose (Identity b) f = f
+  }.
+
+
+Section DiscreteAdjoints.
+  Let C := {|
+            Morphism := (fun X Y : Type => X -> Y);
+            Identity := (fun X : Type => (fun x : X => x));
+            Compose := (fun _ _ _ f g => (fun x => f (g x)));
+            LeftIdentity := (fun X Y p => @eq_refl _ p : (fun x : X => p x) = p)
+          |}.
+  Variable ObjectFunctor : C = C.
+
+  Goal True.
+  Proof.
+    subst C.
+    revert ObjectFunctor.
+    intro ObjectFunctor.
+    simpl in ObjectFunctor.
+    revert ObjectFunctor. (* Used to failed in 8.4 up to 16 April 2013 *)
diff --git a/test-suite/bugs/closed/shouldsucceed/2230.v b/test-suite/bugs/closed/shouldsucceed/2230.v
new file mode 100644
index 00000000..5076fb2b
--- /dev/null
+++ b/test-suite/bugs/closed/shouldsucceed/2230.v
@@ -0,0 +1,6 @@
+Goal forall f, f 1 1 -> True.
+intros.
+match goal with
+  | [ H : _ ?a |- _ ] => idtac
+end.
+Abort.
diff --git a/test-suite/bugs/closed/shouldsucceed/2837.v b/test-suite/bugs/closed/shouldsucceed/2837.v
new file mode 100644
index 00000000..5d984463
--- /dev/null
+++ b/test-suite/bugs/closed/shouldsucceed/2837.v
@@ -0,0 +1,15 @@
+Require Import JMeq.
+
+Axiom test : forall n m : nat, JMeq n m.
+
+Goal forall n m : nat, JMeq n m.
+
+(* I) with no intros nor variable hints, this should produce a regular error
+      instead of Uncaught exception Failure("nth"). *)
+Fail rewrite test.
+
+(* II) with intros but indication of variables, still an error *)
+Fail (intros; rewrite test).
+
+(* III) a working variant: *)
+intros; rewrite (test n m).
\ No newline at end of file