diff options
| author | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2010-04-08 03:58:41 +0000 |
|---|---|---|
| committer | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2010-04-08 03:58:41 +0000 |
| commit | ee36e1d1c5fa2c90a86ae9b6a9a3f6d3666b4e2b (patch) | |
| tree | 35b439e2c89eb0463944dd6611f567deff2a218b /camlp4/Camlp4 | |
| parent | cfd555426d1d99c104669d05432f689f025ea374 (diff) | |
merge branches/override
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10250 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'camlp4/Camlp4')
| -rw-r--r-- | camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml b/camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml index a4a904206..dc5192bf0 100644 --- a/camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml +++ b/camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml @@ -1009,8 +1009,8 @@ module Make (Ast : Sig.Camlp4Ast) = struct | CrCtr loc t1 t2 -> [Pcf_cstr (ctyp t1, ctyp t2, mkloc loc) :: l] | <:class_str_item< $cst1$; $cst2$ >> -> class_str_item cst1 (class_str_item cst2 l) - | CrInh _ ce "" -> [Pcf_inher (class_expr ce) None :: l] - | CrInh _ ce pb -> [Pcf_inher (class_expr ce) (Some pb) :: l] + | CrInh _ ce "" -> [Pcf_inher Fresh (class_expr ce) None :: l] + | CrInh _ ce pb -> [Pcf_inher Fresh (class_expr ce) (Some pb) :: l] | CrIni _ e -> [Pcf_init (expr e) :: l] | CrMth loc s b e t -> let t = @@ -1018,8 +1018,9 @@ module Make (Ast : Sig.Camlp4Ast) = struct [ <:ctyp<>> -> None | t -> Some (mkpolytype (ctyp t)) ] in let e = mkexp loc (Pexp_poly (expr e) t) in - [Pcf_meth (s, mkprivate b, e, mkloc loc) :: l] - | CrVal loc s b e -> [Pcf_val (s, mkmutable b, expr e, mkloc loc) :: l] + [Pcf_meth (s, mkprivate b, Fresh, e, mkloc loc) :: l] + | CrVal loc s b e -> + [Pcf_val (s, mkmutable b, Fresh, expr e, mkloc loc) :: l] | CrVir loc s b t -> [Pcf_virt (s, mkprivate b, mkpolytype (ctyp t), mkloc loc) :: l] | CrVvr loc s b t -> |