diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/closure.ml | 2 | ||||
| -rw-r--r-- | kernel/inductive.ml | 4 | ||||
| -rw-r--r-- | kernel/nativecode.ml | 4 | ||||
| -rw-r--r-- | kernel/safe_typing.ml | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/kernel/closure.ml b/kernel/closure.ml index 28818de1f1..a32be4f692 100644 --- a/kernel/closure.ml +++ b/kernel/closure.ml @@ -246,7 +246,7 @@ let ref_value_cache info ref = | None -> raise Not_found | Some t -> lift n t end - | VarKey id -> List.assoc id info.i_vars + | VarKey id -> List.assoc_f Id.equal id info.i_vars | ConstKey cst -> constant_value info.i_env cst in let v = info.i_repr info body in diff --git a/kernel/inductive.ml b/kernel/inductive.ml index d52877fd2a..e564feb692 100644 --- a/kernel/inductive.ml +++ b/kernel/inductive.ml @@ -123,7 +123,9 @@ let sort_as_univ = function | Prop Pos -> type0_univ let cons_subst u su subst = - try (u, sup su (List.assoc u subst)) :: List.remove_assoc u subst + try + (u, sup su (List.assoc_f Universe.equal u subst)) :: + List.remove_assoc_f Universe.equal u subst with Not_found -> (u, su) :: subst let actualize_decl_level env lev t = diff --git a/kernel/nativecode.ml b/kernel/nativecode.ml index fbee52dd7a..874e4a5735 100644 --- a/kernel/nativecode.ml +++ b/kernel/nativecode.ml @@ -615,14 +615,14 @@ let get_rel env id i = List.nth env.env_rel (i-1) else let i = i - env.env_bound in - try List.assoc i !(env.env_urel) + try List.assoc_f Int.equal i !(env.env_urel) with Not_found -> let local = MLlocal (fresh_lname id) in env.env_urel := (i,local) :: !(env.env_urel); local let get_var env id = - try List.assoc id !(env.env_named) + try List.assoc_f Id.equal id !(env.env_named) with Not_found -> let local = MLlocal (fresh_lname (Name id)) in env.env_named := (id, local)::!(env.env_named); diff --git a/kernel/safe_typing.ml b/kernel/safe_typing.ml index 90d52572a7..40f16a6e6d 100644 --- a/kernel/safe_typing.ml +++ b/kernel/safe_typing.ml @@ -254,7 +254,7 @@ let check_initial senv = assert (is_initial senv) let check_imports current_libs needed = let check (id,stamp) = try - let actual_stamp = List.assoc id current_libs in + let actual_stamp = List.assoc_f DirPath.equal id current_libs in if not (String.equal stamp actual_stamp) then Errors.error ("Inconsistent assumptions over module "^(DirPath.to_string id)^".") |