diff options
| author |  Maxime Dénès <mail@maximedenes.fr> | 2017-11-06 22:52:20 +0100 |
|---|---|---|
| committer | Maxime Dénès <mail@maximedenes.fr> | 2017-11-06 22:52:20 +0100 |
| commit | 0d81e80a09db7d352408be4dfc5ba263f6ed98ef (patch) | |
| tree | 2754ab2c5b6fb039b02fbe096940b112039f4e50 /pretyping/evarsolve.ml | |
| parent | e029cf5b417b22ebc65a8193469bbbe450f725ce (diff) | |
| parent | c71e69a9be2094061e041d60614b090c8381f0b7 (diff) | |
Merge PR #6064: [api] Deprecate all legacy uses of Name.Id in core.
Diffstat (limited to 'pretyping/evarsolve.ml')
| -rw-r--r-- | pretyping/evarsolve.ml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pretyping/evarsolve.ml b/pretyping/evarsolve.ml index 258385abc..b906c3b59 100644 --- a/pretyping/evarsolve.ml +++ b/pretyping/evarsolve.ml @@ -1021,7 +1021,7 @@ let closure_of_filter evd evk = function | Some filter -> let evi = Evd.find_undefined evd evk in let vars = collect_vars evd (EConstr.of_constr (evar_concl evi)) in - let test b decl = b || Idset.mem (get_id decl) vars || + let test b decl = b || Id.Set.mem (get_id decl) vars || match decl with | LocalAssum _ -> false @@ -1574,19 +1574,19 @@ let rec invert_definition conv_algo choose env evd pbty (evk,argsv as ev) rhs = let rhs = whd_beta evd rhs (* heuristic *) in let fast rhs = let filter_ctxt = evar_filtered_context evi in - let names = ref Idset.empty in + let names = ref Id.Set.empty in let rec is_id_subst ctxt s = match ctxt, s with | (decl :: ctxt'), (c :: s') -> let id = get_id decl in - names := Idset.add id !names; + names := Id.Set.add id !names; isVarId evd id c && is_id_subst ctxt' s' | [], [] -> true | _ -> false in is_id_subst filter_ctxt (Array.to_list argsv) && closed0 evd rhs && - Idset.subset (collect_vars evd rhs) !names + Id.Set.subset (collect_vars evd rhs) !names in let body = if fast rhs then EConstr.of_constr (EConstr.to_constr evd rhs) (** FIXME? *) |