diff options
author | Alain Frisch <alain@frisch.fr> | 2009-10-26 10:53:16 +0000 |
---|---|---|
committer | Alain Frisch <alain@frisch.fr> | 2009-10-26 10:53:16 +0000 |
commit | 1e5b4a48572ec2a06d6f732e7da443fa720425bd (patch) | |
tree | 9bdaec60181fc5ce87c5a5785fe0c71c3872eb22 /typing/outcometree.mli | |
parent | 023fda3fb4151d12c029890bf689ec8d13a7f2bb (diff) | |
download | ocaml-1e5b4a48572ec2a06d6f732e7da443fa720425bd.tar.gz |
Merge first class modules: svn merge -r 9369:9396 $caml/branches/fstclassmod.
Adapt the Changes file. Bump magic numbers. Bootstrap.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9397 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'typing/outcometree.mli')
-rw-r--r-- | typing/outcometree.mli | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/typing/outcometree.mli b/typing/outcometree.mli index 852a9ee15a..80c28ea085 100644 --- a/typing/outcometree.mli +++ b/typing/outcometree.mli @@ -60,6 +60,8 @@ type out_type = | Otyp_variant of bool * out_variant * bool * (string list) option | Otyp_poly of string list * out_type + | Otyp_module of string * string list * out_type list + and out_variant = | Ovar_fields of (string * bool * out_type list) list | Ovar_name of out_ident * out_type list |