diff options
| author | Xavier Clerc <xavier.clerc@inria.fr> | 2011-07-12 09:41:01 +0000 |
|---|---|---|
| committer | Xavier Clerc <xavier.clerc@inria.fr> | 2011-07-12 09:41:01 +0000 |
| commit | 46d5420ca9c695738f7a0baa527d3591d95f067a (patch) | |
| tree | 985ef9fa61549f5809e86e19e1e39c277209fc9c | |
| parent | 9058be97f9e75f115702bbb187150f2986a0e12c (diff) | |
PR#5301: camlp4r and exception equal to another one with parameters
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11121 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | Changes | 1 | ||||
| -rw-r--r-- | camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml | 4 |
2 files changed, 2 insertions, 3 deletions
@@ -20,7 +20,6 @@ Standard library: with user-provided hash functions. Bug Fixes: -- PR#5301: camlp4r and exception equal to another one with parameters Objective Caml 3.12.0: diff --git a/camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml b/camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml index d917b6d5d..39990bf8e 100644 --- a/camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml +++ b/camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml @@ -945,8 +945,8 @@ module Make (Ast : Sig.Camlp4Ast) = struct (List.map ctyp (list_of_ctyp t []))) :: l ] | <:str_item@loc< exception $uid:s$ = $i$ >> -> [mkstr loc (Pstr_exn_rebind (conv_con s) (ident i)) :: l ] - | <:str_item@loc< exception $uid:s$ of $_$ = $i$ >> -> - [mkstr loc (Pstr_exn_rebind (conv_con s) (ident i)) :: l ] + | <:str_item@loc< exception $uid:_$ of $_$ = $_$ >> -> + error loc "type in exception alias" | StExc _ _ _ -> assert False (*FIXME*) | StExp loc e -> [mkstr loc (Pstr_eval (expr e)) :: l] | StExt loc n t sl -> [mkstr loc (Pstr_primitive n (mkvalue_desc t (list_of_meta_list sl))) :: l] |