diff options
| author | ppedrot | 2013-10-22 20:11:20 +0000 |
|---|---|---|
| committer | ppedrot | 2013-10-22 20:11:20 +0000 |
| commit | 5f8ce72b29f4a4620ce46895f2e563b2fd85f24b (patch) | |
| tree | 2886aafae6f2bca9436d2da714f6e6a9a275a1ba /pretyping | |
| parent | 818ecca9f72b570ea2a3de47c783927616904b17 (diff) | |
Removing some generic equalities.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@16915 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'pretyping')
| -rw-r--r-- | pretyping/evarsolve.ml | 2 | ||||
| -rw-r--r-- | pretyping/evarutil.ml | 2 | ||||
| -rw-r--r-- | pretyping/termops.ml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pretyping/evarsolve.ml b/pretyping/evarsolve.ml index a4fc330c62..fc5fc0d2c0 100644 --- a/pretyping/evarsolve.ml +++ b/pretyping/evarsolve.ml @@ -273,7 +273,7 @@ let free_vars_and_rels_up_alias_expansion aliases c = | Rel n -> if n >= depth+1 then acc1 := Int.Set.add (n-depth) !acc1 | _ -> frec (aliases,depth) c end | Const _ | Ind _ | Construct _ -> - acc2 := List.fold_right Id.Set.add (vars_of_global (Global.env()) c) !acc2 + acc2 := Id.Set.union (vars_of_global (Global.env()) c) !acc2 | _ -> iter_constr_with_full_binders (fun d (aliases,depth) -> (extend_alias d aliases,depth+1)) diff --git a/pretyping/evarutil.ml b/pretyping/evarutil.ml index de394e6609..d2f53e953f 100644 --- a/pretyping/evarutil.ml +++ b/pretyping/evarutil.ml @@ -390,7 +390,7 @@ let rec check_and_clear_in_constr evdref err ids c = | ( Const _ | Ind _ | Construct _ ) -> let vars = Environ.vars_of_global (Global.env()) c in - List.iter check vars; c + Id.Set.iter check vars; c | Evar (evk,l as ev) -> if Evd.is_defined !evdref evk then diff --git a/pretyping/termops.ml b/pretyping/termops.ml index 66a656ad7d..908010428f 100644 --- a/pretyping/termops.ml +++ b/pretyping/termops.ml @@ -523,7 +523,7 @@ let occur_evar n c = let occur_in_global env id constr = let vars = vars_of_global env constr in - if List.mem id vars then raise Occur + if Id.Set.mem id vars then raise Occur let occur_var env id c = let rec occur_rec c = |