From a3a5711d8c2f9f0e12ed707c8b69c828e30bbcf4 Mon Sep 17 00:00:00 2001 From: letouzey Date: Thu, 24 Oct 2013 09:41:19 +0000 Subject: 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 --- plugins/decl_mode/decl_interp.ml | 3 ++- plugins/decl_mode/decl_proof_instr.ml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'plugins/decl_mode') diff --git a/plugins/decl_mode/decl_interp.ml b/plugins/decl_mode/decl_interp.ml index 8060dcabf..01f90f6c6 100644 --- a/plugins/decl_mode/decl_interp.ml +++ b/plugins/decl_mode/decl_interp.ml @@ -278,7 +278,8 @@ let rec bind_primary_aliases map pat = List.fold_left bind_primary_aliases map1 lpat let bind_secondary_aliases map subst = - Id.Map.fold (fun ids (idp : Id.t) map -> (ids,List.assoc idp map)::map) subst map + Id.Map.fold + (fun ids idp map -> (ids,List.assoc_f Id.equal idp map)::map) subst map let bind_aliases patvars subst patt = let map = bind_primary_aliases [] patt in diff --git a/plugins/decl_mode/decl_proof_instr.ml b/plugins/decl_mode/decl_proof_instr.ml index e18df6e46..673b749e1 100644 --- a/plugins/decl_mode/decl_proof_instr.ml +++ b/plugins/decl_mode/decl_proof_instr.ml @@ -1189,7 +1189,7 @@ let rec execute_cases fix_name per_info tacnext args objs nhrec tree gls = execute_cases fix_name per_info tacnext args0 next_objs nhrec t gls | End_patt (id,(nparams,nhyps)),[] -> begin - match List.assoc id args with + match List.assoc_f Id.equal id args with [None,br_args] -> let all_metas = List.init (nparams + nhyps) (fun n -> mkMeta (succ n)) in -- cgit v1.2.3