diff options
Diffstat (limited to 'typing/typedtree.mli')
| -rw-r--r-- | typing/typedtree.mli | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/typing/typedtree.mli b/typing/typedtree.mli index b68d0cc8c0..a7161914c6 100644 --- a/typing/typedtree.mli +++ b/typing/typedtree.mli @@ -92,7 +92,7 @@ and expression_desc = | Texp_sequence of expression * expression | Texp_while of expression * expression | Texp_for of - Ident.t * string loc * expression * expression * direction_flag * + Ident.t * Parsetree.pattern * expression * expression * direction_flag * expression | Texp_send of expression * meth * expression option | Texp_new of Path.t * Longident.t loc * Types.class_declaration @@ -186,7 +186,7 @@ and module_type_constraint = and module_expr_desc = Tmod_ident of Path.t * Longident.t loc | Tmod_structure of structure - | Tmod_functor of Ident.t * string loc * module_type * module_expr + | Tmod_functor of Ident.t * string loc * module_type option * module_expr | Tmod_apply of module_expr * module_expr * module_coercion | Tmod_constraint of module_expr * Types.module_type * module_type_constraint * module_coercion @@ -226,6 +226,7 @@ and module_binding = mb_name: string loc; mb_expr: module_expr; mb_attributes: attributes; + mb_loc: Location.t; } and value_binding = @@ -237,9 +238,11 @@ and value_binding = and module_coercion = Tcoerce_none - | Tcoerce_structure of (int * module_coercion) list + | Tcoerce_structure of (int * module_coercion) list * + (Ident.t * int * module_coercion) list | Tcoerce_functor of module_coercion * module_coercion | Tcoerce_primitive of Primitive.description + | Tcoerce_alias of Path.t * module_coercion and module_type = { mty_desc: module_type_desc; @@ -252,9 +255,10 @@ and module_type = and module_type_desc = Tmty_ident of Path.t * Longident.t loc | Tmty_signature of signature - | Tmty_functor of Ident.t * string loc * module_type * module_type + | Tmty_functor of Ident.t * string loc * module_type option * module_type | Tmty_with of module_type * (Path.t * Longident.t loc * with_constraint) list | Tmty_typeof of module_expr + | Tmty_alias of Path.t * Longident.t loc and signature = { sig_items : signature_item list; @@ -286,6 +290,7 @@ and module_declaration = md_name: string loc; md_type: module_type; md_attributes: attributes; + md_loc: Location.t; } and module_type_declaration = @@ -294,6 +299,7 @@ and module_type_declaration = mtd_name: string loc; mtd_type: module_type option; mtd_attributes: attributes; + mtd_loc: Location.t; } and with_constraint = |