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

- 

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3900 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
master
Daniel de Rauglaudre 2001-10-19 19:19:43 +00:00
parent 5fcf8390b4
commit ae27b5f569
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
camlp4/etc/pa_o.ml
View File

@ -393,8 +393,8 @@ EXTEND
;
mod_expr_ident:
[ LEFTA
[ m1 = SELF; "."; m2 = SELF -> <:module_expr< $m1$ . $m2$ >> ]
| [ m = UIDENT -> <:module_expr< $uid:m$ >> ] ]
[ i = SELF; "."; j = SELF -> <:module_expr< $i$ . $j$ >> ]
| [ i = UIDENT -> <:module_expr< $uid:i$ >> ] ]
;
str_item:
[ "top"
@ -690,15 +690,15 @@ EXTEND
[ RIGHTA
[ i = LIDENT -> <:expr< $lid:i$ >>
| i = UIDENT -> <:expr< $uid:i$ >>
| m = UIDENT; "."; i = SELF ->
| i = UIDENT; "."; j = SELF ->
let rec loop m =
fun
[ <:expr< $x$ . $y$ >> -> loop <:expr< $m$ . $x$ >> y
| e -> <:expr< $m$ . $e$ >> ]
in
loop <:expr< $uid:m$ >> i
| m = UIDENT; "."; "("; i = operator_rparen ->
<:expr< $uid:m$ . $lid:i$ >> ] ]
loop <:expr< $uid:i$ >> j
| i = UIDENT; "."; "("; j = operator_rparen ->
<:expr< $uid:i$ . $lid:j$ >> ] ]
;
(* Patterns *)
patt:
@ -874,7 +874,7 @@ EXTEND
[ RIGHTA
[ i = UIDENT -> [i]
| i = LIDENT -> [i]
| m = UIDENT; "."; i = SELF -> [m :: i] ] ]
| i = UIDENT; "."; j = SELF -> [i :: j] ] ]
;
(* Miscellaneous *)
direction_flag:
@ -992,9 +992,9 @@ EXTEND
[ [ mf = OPT "mutable"; l = label; "="; e = expr -> (l, o2b mf, e)
| mf = OPT "mutable"; l = label; ":"; t = ctyp; "="; e = expr ->
(l, o2b mf, <:expr< ($e$ : $t$) >>)
| mf = OPT "mutable"; l = label; ":"; t1 = ctyp; ":>"; t2 = ctyp; "=";
| mf = OPT "mutable"; l = label; ":"; t = ctyp; ":>"; t2 = ctyp; "=";
e = expr ->
(l, o2b mf, <:expr< ($e$ : $t1$ :> $t2$) >>)
(l, o2b mf, <:expr< ($e$ : $t$ :> $t2$) >>)
| mf = OPT "mutable"; l = label; ":>"; t = ctyp; "="; e = expr ->
(l, o2b mf, <:expr< ($e$ :> $t$) >>) ] ]
;