summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Weis <Pierre.Weis@inria.fr>2000-03-21 15:16:48 +0000
committerPierre Weis <Pierre.Weis@inria.fr>2000-03-21 15:16:48 +0000
commit8329ffe5508d284e3905431b142db7cb0719e5e7 (patch)
treedfaee7d463520ea6eee2040e9967061c884f1bc0
parent6f4799b3e2054a6f205b2884585bbcd251c4f976 (diff)
Manquait un petit @.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@2980 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r--typing/typemod.ml76
1 files changed, 43 insertions, 33 deletions
diff --git a/typing/typemod.ml b/typing/typemod.ml
index 312ec2d45..14075a686 100644
--- a/typing/typemod.ml
+++ b/typing/typemod.ml
@@ -512,37 +512,47 @@ open Printtyp
let report_error ppf = function
| Unbound_module lid -> fprintf ppf "Unbound module %a" longident lid
| Unbound_modtype lid -> fprintf ppf "Unbound module type %a" longident lid
- | Cannot_apply mty -> fprintf ppf
- "@[This module is not a functor; it has type@ %a@]" modtype mty
- | Not_included errs -> fprintf ppf
- "@[<v>Signature mismatch:@ %a]" Includemod.report_error errs
- | Cannot_eliminate_dependency mty -> fprintf ppf
- "@[This functor has type@ %a@ \
- The parameter cannot be eliminated in the result type.@ \
- Please bind the argument to a module identifier.@]" modtype mty
+ | Cannot_apply mty ->
+ fprintf ppf
+ "@[This module is not a functor; it has type@ %a@]" modtype mty
+ | Not_included errs ->
+ fprintf ppf
+ "@[<v>Signature mismatch:@ %a@]" Includemod.report_error errs
+ | Cannot_eliminate_dependency mty ->
+ fprintf ppf
+ "@[This functor has type@ %a@ \
+ The parameter cannot be eliminated in the result type.@ \
+ Please bind the argument to a module identifier.@]" modtype mty
| Signature_expected -> fprintf ppf "This module type is not a signature"
- | Structure_expected mty -> fprintf ppf
- "@[This module is not a structure; it has type@ %a" modtype mty
- | With_no_component lid -> fprintf ppf
- "@[The signature constrained by `with' has no component named %a@]"
- longident lid
- | With_mismatch(lid, explanation) -> fprintf ppf
- "@[<v>
- @[In this `with' constraint, the new definition of %a@ \
- does not match its original definition@ \
- in the constrained signature:@]@ \
- %a@]"
- longident lid Includemod.report_error explanation
- | Repeated_name(kind, name) -> fprintf ppf
- "@[Multiple definition of the %s name %s.@ \
- Names must be unique in a given structure or signature.@]" kind name
- | Non_generalizable typ -> fprintf ppf
- "@[The type of this expression,@ %a,@ \
- contains type variables that cannot be generalized@]" type_scheme typ
- | Non_generalizable_class (id, desc) -> fprintf ppf
- "@[The type of this class,@ %a,@ \
- contains type variables that cannot be generalized@]"
- (class_declaration id) desc
- | Non_generalizable_module mty -> fprintf ppf
- "@[The type of this module,@ %a,@ \
- contains type variables that cannot be generalized@]" modtype mty
+ | Structure_expected mty ->
+ fprintf ppf
+ "@[This module is not a structure; it has type@ %a" modtype mty
+ | With_no_component lid ->
+ fprintf ppf
+ "@[The signature constrained by `with' has no component named %a@]"
+ longident lid
+ | With_mismatch(lid, explanation) ->
+ fprintf ppf
+ "@[<v>
+ @[In this `with' constraint, the new definition of %a@ \
+ does not match its original definition@ \
+ in the constrained signature:@]@ \
+ %a@]"
+ longident lid Includemod.report_error explanation
+ | Repeated_name(kind, name) ->
+ fprintf ppf
+ "@[Multiple definition of the %s name %s.@ \
+ Names must be unique in a given structure or signature.@]" kind name
+ | Non_generalizable typ ->
+ fprintf ppf
+ "@[The type of this expression,@ %a,@ \
+ contains type variables that cannot be generalized@]" type_scheme typ
+ | Non_generalizable_class (id, desc) ->
+ fprintf ppf
+ "@[The type of this class,@ %a,@ \
+ contains type variables that cannot be generalized@]"
+ (class_declaration id) desc
+ | Non_generalizable_module mty ->
+ fprintf ppf
+ "@[The type of this module,@ %a,@ \
+ contains type variables that cannot be generalized@]" modtype mty