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

*** empty log message *** 

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5704 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
master
Michel Mauny 2003-07-16 18:59:26 +00:00
parent 279ae2802f
commit e6b55ae07f
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
camlp4/etc/pa_o.ml
View File

@ -862,17 +862,21 @@ EXTEND
[ [ "constraint"; t1 = ctyp; "="; t2 = ctyp -> (t1, t2) ] ]
;
type_kind:
[ [ test_constr_decl; pf = OPT "private"; OPT "|";
cdl = LIST1 constructor_declaration SEP "|" ->
if o2b pf then <:ctyp< private [ $list:cdl$ ] >>
else <:ctyp< [ $list:cdl$ ] >>
[ [ "private"; "{"; ldl = label_declarations; "}" ->
<:ctyp< private { $list:ldl$ } >>
| "private"; OPT "|";
cdl = LIST1 constructor_declaration SEP "|" -> <:ctyp< private [ $list:cdl$ ] >>
| test_constr_decl; OPT "|";
cdl = LIST1 constructor_declaration SEP "|" -> <:ctyp< [ $list:cdl$ ] >>
| t = ctyp -> <:ctyp< $t$ >>
| t = ctyp; "="; "private"; "{"; ldl = label_declarations; "}" ->
<:ctyp< $t$ == private { $list:ldl$ } >>
| t = ctyp; "="; "{"; ldl = label_declarations; "}" ->
<:ctyp< $t$ == { $list:ldl$ } >>
| t = ctyp; "="; "private"; OPT "|"; cdl = LIST1 constructor_declaration SEP "|" ->
<:ctyp< $t$ == private [ $list:cdl$ ] >>
| t = ctyp; "="; OPT "|"; cdl = LIST1 constructor_declaration SEP "|" ->
<:ctyp< $t$ == [ $list:cdl$ ] >>
| "private"; "{"; ldl = label_declarations; "}" ->
<:ctyp< private { $list:ldl$ } >>
| "{"; ldl = label_declarations; "}" ->
<:ctyp< { $list:ldl$ } >> ] ]
;