diff options
author | 2012-04-15 22:06:04 +0000 | |
---|---|---|
committer | 2012-04-15 22:06:04 +0000 | |
commit | 001a56de3c85c1134e5901f23f6a4b8bb826518c (patch) | |
tree | e168538855b04c2e0ebd0ebef0f75f099da4f0cd /kernel/names.ml | |
parent | ecd4c983d94ffc3a22a5d043e615d40e55bad033 (diff) |
Adding newline after warning and restoring distinction between
fatal and non fatal identifier check errors.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@15178 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'kernel/names.ml')
-rw-r--r-- | kernel/names.ml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/kernel/names.ml b/kernel/names.ml index 735ab2899..de1d7cce8 100644 --- a/kernel/names.ml +++ b/kernel/names.ml @@ -26,8 +26,12 @@ open Util type identifier = string -let check_ident_soft x = Option.iter Pp.warning (ident_refutation x) -let check_ident x = Option.iter Errors.error (ident_refutation x) +let check_ident_soft x = + Option.iter (fun (fatal,x) -> + if fatal then error x else Pp.msg_warning (str x)) + (ident_refutation x) +let check_ident x = + Option.iter (fun (_,x) -> Errors.error x) (ident_refutation x) let id_of_string s = check_ident_soft s; String.copy s let string_of_id id = String.copy id |