From 7d4d30ab00ded50e4c15c1b078044ea10dfb2fc1 Mon Sep 17 00:00:00 2001 From: Gaƫtan Gilbert Date: Wed, 19 Sep 2018 23:07:00 +0200 Subject: Remove hash based univ level compare --- kernel/univ.ml | 9 +-------- test-suite/output/UnivBinders.out | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/kernel/univ.ml b/kernel/univ.ml index 8acbeb2d25..3e1f8f2cab 100644 --- a/kernel/univ.ml +++ b/kernel/univ.ml @@ -159,13 +159,6 @@ module Level = struct | _ -> false let compare u v = - if u == v then 0 - else - let c = Int.compare (hash u) (hash v) in - if c == 0 then RawLevel.compare (data u) (data v) - else c - - let natural_compare u v = if u == v then 0 else RawLevel.compare (data u) (data v) @@ -1056,7 +1049,7 @@ struct (univs, cst) let sort_levels a = - Array.sort Level.natural_compare a; a + Array.sort Level.compare a; a let to_context (ctx, cst) = (Instance.of_array (sort_levels (Array.of_list (LSet.elements ctx))), cst) diff --git a/test-suite/output/UnivBinders.out b/test-suite/output/UnivBinders.out index 01eff57299..f8f11d7cf6 100644 --- a/test-suite/output/UnivBinders.out +++ b/test-suite/output/UnivBinders.out @@ -125,7 +125,7 @@ bind_univs.poly@{u} = Type@{u} bind_univs.poly is universe polymorphic insec@{v} = Type@{u} -> Type@{v} - : Type@{max(v+1,u+1)} + : Type@{max(u+1,v+1)} (* v |= *) insec is universe polymorphic -- cgit v1.2.3