aboutsummaryrefslogtreecommitdiff
path: root/pretyping
diff options
context:
space:
mode:
authorletouzey2013-10-24 09:41:19 +0000
committerletouzey2013-10-24 09:41:19 +0000
commita3a5711d8c2f9f0e12ed707c8b69c828e30bbcf4 (patch)
tree02972edf2946cbb9f4a30133d9f66dd5cdbe7987 /pretyping
parentbb5e6d7c39211349d460db0b61b2caf3d099d5b6 (diff)
Turn many List.assoc into List.assoc_f
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@16925 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'pretyping')
-rw-r--r--pretyping/cases.ml2
-rw-r--r--pretyping/recordops.ml4
-rw-r--r--pretyping/termops.ml2
3 files changed, 4 insertions, 4 deletions
diff --git a/pretyping/cases.ml b/pretyping/cases.ml
index c9f00c0cd1..be62e65b32 100644
--- a/pretyping/cases.ml
+++ b/pretyping/cases.ml
@@ -1760,7 +1760,7 @@ let prepare_predicate_from_arsign_tycon loc tomatchs arsign c =
| Rel n when n > lift ->
(try
(* Make the predicate dependent on the matched variable *)
- let idx = List.assoc (n - lift) subst in
+ let idx = List.assoc_f Int.equal (n - lift) subst in
mkRel (idx + lift)
with Not_found ->
(* A variable that is not matched, lift over the arsign. *)
diff --git a/pretyping/recordops.ml b/pretyping/recordops.ml
index 94119975a2..fe3606ce4f 100644
--- a/pretyping/recordops.ml
+++ b/pretyping/recordops.ml
@@ -221,7 +221,7 @@ let open_canonical_structure i (_,o) =
let lo = compute_canonical_projections o in
List.iter (fun ((proj,cs_pat),s) ->
let l = try Refmap.find proj !object_table with Not_found -> [] in
- let ocs = try Some (List.assoc cs_pat l)
+ let ocs = try Some (List.assoc_f Pervasives.(=) cs_pat l) (* FIXME *)
with Not_found -> None
in match ocs with
| None -> object_table := Refmap.add proj ((cs_pat,s)::l) !object_table;
@@ -287,7 +287,7 @@ let declare_canonical_structure ref =
add_canonical_structure (check_and_decompose_canonical_structure ref)
let lookup_canonical_conversion (proj,pat) =
- List.assoc pat (Refmap.find proj !object_table)
+ List.assoc_f Pervasives.(=) pat (Refmap.find proj !object_table) (* FIXME *)
let is_open_canonical_projection env sigma (c,args) =
try
diff --git a/pretyping/termops.ml b/pretyping/termops.ml
index 899def8c82..9ecf86698b 100644
--- a/pretyping/termops.ml
+++ b/pretyping/termops.ml
@@ -625,7 +625,7 @@ type meta_value_map = (metavariable * constr) list
let rec subst_meta bl c =
match kind_of_term c with
- | Meta i -> (try List.assoc i bl with Not_found -> c)
+ | Meta i -> (try List.assoc_f Int.equal i bl with Not_found -> c)
| _ -> map_constr (subst_meta bl) c
(* First utilities for avoiding telescope computation for subst_term *)