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

quelques conflits de moins 

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@2763 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
master
Damien Doligez 2000-01-21 19:01:39 +00:00
parent 08adaea24f
commit 9e072eea62
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
parsing/parser.mly
View File

@ -698,7 +698,7 @@ label_simple_pattern:
{ ($1, mkpat(Ppat_var $1)) }
;
expr:
simple_expr
simple_expr %prec SHARP
{ $1 }
| simple_expr simple_labeled_expr_list %prec prec_appl
{ mkexp(Pexp_apply($1, List.rev $2)) }
@ -720,7 +720,7 @@ expr:
{ mkexp(Pexp_try($2, List.rev $5)) }
| TRY seq_expr WITH error %prec prec_try
{ syntax_error() }
| expr_comma_list
| expr_comma_list %prec COMMA
{ mkexp(Pexp_tuple(List.rev $1)) }
| constr_longident simple_expr %prec prec_constr_appl
{ mkexp(Pexp_construct($1, Some $2, false)) }
@ -810,6 +810,8 @@ simple_expr:
{ unclosed "(" 1 ")" 3 }
| BEGIN seq_expr END
{ $2 }
| BEGIN END
{ mkexp (Pexp_ident (Lident "()")) }
| BEGIN seq_expr error
{ unclosed "begin" 1 "end" 3 }
| LPAREN seq_expr type_constraint RPAREN
@ -1337,7 +1339,7 @@ val_longident:
| mod_longident DOT val_ident { Ldot($1, $3) }
;
constr_longident:
mod_longident { $1 }
mod_longident %prec DOT { $1 }
| LBRACKET RBRACKET { Lident "[]" }
| LPAREN RPAREN { Lident "()" }
| FALSE { Lident "false" }