diff options
author | Emilio Jesus Gallego Arias <e+git@x80.org> | 2018-05-21 20:48:30 +0200 |
---|---|---|
committer | Emilio Jesus Gallego Arias <e+git@x80.org> | 2018-06-12 14:42:27 +0200 |
commit | 9367f1626afb080d10d425262dca705046a32933 (patch) | |
tree | d91633162c245239e50587e766b739194f094a57 /library | |
parent | 2af78d3cca0f941841394b224b96f86903a68b10 (diff) |
[api] Misctypes removal: module_kind to Declaremods
Diffstat (limited to 'library')
-rw-r--r-- | library/declaremods.ml | 6 | ||||
-rw-r--r-- | library/declaremods.mli | 8 | ||||
-rw-r--r-- | library/misctypes.ml | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/library/declaremods.ml b/library/declaremods.ml index 1d5df49cf..e8d89f96b 100644 --- a/library/declaremods.ml +++ b/library/declaremods.ml @@ -36,6 +36,8 @@ type inline = | DefaultInline | InlineAt of int +type module_kind = Module | ModType | ModAny + let default_inline () = Some (Flags.get_inline_level ()) let inl2intopt = function @@ -994,8 +996,8 @@ let iter_all_segments f = (** {6 Some types used to shorten declaremods.mli} *) type 'modast module_interpretor = - Environ.env -> Misctypes.module_kind -> 'modast -> - Entries.module_struct_entry * Misctypes.module_kind * Univ.ContextSet.t + Environ.env -> module_kind -> 'modast -> + Entries.module_struct_entry * module_kind * Univ.ContextSet.t type 'modast module_params = (lident list * ('modast * inline)) list diff --git a/library/declaremods.mli b/library/declaremods.mli index 4aee7feae..63b25c7e4 100644 --- a/library/declaremods.mli +++ b/library/declaremods.mli @@ -27,9 +27,13 @@ type inline = | DefaultInline | InlineAt of int +(** Kinds of modules *) + +type module_kind = Module | ModType | ModAny + type 'modast module_interpretor = - Environ.env -> Misctypes.module_kind -> 'modast -> - Entries.module_struct_entry * Misctypes.module_kind * Univ.ContextSet.t + Environ.env -> module_kind -> 'modast -> + Entries.module_struct_entry * module_kind * Univ.ContextSet.t type 'modast module_params = (Misctypes.lident list * ('modast * inline)) list diff --git a/library/misctypes.ml b/library/misctypes.ml index ac8c7890c..a12caef80 100644 --- a/library/misctypes.ml +++ b/library/misctypes.ml @@ -75,7 +75,6 @@ type 'a bindings = type 'a with_bindings = 'a * 'a bindings - (** Some utility types for parsing *) type 'a or_var = @@ -93,11 +92,6 @@ type 'a or_by_notation = 'a or_by_notation_r CAst.t (* NB: the last string in [ByNotation] is actually a [Notation.delimiters], but this formulation avoids a useless dependency. *) - -(** Kinds of modules *) - -type module_kind = Module | ModType | ModAny - (** Various flags *) type direction_flag = bool (* true = Left-to-right false = right-to-right *) |