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 /toplevel | |
| 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 'toplevel')
| -rw-r--r-- | toplevel/command.ml | 4 | ||||
| -rw-r--r-- | toplevel/indschemes.ml | 2 | ||||
| -rw-r--r-- | toplevel/locality.ml | 3 | ||||
| -rw-r--r-- | toplevel/mltop.ml | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/toplevel/command.ml b/toplevel/command.ml index 1071605fcd..9267e236d8 100644 --- a/toplevel/command.ml +++ b/toplevel/command.ml @@ -147,7 +147,7 @@ let declare_definition ident (local, k) ce imps hook = let () = if Pfedit.refining () then let msg = strbrk "Section definition " ++ pr_id ident ++ strbrk " is not visible from current goals" in - Flags.if_warn msg_warning msg + msg_warning msg in VarRef ident | Discharge | Local | Global -> @@ -503,7 +503,7 @@ let check_mutuality env isfix fixl = let po = partial_order preorder in match List.filter (function (_,Inr _) -> true | _ -> false) po with | (x,Inr xge)::(y,Inr yge)::rest -> - if_warn msg_warning (non_full_mutual_message x xge y yge isfix rest) + msg_warning (non_full_mutual_message x xge y yge isfix rest) | _ -> () type structured_fixpoint_expr = { diff --git a/toplevel/indschemes.ml b/toplevel/indschemes.ml index bed262bbbd..8551c2038d 100644 --- a/toplevel/indschemes.ml +++ b/toplevel/indschemes.ml @@ -138,7 +138,7 @@ let alarm what internal msg = | KernelVerbose | KernelSilent -> (if debug then - Flags.if_warn Pp.msg_warning + msg_warning (hov 0 msg ++ fnl () ++ what ++ str " not defined.")) | _ -> errorlabstrm "" msg diff --git a/toplevel/locality.ml b/toplevel/locality.ml index 49478cb261..6ee0e99b05 100644 --- a/toplevel/locality.ml +++ b/toplevel/locality.ml @@ -32,8 +32,7 @@ let enforce_locality_full locality_flag local = Errors.error "Use only prefix \"Local\"." | None -> if local then begin - Flags.if_warn - Pp.msg_warning (Pp.str"Obsolete syntax: use \"Local\" as a prefix."); + Pp.msg_warning (Pp.str "Obsolete syntax: use \"Local\" as a prefix."); Some true end else None diff --git a/toplevel/mltop.ml b/toplevel/mltop.ml index 266397de8f..1909f6809c 100644 --- a/toplevel/mltop.ml +++ b/toplevel/mltop.ml @@ -164,7 +164,7 @@ let add_path ~unix_path:dir ~coq_root:coq_dirpath = let convert_string d = try Names.Id.of_string d with UserError _ -> - if_warn msg_warning (str ("Directory "^d^" cannot be used as a Coq identifier (skipped)")); + msg_warning (str ("Directory "^d^" cannot be used as a Coq identifier (skipped)")); raise Exit let add_rec_path ~unix_path ~coq_root = |