diff options
| author | ppedrot | 2013-05-08 19:55:23 +0000 |
|---|---|---|
| committer | ppedrot | 2013-05-08 19:55:23 +0000 |
| commit | d63320ceb1c56710f5e953742dd5d6cf43aacbdf (patch) | |
| tree | 9a6eec0f6e330270aab09af8ae9c744282dc8a82 /pretyping | |
| parent | c9467e5684f9a71cb82ddc72b5b9d501b32b5c5e (diff) | |
Uniformizing the [if_warn] flag used for warning printing and put
it into the standard logger instead.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@16491 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'pretyping')
| -rw-r--r-- | pretyping/indrec.ml | 2 | ||||
| -rw-r--r-- | pretyping/matching.ml | 6 | ||||
| -rw-r--r-- | pretyping/patternops.ml | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/pretyping/indrec.ml b/pretyping/indrec.ml index c0c20a1e33..fa7b954d92 100644 --- a/pretyping/indrec.ml +++ b/pretyping/indrec.ml @@ -158,7 +158,7 @@ let type_rec_branch is_rec dep env sigma (vargs,depPvect,decP) tyi cs recargs = (match dest_recarg ra with | Mrec (_,j) when is_rec -> (depPvect.(j),rest) | Imbr _ -> - Flags.if_warn msg_warning (strbrk "Ignoring recursive call"); + msg_warning (strbrk "Ignoring recursive call"); (None,rest) | _ -> (None, rest)) in diff --git a/pretyping/matching.ml b/pretyping/matching.ml index ab90b5601f..b3dc790e06 100644 --- a/pretyping/matching.ml +++ b/pretyping/matching.ml @@ -57,7 +57,7 @@ let constrain n (ids, m as x) (names, terms as subst) = with Not_found -> if List.mem_assoc n names then - Flags.if_warn Pp.msg_warning + msg_warning (str "Collision between bound variable " ++ pr_id n ++ str " and a metavariable of same name."); (names,(n,x)::terms) @@ -66,12 +66,12 @@ let add_binders na1 na2 (names,terms as subst) = match na1, na2 with | Name id1, Name id2 -> if List.mem_assoc id1 names then - (Flags.if_warn Pp.msg_warning + (Pp.msg_warning (str "Collision between bound variables of name " ++ pr_id id1); (names,terms)) else (if List.mem_assoc id1 terms then - Flags.if_warn Pp.msg_warning + Pp.msg_warning (str "Collision between bound variable " ++ pr_id id1 ++ str " and another bound variable of same name."); ((id1,id2)::names,terms)); diff --git a/pretyping/patternops.ml b/pretyping/patternops.ml index d227e1f2af..5e4e5eb972 100644 --- a/pretyping/patternops.ml +++ b/pretyping/patternops.ml @@ -330,8 +330,7 @@ let rec pat_of_raw metas vars = function | GHole _ -> PMeta None | GCast (_,c,_) -> - Flags.if_warn - Pp.msg_warning (strbrk "Cast not taken into account in constr pattern"); + Pp.msg_warning (strbrk "Cast not taken into account in constr pattern"); pat_of_raw metas vars c | GIf (_,c,(_,None),b1,b2) -> PIf (pat_of_raw metas vars c, |