- Fixing #2090 (occur check missing when trying to solve evar-evar equation).

- Adding test file related to commit 12080 (bug #2091).
- Cleaning old parsing stuff from 8.0.
- Support for camlp5 in base_include.



git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@12106 85f007b7-540e-0410-9357-904b9bb8a0f7

3 files changed, 14 insertions, 2 deletions

diff --git a/test-suite/output/Notations2.out b/test-suite/output/Notations2.out
index 8a18a9d855..aca872970c 100644
--- a/test-suite/output/Notations2.out
+++ b/test-suite/output/Notations2.out
@@ -1,2 +1,4 @@
 2 3
      : PAIR
+forall (A : Set) (le : A -> A -> Prop) (x y : A), le x y \/ le y x
+     : Prop
diff --git a/test-suite/output/Notations2.v b/test-suite/output/Notations2.v
index 039771d5d5..0d5cc9e24c 100644
--- a/test-suite/output/Notations2.v
+++ b/test-suite/output/Notations2.v
@@ -5,3 +5,7 @@
 Inductive PAIR := P (n1:nat) (n2:nat).
 Coercion P : nat >-> Funclass.
 Check (2 3).
+
+(* Test bug #2091 (variable le was printed using <= !) *)
+
+Check forall (A: Set) (le: A -> A -> Prop) (x y: A), le x y \/ le y x.
diff --git a/test-suite/success/evars.v b/test-suite/success/evars.v
index e3a6e4188b..6764cfa357 100644
--- a/test-suite/success/evars.v
+++ b/test-suite/success/evars.v
@@ -198,7 +198,6 @@ Goal forall x : nat, F1 x -> G1 x.
 refine (fun x H => proj2 (_ x H) _).
 Abort.
 
-
 (* An example from y-not that was failing in 8.2rc1 *)
 
 Fixpoint filter (A:nat->Set) (l:list (sigT A)) : list (sigT A) := 
@@ -207,7 +206,14 @@ Fixpoint filter (A:nat->Set) (l:list (sigT A)) : list (sigT A) :=
   | (existT k v)::l' => (existT _ k v):: (filter A l')
   end.
 
-(* Remark: the following example does not succeed any longer in 8.2 because,
+(* Bug #2000: used to raise Out of memory in 8.2 while it should fail by
+   lack of information on the conclusion of the type of j *)
+
+Goal True.
+set (p:=fun j => j (or_intror _ (fun a:True => j (or_introl _ a)))) || idtac.
+Abort.
+
+(* remark: the following example does not succeed any longer in 8.2 because,
    the algorithm is more general and does exclude a solution that it should
    exclude for typing reason. Handling of types and backtracking is still to
    be done