diff options
Diffstat (limited to 'parsing')
| -rw-r--r-- | parsing/parser.mly | 28 | ||||
| -rw-r--r-- | parsing/parsetree.mli | 3 | ||||
| -rw-r--r-- | parsing/printast.ml | 2 |
3 files changed, 26 insertions, 7 deletions
diff --git a/parsing/parser.mly b/parsing/parser.mly index 06a505ccf2..6183eb5109 100644 --- a/parsing/parser.mly +++ b/parsing/parser.mly @@ -644,11 +644,29 @@ parent_binder: {None} ; value: - mutable_flag label EQUAL seq_expr - { $2, $1, $4, symbol_rloc () } - | mutable_flag label type_constraint EQUAL seq_expr - { $2, $1, (let (t, t') = $3 in ghexp(Pexp_constraint($5, t, t'))), - symbol_rloc () } + mutable_flag label value_may_expr access_flags + { let e = match $3 with Some e -> e + | None -> mkexp(Pexp_ident(Lident $2)) in + $2, $1, $4, e, symbol_rloc () } + | mutable_flag label type_constraint value_may_expr access_flags + { let (t, t') = $3 in + let e = match $4 with Some e -> e + | None -> mkexp(Pexp_ident(Lident $2)) in + $2, $1, $5, ghexp(Pexp_constraint(e, t, t')), symbol_rloc () } +; +value_may_expr: + EQUAL seq_expr + { Some $2 } + | /* empty */ + { None } +; +access_flags: + WITH label + { Some(Public, $2) } + | WITH PRIVATE label + { Some(Private, $3) } + | /* empty */ + { None } ; virtual_method: METHOD PRIVATE VIRTUAL method_label COLON poly_type diff --git a/parsing/parsetree.mli b/parsing/parsetree.mli index df68be90d5..dc542bfbde 100644 --- a/parsing/parsetree.mli +++ b/parsing/parsetree.mli @@ -178,7 +178,8 @@ and class_structure = pattern * class_field list and class_field = Pcf_inher of class_expr * string option | Pcf_deleg of core_type * expression - | Pcf_val of (string * mutable_flag * expression * Location.t) + | Pcf_val of (string * mutable_flag * (private_flag * string) option * + expression * Location.t) | Pcf_virt of (string * private_flag * core_type * Location.t) | Pcf_meth of (string * private_flag * expression * Location.t) | Pcf_cstr of (core_type * core_type * Location.t) diff --git a/parsing/printast.ml b/parsing/printast.ml index cc054c9970..edeb21dd4b 100644 --- a/parsing/printast.ml +++ b/parsing/printast.ml @@ -430,7 +430,7 @@ and class_field i ppf x = printf "Pcf_deleg\n"; core_type (i+1) ppf t; expression (i+1) ppf e; - | Pcf_val (s, mf, e, loc) -> + | Pcf_val (s, mf, _, e, loc) -> line i ppf "Pcf_val \"%s\" %a %a\n" s fmt_mutable_flag mf fmt_location loc; expression (i+1) ppf e; |