From 8a807b2ffc27b84c9ea0ffe9f22b164ade24badb Mon Sep 17 00:00:00 2001
From: Emilio Jesus Gallego Arias
Date: Wed, 15 Mar 2017 20:48:10 +0100
Subject: [cleanup] Unify all calls to the error function.

This is the continuation of #244, we now deprecate `CErrors.error`,
the single entry point in Coq is `user_err`.

The rationale is to allow for easier grepping, and to ease a future
cleanup of error messages. In particular, we would like to
systematically classify all error messages raised by Coq and be sure
they are properly documented.

We restore the two functions removed in #244 to improve compatibility,
but mark them deprecated.
---
 parsing/g_vernac.ml4 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'parsing')

diff --git a/parsing/g_vernac.ml4 b/parsing/g_vernac.ml4
index b5d0780bd5..893605499c 100644
--- a/parsing/g_vernac.ml4
+++ b/parsing/g_vernac.ml4
@@ -660,7 +660,7 @@ GEXTEND Gram
               if Option.is_empty !slash_position then
                 (slash_position := Some i; parse_args i args)
               else
-                error "The \"/\" modifier can occur only once"
+                user_err Pp.(str "The \"/\" modifier can occur only once")
          in
          let args = parse_args 0 (List.flatten args) in
          let more_implicits = Option.default [] more_implicits in
@@ -734,7 +734,7 @@ GEXTEND Gram
     | "("; items = LIST1 argument_spec; ")"; sc = OPT scope ->
        let f x = match sc, x with
          | None, x -> x | x, None -> Option.map (fun y -> Loc.tag ~loc:!@loc y) x
-         | Some _, Some _ -> error "scope declared twice" in
+         | Some _, Some _ -> user_err Pp.(str "scope declared twice") in
        List.map (fun (name,recarg_like,notation_scope) ->
            `Id { name=name; recarg_like=recarg_like;
                  notation_scope=f notation_scope;
@@ -742,7 +742,7 @@ GEXTEND Gram
     | "["; items = LIST1 argument_spec; "]"; sc = OPT scope ->
        let f x = match sc, x with
          | None, x -> x | x, None -> Option.map (fun y -> Loc.tag ~loc:!@loc y) x
-         | Some _, Some _ -> error "scope declared twice" in
+         | Some _, Some _ -> user_err Pp.(str "scope declared twice") in
        List.map (fun (name,recarg_like,notation_scope) ->
            `Id { name=name; recarg_like=recarg_like;
                  notation_scope=f notation_scope;
@@ -750,7 +750,7 @@ GEXTEND Gram
     | "{"; items = LIST1 argument_spec; "}"; sc = OPT scope ->
        let f x = match sc, x with
          | None, x -> x | x, None -> Option.map (fun y -> Loc.tag ~loc:!@loc y) x
-         | Some _, Some _ -> error "scope declared twice" in
+         | Some _, Some _ -> user_err Pp.(str "scope declared twice") in
        List.map (fun (name,recarg_like,notation_scope) ->
            `Id { name=name; recarg_like=recarg_like;
                  notation_scope=f notation_scope;
@@ -939,7 +939,7 @@ GEXTEND Gram
 	  PrintGrammar ent
       | IDENT "LoadPath"; dir = OPT dirpath -> PrintLoadPath dir
       | IDENT "Modules" ->
-          error "Print Modules is obsolete; use Print Libraries instead"
+          user_err Pp.(str "Print Modules is obsolete; use Print Libraries instead")
       | IDENT "Libraries" -> PrintModules
 
       | IDENT "ML"; IDENT "Path" -> PrintMLLoadPath
-- 
cgit v1.2.3