Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
master
Xavier Clerc 2011-07-12 09:41:01 +00:00
parent 9058be97f9
commit 46d5420ca9
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changes
View File

@ -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:

4
camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml
View File

@ -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]