From af0a04b8e16c2554e0c747da6d625799b332f5fe Mon Sep 17 00:00:00 2001
From: Gaëtan Gilbert <gaetan.gilbert@skyskimmer.net>
Date: Wed, 11 Oct 2017 19:41:23 +0200
Subject: Remove Sorts.contents

---
 kernel/sorts.ml | 57 +++++++++++++++++++++++++--------------------------------
 1 file changed, 25 insertions(+), 32 deletions(-)

(limited to 'kernel/sorts.ml')

diff --git a/kernel/sorts.ml b/kernel/sorts.ml
index daeb90be7..a7bb08f5b 100644
--- a/kernel/sorts.ml
+++ b/kernel/sorts.ml
@@ -10,22 +10,21 @@
 
 open Univ
 
-type contents = Pos | Null
-
 type family = InProp | InSet | InType
 
 type t =
-  | Prop of contents                      (* proposition types *)
+  | Prop
+  | Set
   | Type of Universe.t
 
-let prop = Prop Null
-let set = Prop Pos
+let prop = Prop
+let set = Set
 let type1 = Type type1_univ
 
 let univ_of_sort = function
   | Type u -> u
-  | Prop Pos -> Universe.type0
-  | Prop Null -> Universe.type0m
+  | Set -> Universe.type0
+  | Prop -> Universe.type0m
 
 let sort_of_univ u =
   if is_type0m_univ u then prop
@@ -34,36 +33,34 @@ let sort_of_univ u =
 
 let compare s1 s2 =
   if s1 == s2 then 0 else
-  match s1, s2 with
-  | Prop c1, Prop c2 ->
-    begin match c1, c2 with
-    | Pos, Pos | Null, Null -> 0
-    | Pos, Null -> -1
-    | Null, Pos -> 1
-    end
-  | Type u1, Type u2 -> Universe.compare u1 u2
-  | Prop _, Type _ -> -1
-  | Type _, Prop _ -> 1
+    match s1, s2 with
+    | Prop, Prop -> 0
+    | Prop, _ -> -1
+    | Set, Prop -> 1
+    | Set, Set -> 0
+    | Set, _ -> -1
+    | Type u1, Type u2 -> Universe.compare u1 u2
+    | Type _, _ -> -1
 
 let equal s1 s2 = Int.equal (compare s1 s2) 0
 
 let is_prop = function
-  | Prop Null -> true
+  | Prop -> true
   | Type u when Universe.equal Universe.type0m u -> true
   | _ -> false
 
 let is_set = function
-  | Prop Pos -> true
+  | Set -> true
   | Type u when Universe.equal Universe.type0 u -> true
   | _ -> false
 
 let is_small = function
-  | Prop _ -> true
+  | Prop | Set -> true
   | Type u -> is_small_univ u
 
 let family = function
-  | Prop Null -> InProp
-  | Prop Pos -> InSet
+  | Prop -> InProp
+  | Set -> InSet
   | Type u when is_type0m_univ u -> InProp
   | Type u when is_type0_univ u -> InSet
   | Type _ -> InType
@@ -73,15 +70,11 @@ let family_equal = (==)
 open Hashset.Combine
 
 let hash = function
-| Prop p ->
-  let h = match p with
-  | Pos -> 0
-  | Null -> 1
-  in
-  combinesmall 1 h
-| Type u ->
- let h = Univ.Universe.hash u in
-  combinesmall 2 h
+  | Prop -> combinesmall 1 0
+  | Set -> combinesmall 1 1
+  | Type u ->
+    let h = Univ.Universe.hash u in
+    combinesmall 2 h
 
 module List = struct
   let mem = List.memq
@@ -101,7 +94,7 @@ module Hsorts =
 	    if u' == u then c else Type u'
         | s -> s
       let eq s1 s2 = match (s1,s2) with
-        | (Prop c1, Prop c2) -> c1 == c2
+        | Prop, Prop | Set, Set -> true
         | (Type u1, Type u2) -> u1 == u2
         |_ -> false
 
-- 
cgit v1.2.3