diff options
author | xclerc <xclerc@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2013-09-19 12:59:04 +0000 |
---|---|---|
committer | xclerc <xclerc@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2013-09-19 12:59:04 +0000 |
commit | 826eb7c6d11007dfd747d49852e71a22e0a3850a (patch) | |
tree | 25dce16a7107de4e0d3903e2808fb8f083d1f9ea /pretyping/tacred.ml | |
parent | 33eea163c72c70eaa3bf76506c1d07a8cde911fd (diff) |
Get rid of the uses of deprecated OCaml elements (still remaining compatible with OCaml 3.12.1).
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@16787 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'pretyping/tacred.ml')
-rw-r--r-- | pretyping/tacred.ml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pretyping/tacred.ml b/pretyping/tacred.ml index c7c869d63..fc9f087fd 100644 --- a/pretyping/tacred.ml +++ b/pretyping/tacred.ml @@ -883,7 +883,7 @@ let contextually byhead (occs,c) f env sigma t = let maxocc = List.fold_right max locs 0 in let pos = ref 1 in let rec traverse (env,c as envc) t = - if nowhere_except_in & (!pos > maxocc) then t + if nowhere_except_in && (!pos > maxocc) then t else try let subst = if byhead then matches_head c t else matches c t in @@ -920,7 +920,7 @@ let substlin env evalref n (nowhere_except_in,locs) c = let value = value_of_evaluable_ref env evalref in let term = constr_of_evaluable_ref evalref in let rec substrec () c = - if nowhere_except_in & !pos > maxocc then c + if nowhere_except_in && !pos > maxocc then c else if eq_constr c term then let ok = if nowhere_except_in then List.mem !pos locs |