From 49c4c49a402c6ec826a506903fcfab1bbd96e080 Mon Sep 17 00:00:00 2001
From: ppedrot
Date: Mon, 26 Nov 2012 15:52:30 +0000
Subject: Removed some FIXME related to equality on universes.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@16007 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 pretyping/coercion.ml | 2 +-
 pretyping/evd.ml      | 6 +++---
 pretyping/termops.ml  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'pretyping')

diff --git a/pretyping/coercion.ml b/pretyping/coercion.ml
index ff4d2837b4..888e4e388b 100644
--- a/pretyping/coercion.ml
+++ b/pretyping/coercion.ml
@@ -171,7 +171,7 @@ and coerce loc env isevars (x : Term.constr) (y : Term.constr)
 	  (match s, s' with
 	   Prop x, Prop y when x == y -> None
 	   | Prop _, Type _ -> None
-	   | Type x, Type y when Pervasives.(=) x y -> None (* false *) (** FIXME **)
+	   | Type x, Type y when Univ.Universe.equal x y -> None (* false *)
 	   | _ -> subco ())
       | Prod (name, a, b), Prod (name', a', b') ->
 	  let name' = Name (Namegen.next_ident_away (id_of_string "x") (Termops.ids_of_context env)) in
diff --git a/pretyping/evd.ml b/pretyping/evd.ml
index 1c9573ca31..8849f17699 100644
--- a/pretyping/evd.ml
+++ b/pretyping/evd.ml
@@ -514,15 +514,15 @@ let univ_of_sort = function
   | Prop Null -> Univ.type0m_univ
 
 let is_eq_sort s1 s2 =
-  if Pervasives.(=) s1 s2 then None (* FIXME *)
+  if Int.equal (sorts_ord s1 s2) 0 then None (* FIXME *)
   else
     let u1 = univ_of_sort s1
     and u2 = univ_of_sort s2 in
-      if Pervasives.(=) u1 u2 then None (* FIXME *)
+      if Univ.Universe.equal u1 u2 then None
       else Some (u1, u2)
 
 let is_univ_var_or_set u =
-  Univ.is_univ_variable u || Pervasives.(=) u Univ.type0_univ (** FIXME *)
+  Univ.is_univ_variable u || Univ.is_type0_univ u
 
 let set_leq_sort ({evars = (sigma, (us, sm))} as d) s1 s2 =
   match is_eq_sort s1 s2 with
diff --git a/pretyping/termops.ml b/pretyping/termops.ml
index c9a6d0b5b6..973f85818c 100644
--- a/pretyping/termops.ml
+++ b/pretyping/termops.ml
@@ -161,7 +161,7 @@ let new_Type_sort () = Type (new_univ ())
 let refresh_universes_gen strict t =
   let modified = ref false in
   let rec refresh t = match kind_of_term t with
-    | Sort (Type u) when strict || Pervasives.(<>) u Univ.type0m_univ -> (** FIXME *)
+    | Sort (Type u) when strict || not (Univ.is_type0m_univ u) ->
 	modified := true; new_Type ()
     | Prod (na,u,v) -> mkProd (na,u,refresh v)
     | _ -> t in
-- 
cgit v1.2.3