aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorletouzey2011-03-16 15:56:32 +0000
committerletouzey2011-03-16 15:56:32 +0000
commit873bb86302a8af5866ae6707e67bda4c12d04a98 (patch)
treeb970058bdec7f9afb81af2e81726d041cfa3856c
parent96e486509a5d4d7cbee2589af32d18eaa07d8105 (diff)
Finish branching functions handling module errors (cf. r13886)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@13912 85f007b7-540e-0410-9357-904b9bb8a0f7
-rw-r--r--toplevel/cerrors.ml4
-rw-r--r--toplevel/himsg.ml2
-rw-r--r--toplevel/himsg.mli5
3 files changed, 10 insertions, 1 deletions
diff --git a/toplevel/cerrors.ml b/toplevel/cerrors.ml
index 8dbeb34491..737abb3f4a 100644
--- a/toplevel/cerrors.ml
+++ b/toplevel/cerrors.ml
@@ -106,6 +106,10 @@ let rec process_vernac_interp_error = function
wrap_vernac_error (Himsg.explain_typeclass_error env te)
| InductiveError e ->
wrap_vernac_error (Himsg.explain_inductive_error e)
+ | Modops.ModuleTypingError e ->
+ wrap_vernac_error (Himsg.explain_module_error e)
+ | Modintern.ModuleInternalizationError e ->
+ wrap_vernac_error (Himsg.explain_module_internalization_error e)
| RecursionSchemeError e ->
wrap_vernac_error (Himsg.explain_recursion_scheme_error e)
| Cases.PatternMatchingError (env,e) ->
diff --git a/toplevel/himsg.ml b/toplevel/himsg.ml
index 60a3b89bb0..0a93c21c8d 100644
--- a/toplevel/himsg.ml
+++ b/toplevel/himsg.ml
@@ -632,7 +632,7 @@ let explain_label_missing l s =
str "The field " ++ str (string_of_label l) ++ str " is missing in "
++ str s ++ str "."
-let explain_module_error env sigma = function
+let explain_module_error = function
| SignatureMismatch (l,spec,err) -> explain_signature_mismatch l spec err
| LabelAlreadyDeclared l -> explain_label_already_declared l
| ApplicationToNotPath mexpr -> explain_application_to_not_path mexpr
diff --git a/toplevel/himsg.mli b/toplevel/himsg.mli
index 119765aec9..a763472b93 100644
--- a/toplevel/himsg.mli
+++ b/toplevel/himsg.mli
@@ -40,3 +40,8 @@ val explain_reduction_tactic_error :
val explain_ltac_call_trace :
int * Proof_type.ltac_call_kind * Proof_type.ltac_trace * Util.loc ->
std_ppcmds
+
+val explain_module_error : Modops.module_typing_error -> std_ppcmds
+
+val explain_module_internalization_error :
+ Modintern.module_internalization_error -> std_ppcmds