diff options
Diffstat (limited to 'typing/typedtree.mli')
| -rw-r--r-- | typing/typedtree.mli | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/typing/typedtree.mli b/typing/typedtree.mli index 674512210a..af9b324fdf 100644 --- a/typing/typedtree.mli +++ b/typing/typedtree.mli @@ -22,7 +22,6 @@ *) open Asttypes -open Types (* Value expressions for the core language *) @@ -39,7 +38,7 @@ type pattern = { pat_desc: pattern_desc; pat_loc: Location.t; pat_extra : (pat_extra * Location.t * attributes) list; - pat_type: type_expr; + pat_type: Types.type_expr; mutable pat_env: Env.t; pat_attributes: attributes; } @@ -77,19 +76,19 @@ and pattern_desc = Invariant: n >= 2 *) | Tpat_construct of - Longident.t loc * constructor_description * pattern list + Longident.t loc * Types.constructor_description * pattern list (** C [] C P [P] C (P1, ..., Pn) [P1; ...; Pn] *) - | Tpat_variant of label * pattern option * row_desc ref + | Tpat_variant of label * pattern option * Types.row_desc ref (** `A (None) `A P (Some P) See {!Types.row_desc} for an explanation of the last parameter. *) | Tpat_record of - (Longident.t loc * label_description * pattern) list * + (Longident.t loc * Types.label_description * pattern) list * closed_flag (** { l1=P1; ...; ln=Pn } (flag = Closed) { l1=P1; ...; ln=Pn; _} (flag = Open) @@ -98,7 +97,7 @@ and pattern_desc = *) | Tpat_array of pattern list (** [| P1; ...; Pn |] *) - | Tpat_or of pattern * pattern * row_desc option + | Tpat_or of pattern * pattern * Types.row_desc option (** P1 | P2 [row_desc] = [Some _] when translating [Ppat_type _], @@ -113,7 +112,7 @@ and expression = { exp_desc: expression_desc; exp_loc: Location.t; exp_extra: (exp_extra * Location.t * attributes) list; - exp_type: type_expr; + exp_type: Types.type_expr; exp_env: Env.t; exp_attributes: attributes; } @@ -183,7 +182,7 @@ and expression_desc = | Texp_tuple of expression list (** (E1, ..., EN) *) | Texp_construct of - Longident.t loc * constructor_description * expression list + Longident.t loc * Types.constructor_description * expression list (** C [] C E [E] C (E1, ..., En) [E1;...;En] @@ -205,9 +204,9 @@ and expression_desc = { fields = [| l1, Kept t1; l2 Override P2 |]; representation; extended_expression = Some E0 } *) - | Texp_field of expression * Longident.t loc * label_description + | Texp_field of expression * Longident.t loc * Types.label_description | Texp_setfield of - expression * Longident.t loc * label_description * expression + expression * Longident.t loc * Types.label_description * expression | Texp_array of expression list | Texp_ifthenelse of expression * expression * expression option | Texp_sequence of expression * expression @@ -288,7 +287,7 @@ and class_expr_desc = | Tcl_let of rec_flag * value_binding list * (Ident.t * expression) list * class_expr | Tcl_constraint of - class_expr * class_type option * string list * string list * Concr.t + class_expr * class_type option * string list * string list * Types.Concr.t (* Visible instance variables, methods and concrete methods *) | Tcl_open of open_description * class_expr @@ -297,7 +296,7 @@ and class_structure = cstr_self: pattern; cstr_fields: class_field list; cstr_type: Types.class_signature; - cstr_meths: Ident.t Meths.t; + cstr_meths: Ident.t Types.Meths.t; } and class_field = @@ -387,7 +386,7 @@ and module_binding = { mb_id: Ident.t option; mb_name: string option loc; - mb_presence: module_presence; + mb_presence: Types.module_presence; mb_expr: module_expr; mb_attributes: attributes; mb_loc: Location.t; @@ -428,7 +427,7 @@ and module_type_desc = and primitive_coercion = { pc_desc: Primitive.description; - pc_type: type_expr; + pc_type: Types.type_expr; pc_env: Env.t; pc_loc : Location.t; } @@ -464,7 +463,7 @@ and module_declaration = { md_id: Ident.t option; md_name: string option loc; - md_presence: module_presence; + md_presence: Types.module_presence; md_type: module_type; md_attributes: attributes; md_loc: Location.t; @@ -525,7 +524,7 @@ and with_constraint = and core_type = { mutable ctyp_desc : core_type_desc; (** mutable because of [Typeclass.declare_method] *) - mutable ctyp_type : type_expr; + mutable ctyp_type : Types.type_expr; (** mutable because of [Typeclass.declare_method] *) ctyp_env : Env.t; (* BINANNOT ADDED *) ctyp_loc : Location.t; @@ -725,7 +724,7 @@ val let_bound_idents: value_binding list -> Ident.t list val rev_let_bound_idents: value_binding list -> Ident.t list val let_bound_idents_with_loc: - value_binding list -> (Ident.t * string loc * type_expr) list + value_binding list -> (Ident.t * string loc * Types.type_expr) list (** Alpha conversion of patterns *) val alpha_pat: (Ident.t * Ident.t) list -> pattern -> pattern @@ -735,7 +734,7 @@ val mkloc: 'a -> Location.t -> 'a Asttypes.loc val pat_bound_idents: pattern -> Ident.t list val pat_bound_idents_full: - pattern -> (Ident.t * string loc * type_expr) list + pattern -> (Ident.t * string loc * Types.type_expr) list (** Splits an or pattern into its value (left) and exception (right) parts. *) val split_pattern : pattern -> pattern option * pattern option |