diff options
| author |  Maxime Dénès <mail@maximedenes.fr> | 2018-06-04 22:02:51 +0200 |
|---|---|---|
| committer | Maxime Dénès <mail@maximedenes.fr> | 2018-06-04 22:02:51 +0200 |
| commit | f6538f1a7f8ad2bdc0bc446d4ca35078d55d63ee (patch) | |
| tree | 361e60610c3477805e9b7937176bf6c683ce039b /vernac/vernacentries.ml | |
| parent | d862b659457b12437d4fa348c3c4dc3dd08d8065 (diff) | |
| parent | 683ee02cd810c57f051f5b5d5d446dcc950f23f7 (diff) | |
Merge PR #7315: An attempt to clarify error message for Arguments needing "rename" flag
Diffstat (limited to 'vernac/vernacentries.ml')
| -rw-r--r-- | vernac/vernacentries.ml | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/vernac/vernacentries.ml b/vernac/vernacentries.ml index 9a7f59085..7f6270df1 100644 --- a/vernac/vernacentries.ml +++ b/vernac/vernacentries.ml @@ -1131,15 +1131,16 @@ let vernac_arguments ~atts reference args more_implicits nargs_for_red flags = let names = rename prev_names names in let renaming_specified = Option.has_some !example_renaming in - if !rename_flag_required && not rename_flag then - user_err ~hdr:"vernac_declare_arguments" - (strbrk "To rename arguments the \"rename\" flag must be specified." - ++ spc () ++ - match !example_renaming with - | None -> mt () - | Some (o,n) -> - str "Argument " ++ Name.print o ++ - str " renamed to " ++ Name.print n ++ str "."); + if !rename_flag_required && not rename_flag then begin + let msg = + match !example_renaming with + | None -> + strbrk "To rename arguments the \"rename\" flag must be specified." + | Some (o,n) -> + strbrk "Flag \"rename\" expected to rename " ++ Name.print o ++ + strbrk " into " ++ Name.print n ++ str "." + in user_err ~hdr:"vernac_declare_arguments" msg + end; let duplicate_names = List.duplicates Name.equal (List.filter ((!=) Anonymous) names) |