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

Get rid of alternative syntax for '(module...)'. 

git-svn-id: http://caml.inria.fr/svn/ocaml/branches/extension_points@13420 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
master
Alain Frisch 2013-03-22 11:30:28 +00:00
parent b9ad592ac0
commit f85f1e2759
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
experimental/frisch/extension_points.txt
View File

@ -110,7 +110,6 @@ alternative syntax for attributes and/or extensions:
where KW can stand for:
(module
assert
begin
for
@ -427,4 +426,4 @@ let fetch_users dbh =
-- Macaque
let names view = [%view {name = t.name}, t <- !view]
let names view = [%view {name = t.name}, t <- !view]"

12
parsing/parser.mly
View File

@ -1181,12 +1181,12 @@ simple_expr:
{ mkexp (Pexp_override [])}
| simple_expr SHARP label
{ mkexp(Pexp_send($1, $3)) }
| LPAREN MODULE ext_attributes module_expr RPAREN
{ mkexp_attrs (Pexp_pack $4) $3 }
| LPAREN MODULE ext_attributes module_expr COLON package_type RPAREN
{ mkexp_attrs (Pexp_constraint (ghexp (Pexp_pack $4),
Some (ghtyp (Ptyp_package $6)), None)) $3 }
| LPAREN MODULE ext_attributes module_expr COLON error
| LPAREN MODULE module_expr RPAREN
{ mkexp (Pexp_pack $3) }
| LPAREN MODULE module_expr COLON package_type RPAREN
{ mkexp (Pexp_constraint (ghexp (Pexp_pack $3),
Some (ghtyp (Ptyp_package $5)), None)) }
| LPAREN MODULE module_expr COLON error
{ unclosed "(" 1 ")" 5 }
| extension
{ mkexp (Pexp_extension $1) }