diff options
| author | Xavier Clerc <xavier.clerc@inria.fr> | 2011-05-12 08:14:30 +0000 |
|---|---|---|
| committer | Xavier Clerc <xavier.clerc@inria.fr> | 2011-05-12 08:14:30 +0000 |
| commit | 919b3f6fa5bdcb6fd6664ad1ea0b111a7f55669c (patch) | |
| tree | 77672b75882529bc6cf00d00fd33291923f143c4 | |
| parent | dbe4ca4408d783154bb37fd223278891da89c00f (diff) | |
| download | ocaml-919b3f6fa5bdcb6fd6664ad1ea0b111a7f55669c.tar.gz | |
#5122: camlp4 rejects lowercase identifiers for module types
git-svn-id: http://caml.inria.fr/svn/ocaml/version/3.12@11036 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | Changes | 1 | ||||
| -rw-r--r-- | camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.ml | 6 |
2 files changed, 4 insertions, 3 deletions
@@ -23,6 +23,7 @@ Bug fixes: - PR#5103: build and install objinfo when building with ocamlbuild - PR#5110: invalid module name when using optional argument - PR#5118: Camlp4o and integer literals +- PR#5122: camlp4 rejects lowercase identifiers for module types - PR#5128: typo in 'Camlp4ListComprehension' syntax extension - PR#5165: ocamlbuild does not pass '-thread' option to ocamlfind - PR#5167: camlp4r loops when printing package type diff --git a/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.ml b/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.ml index 1887859dda..b8eaf0bde5 100644 --- a/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.ml +++ b/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.ml @@ -462,7 +462,7 @@ New syntax:\ <:str_item< module $i$ = $mb$ >> | "module"; "rec"; mb = module_binding -> <:str_item< module rec $mb$ >> - | "module"; "type"; i = a_UIDENT; "="; mt = module_type -> + | "module"; "type"; i = a_ident; "="; mt = module_type -> <:str_item< module type $i$ = $mt$ >> | "open"; i = module_longident -> <:str_item< open $i$ >> | "type"; td = type_declaration -> @@ -537,9 +537,9 @@ New syntax:\ <:sig_item< module $i$ : $mt$ >> | "module"; "rec"; mb = module_rec_declaration -> <:sig_item< module rec $mb$ >> - | "module"; "type"; i = a_UIDENT; "="; mt = module_type -> + | "module"; "type"; i = a_ident; "="; mt = module_type -> <:sig_item< module type $i$ = $mt$ >> - | "module"; "type"; i = a_UIDENT -> + | "module"; "type"; i = a_ident -> <:sig_item< module type $i$ >> | "open"; i = module_longident -> <:sig_item< open $i$ >> | "type"; t = type_declaration -> |