diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/closure.ml | 17 | ||||
| -rw-r--r-- | kernel/mod_subst.ml | 2 | ||||
| -rw-r--r-- | kernel/names.ml | 108 | ||||
| -rw-r--r-- | kernel/names.mli | 4 | ||||
| -rw-r--r-- | kernel/univ.ml | 16 |
5 files changed, 100 insertions, 47 deletions
diff --git a/kernel/closure.ml b/kernel/closure.ml index 251c32ac5..51e264106 100644 --- a/kernel/closure.ml +++ b/kernel/closure.ml @@ -199,6 +199,15 @@ let unfold_red kn = type table_key = id_key +module IdKeyHash = +struct + type t = id_key + let equal = Names.eq_id_key + let hash = Hashtbl.hash +end + +module KeyTable = Hashtbl.Make(IdKeyHash) + let eq_table_key = Names.eq_id_key type 'a infos = { @@ -208,13 +217,13 @@ type 'a infos = { i_sigma : existential -> constr option; i_rels : int * (int * constr) list; i_vars : (identifier * constr) list; - i_tab : (table_key, 'a) Hashtbl.t } + i_tab : 'a KeyTable.t } let info_flags info = info.i_flags let ref_value_cache info ref = try - Some (Hashtbl.find info.i_tab ref) + Some (KeyTable.find info.i_tab ref) with Not_found -> try let body = @@ -225,7 +234,7 @@ let ref_value_cache info ref = | ConstKey cst -> constant_value info.i_env cst in let v = info.i_repr info body in - Hashtbl.add info.i_tab ref v; + KeyTable.add info.i_tab ref v; Some v with | Not_found (* List.assoc *) @@ -262,7 +271,7 @@ let create mk_cl flgs env evars = i_sigma = evars; i_rels = defined_rels flgs env; i_vars = defined_vars flgs env; - i_tab = Hashtbl.create 17 } + i_tab = KeyTable.create 17 } (**********************************************************************) diff --git a/kernel/mod_subst.ml b/kernel/mod_subst.ml index 8bd0a653c..f2511dbde 100644 --- a/kernel/mod_subst.ml +++ b/kernel/mod_subst.ml @@ -50,7 +50,7 @@ let empty_delta_resolver = Deltamap.empty module MBImap = Map.Make (struct type t = mod_bound_id - let compare = Pervasives.compare + let compare = mod_bound_id_ord end) module Umap = struct diff --git a/kernel/names.ml b/kernel/names.ml index 520a9aa64..cbd66e03d 100644 --- a/kernel/names.ml +++ b/kernel/names.ml @@ -42,10 +42,9 @@ let id_of_string s = let string_of_id id = String.copy id -let id_ord (x:string) (y:string) = - if x == y - then 0 - else Pervasives.compare x y +let id_ord (x : string) (y : string) = + (* String.compare already checks for pointer equality *) + String.compare x y module IdOrdered = struct @@ -81,6 +80,17 @@ type dir_path = module_ident list module ModIdmap = Idmap +let rec dir_path_ord (p1 : dir_path) (p2 : dir_path) = + if p1 == p2 then 0 + else begin match p1, p2 with + | [], [] -> 0 + | [], _ -> -1 + | _, [] -> 1 + | id1 :: p1, id2 :: p2 -> + let c = id_ord id1 id2 in + if c <> 0 then c else dir_path_ord p1 p2 + end + let make_dirpath x = x let repr_dirpath x = x @@ -102,15 +112,28 @@ let make_uid dir s = incr u_number;(!u_number,s,dir) let string_of_uid (i,s,p) = string_of_dirpath p ^"."^s -module Umap = Map.Make(struct - type t = uniq_ident - let compare x y = - if x == y - then 0 - else Pervasives.compare x y - end) +let uniq_ident_ord (x : uniq_ident) (y : uniq_ident) = + if x == y then 0 + else match (x, y) with + | (nl, idl, dpl), (nr, idr, dpr) -> + let ans = nl - nr in + if ans <> 0 then ans + else + let ans = id_ord idl idr in + if ans <> 0 then ans + else + dir_path_ord dpl dpr + +module UOrdered = +struct + type t = uniq_ident + let compare = uniq_ident_ord +end + +module Umap = Map.Make(UOrdered) type mod_bound_id = uniq_ident +let mod_bound_id_ord = uniq_ident_ord let make_mbid = make_uid let repr_mbid (n, id, dp) = (n, id, dp) let debug_string_of_mbid = debug_string_of_uid @@ -150,14 +173,19 @@ let rec string_of_mp = function (** we compare labels first if both are MPdots *) let rec mp_ord mp1 mp2 = if mp1 == mp2 then 0 - else match (mp1,mp2) with - MPdot(mp1,l1), MPdot(mp2,l2) -> - let c = Pervasives.compare l1 l2 in - if c<>0 then - c - else - mp_ord mp1 mp2 - | _,_ -> Pervasives.compare mp1 mp2 + else match (mp1, mp2) with + | MPfile p1, MPfile p2 -> + dir_path_ord p1 p2 + | MPbound id1, MPbound id2 -> + uniq_ident_ord id1 id2 + | MPdot (mp1, l1), MPdot (mp2, l2) -> + let c = String.compare l1 l2 in + if c <> 0 then c + else mp_ord mp1 mp2 + | MPfile _, _ -> -1 + | MPbound _, MPfile _ -> 1 + | MPbound _, MPdot _ -> -1 + | MPdot _, _ -> 1 module MPord = struct type t = module_path @@ -192,21 +220,17 @@ let string_of_kn (mp,dir,l) = let pr_kn kn = str (string_of_kn kn) -let kn_ord kn1 kn2 = - if kn1 == kn2 then - 0 +let kn_ord (kn1 : kernel_name) (kn2 : kernel_name) = + if kn1 == kn2 then 0 else - let mp1,dir1,l1 = kn1 in - let mp2,dir2,l2 = kn2 in - let c = Pervasives.compare l1 l2 in - if c <> 0 then - c + let mp1, dir1, l1 = kn1 in + let mp2, dir2, l2 = kn2 in + let c = String.compare l1 l2 in + if c <> 0 then c else - let c = Pervasives.compare dir1 dir2 in - if c<>0 then - c - else - MPord.compare mp1 mp2 + let c = dir_path_ord dir1 dir2 in + if c <> 0 then c + else MPord.compare mp1 mp2 module KNord = struct type t = kernel_name @@ -392,7 +416,7 @@ module Huniqid = Hashcons.Make( let hashcons (hid,hdir) (n,s,dir) = (n,hid s,hdir dir) let equal ((n1,s1,dir1) as x) ((n2,s2,dir2) as y) = (x == y) || - (n1 = n2 && s1 == s2 && dir1 == dir2) + (n1 - n2 = 0 && s1 == s2 && dir1 == dir2) let hash = Hashtbl.hash end) @@ -454,7 +478,7 @@ module Hconstruct = Hashcons.Make( type t = constructor type u = inductive -> inductive let hashcons hind (ind, j) = (hind ind, j) - let equal (ind1,j1) (ind2,j2) = ind1 == ind2 && j1 = j2 + let equal (ind1,j1) (ind2,j2) = ind1 == ind2 && (j1 - j2 = 0) let hash = Hashtbl.hash end) @@ -493,11 +517,17 @@ type inv_rel_key = int (* index in the [rel_context] part of environment type id_key = inv_rel_key tableKey let eq_id_key ik1 ik2 = - (ik1 == ik2) || - (match ik1,ik2 with - ConstKey (_,kn1), - ConstKey (_,kn2) -> kn1=kn2 - | a,b -> a=b) + if ik1 == ik2 then true + else match ik1,ik2 with + | ConstKey (u1, kn1), ConstKey (u2, kn2) -> + let ans = (kn_ord u1 u2 = 0) in + if ans then kn_ord kn1 kn2 = 0 + else ans + | VarKey id1, VarKey id2 -> + id_ord id1 id2 = 0 + | RelKey k1, RelKey k2 -> + k1 - k2 = 0 + | _ -> false let eq_con_chk (kn1,_) (kn2,_) = kn1=kn2 let eq_mind_chk (kn1,_) (kn2,_) = kn1=kn2 diff --git a/kernel/names.mli b/kernel/names.mli index bb6696389..5c2bd5b0a 100644 --- a/kernel/names.mli +++ b/kernel/names.mli @@ -40,6 +40,8 @@ module ModIdmap : Map.S with type key = module_ident type dir_path +val dir_path_ord : dir_path -> dir_path -> int + (** Inner modules idents on top of list (to improve sharing). For instance: A.B.C is ["C";"B";"A"] *) val make_dirpath : module_ident list -> dir_path @@ -68,6 +70,8 @@ module Labmap : Map.S with type key = label type mod_bound_id +val mod_bound_id_ord : mod_bound_id -> mod_bound_id -> int + (** The first argument is a file name - to prevent conflict between different files *) diff --git a/kernel/univ.ml b/kernel/univ.ml index 39cb6bc10..635991494 100644 --- a/kernel/univ.ml +++ b/kernel/univ.ml @@ -53,11 +53,12 @@ module UniverseLevel = struct | Level (i1, dp1), Level (i2, dp2) -> if i1 < i2 then -1 else if i1 > i2 then 1 - else compare dp1 dp2) + else Names.dir_path_ord dp1 dp2) let equal u v = match u,v with | Set, Set -> true - | Level (i1, dp1), Level (i2, dp2) -> i1 = i2 && dp1 = dp2 + | Level (i1, dp1), Level (i2, dp2) -> + i1 = i2 && (Names.dir_path_ord dp1 dp2 = 0) | _ -> false let to_string = function @@ -272,6 +273,15 @@ let between g arcu arcv = type constraint_type = Lt | Le | Eq type explanation = (constraint_type * universe) list +let constraint_type_ord c1 c2 = match c1, c2 with +| Lt, Lt -> 0 +| Lt, _ -> -1 +| Le, Lt -> 1 +| Le, Le -> 0 +| Le, Eq -> -1 +| Eq, Eq -> 0 +| Eq, _ -> 1 + (* Assuming the current universe has been reached by [p] and [l] correspond to the universes in (direct) relation [rel] with it, make a list of canonical universe, updating the relation with @@ -527,7 +537,7 @@ module Constraint = Set.Make( struct type t = univ_constraint let compare (u,c,v) (u',c',v') = - let i = Pervasives.compare c c' in + let i = constraint_type_ord c c' in if i <> 0 then i else let i' = UniverseLevel.compare u u' in |