diff options
| author | Alain Frisch <alain@frisch.fr> | 2014-04-30 08:19:55 +0000 |
|---|---|---|
| committer | Alain Frisch <alain@frisch.fr> | 2014-04-30 08:19:55 +0000 |
| commit | b791d666d824cf3dff297cf4e25bca1bde3a3109 (patch) | |
| tree | 8c5ab4a3e5885c1aaa738de1245c8031a380179b /tools | |
| parent | 772a84381271f12426d5010be27c6f4bf6263b05 (diff) | |
| download | ocaml-b791d666d824cf3dff297cf4e25bca1bde3a3109.tar.gz | |
#6387: allow attributes on variants in polymorphic variant types.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14712 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/depend.ml | 2 | ||||
| -rw-r--r-- | tools/tast_iter.ml | 2 | ||||
| -rw-r--r-- | tools/untypeast.ml | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tools/depend.ml b/tools/depend.ml index 5f300ae88a..a5de43737d 100644 --- a/tools/depend.ml +++ b/tools/depend.ml @@ -48,7 +48,7 @@ let rec add_type bv ty = | Ptyp_alias(t, s) -> add_type bv t | Ptyp_variant(fl, _, _) -> List.iter - (function Rtag(_,_,stl) -> List.iter (add_type bv) stl + (function Rtag(_,_,_,stl) -> List.iter (add_type bv) stl | Rinherit sty -> add_type bv sty) fl | Ptyp_poly(_, t) -> add_type bv t diff --git a/tools/tast_iter.ml b/tools/tast_iter.ml index e5bd5e56d1..4ed5c45eaf 100644 --- a/tools/tast_iter.ml +++ b/tools/tast_iter.ml @@ -302,7 +302,7 @@ let class_structure sub cs = let row_field sub rf = match rf with - | Ttag (_label, _bool, list) -> List.iter (sub # core_type) list + | Ttag (_label, _attrs, _bool, list) -> List.iter (sub # core_type) list | Tinherit ct -> sub # core_type ct let class_field sub cf = diff --git a/tools/untypeast.ml b/tools/untypeast.ml index eaf3aadf5c..caff88f299 100644 --- a/tools/untypeast.ml +++ b/tools/untypeast.ml @@ -554,8 +554,8 @@ and untype_class_structure cs = and untype_row_field rf = match rf with - Ttag (label, bool, list) -> - Rtag (label, bool, List.map untype_core_type list) + Ttag (label, attrs, bool, list) -> + Rtag (label, attrs, bool, List.map untype_core_type list) | Tinherit ct -> Rinherit (untype_core_type ct) and untype_class_field cf = |