1 files changed, 14 insertions, 18 deletions
diff --git a/test-suite/success/Case6.v b/test-suite/success/Case6.v
index a262251e..cc1994e7 100644
--- a/test-suite/success/Case6.v
+++ b/test-suite/success/Case6.v
@@ -1,19 +1,15 @@
-Parameter ff: (n,m:nat)~n=m -> ~(S n)=(S m).
-Parameter discr_r : (n:nat) ~(O=(S n)).
-Parameter discr_l : (n:nat) ~((S n)=O).
-
-Fixpoint eqdec [n:nat] : (m:nat) n=m \/ ~n=m := 
-[m:nat]
- <[n,m:nat] n=m \/ ~n=m>Cases n m of
-      O   O   => (or_introl ? ~O=O (refl_equal ? O))
-
-   |  O (S x) => (or_intror O=(S x) ? (discr_r x))
-
-   | (S x) O  => (or_intror ? ~(S x)=O (discr_l x))
-
-   | ((S x) as N) ((S y) as M) =>  
-      <N=M\/~N=M>Cases (eqdec x y) of
-        (or_introl h) => (or_introl  ? ~N=M (f_equal nat nat S x y h))
-      | (or_intror h) => (or_intror N=M ? (ff x y h))   
+Parameter ff : forall n m : nat, n <> m -> S n <> S m.
+Parameter discr_r : forall n : nat, 0 <> S n.
+Parameter discr_l : forall n : nat, S n <> 0.
+
+Fixpoint eqdec (n m : nat) {struct n} : n = m \/ n <> m :=
+  match n, m return (n = m \/ n <> m) with
+  | O, O => or_introl (0 <> 0) (refl_equal 0)
+  | O, S x => or_intror (0 = S x) (discr_r x)
+  | S x, O => or_intror _ (discr_l x)
+  | S x as N, S y as M =>
+      match eqdec x y return (N = M \/ N <> M) with
+      | or_introl h => or_introl (N <> M) (f_equal S h)
+      | or_intror h => or_intror (N = M) (ff x y h)
       end
- end.
+  end.