diff options
| author | Pierre Weis <Pierre.Weis@inria.fr> | 2003-04-29 07:03:36 +0000 |
|---|---|---|
| committer | Pierre Weis <Pierre.Weis@inria.fr> | 2003-04-29 07:03:36 +0000 |
| commit | 2eed3c25e5300b95a3a09c280a6622e8621d8016 (patch) | |
| tree | b7015710139b5a18747223ef1b84040d05db3c99 /parsing/parser.mly | |
| parent | 69f4f19d78e457752e9e6d23d7836e81c38d9799 (diff) | |
Getting rid of conflicts recently introduced.
One step more towards use of keyword private instead of virtual for
algebraic concrete types with private constructors or labels
(previously known as virtual types).
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5522 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'parsing/parser.mly')
| -rw-r--r-- | parsing/parser.mly | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/parsing/parser.mly b/parsing/parser.mly index 5f809a6a8..7898c2701 100644 --- a/parsing/parser.mly +++ b/parsing/parser.mly @@ -184,8 +184,8 @@ let bigarray_set arr arg newval = "", ghexp(Pexp_array coords); "", newval])) -let mktype_kind vflag kind = - if vflag = Virtual && kind != Ptype_abstract then Ptype_virtual kind else kind +let mktype_kind pflag kind = + if pflag = Private && kind != Ptype_abstract then Ptype_virtual kind else kind %} @@ -355,8 +355,9 @@ The precedences must be listed from low to high. %nonassoc below_DOT %nonassoc DOT /* Finally, the first tokens of simple_expr are above everything else. */ -%nonassoc BACKQUOTE BEGIN CHAR FALSE FLOAT INT LBRACE LBRACELESS LBRACKET - LBRACKETBAR LIDENT LPAREN NEW PREFIXOP STRING TRUE UIDENT +%nonassoc BACKQUOTE BEGIN CHAR FALSE FLOAT INT INT32 INT64 + LBRACE LBRACELESS LBRACKET LBRACKETBAR LIDENT LPAREN + NEW NATIVEINT PREFIXOP STRING TRUE UIDENT /* Entry points */ @@ -1162,17 +1163,17 @@ constraints: type_kind: /*empty*/ { (Ptype_abstract, None) } - | EQUAL virtual_flag core_type + | EQUAL private_flag core_type { (mktype_kind $2 Ptype_abstract, Some $3) } - | EQUAL virtual_flag constructor_declarations + | EQUAL private_flag constructor_declarations { (mktype_kind $2 (Ptype_variant(List.rev $3)), None) } - | EQUAL virtual_flag BAR constructor_declarations + | EQUAL private_flag BAR constructor_declarations { (mktype_kind $2 (Ptype_variant(List.rev $4)), None) } - | EQUAL virtual_flag LBRACE label_declarations opt_semi RBRACE + | EQUAL private_flag LBRACE label_declarations opt_semi RBRACE { (mktype_kind $2 (Ptype_record(List.rev $4)), None) } - | EQUAL virtual_flag core_type EQUAL opt_bar constructor_declarations + | EQUAL private_flag core_type EQUAL opt_bar constructor_declarations { (mktype_kind $2 (Ptype_variant(List.rev $6)), Some $3) } - | EQUAL virtual_flag core_type EQUAL LBRACE label_declarations opt_semi RBRACE + | EQUAL private_flag core_type EQUAL LBRACE label_declarations opt_semi RBRACE { (mktype_kind $2 (Ptype_record(List.rev $6)), Some $3) } ; type_parameters: |