diff options
| author | Sébastien Dailly <sebastien@chimrod.com> | 2021-09-03 15:15:00 +0200 |
|---|---|---|
| committer | Sébastien Dailly <sebastien@chimrod.com> | 2021-09-03 15:15:00 +0200 |
| commit | 48dc04c3b9afe19207d15b873452129d9c2b3b4c (patch) | |
| tree | 2c46df86808aa738a28ce95d5b62a58ffaf12459 /src/lib/modifiers | |
| parent | ad45e1b397ba995dc0222057a8dc1d0c38970c4f (diff) | |
Continued refactoring
Diffstat (limited to 'src/lib/modifiers')
| -rw-r--r-- | src/lib/modifiers/mute.ml | 2 | ||||
| -rw-r--r-- | src/lib/modifiers/nasal.ml | 6 | ||||
| -rw-r--r-- | src/lib/modifiers/sig.ml | 2 | ||||
| -rw-r--r-- | src/lib/modifiers/vocalize.ml | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/modifiers/mute.ml b/src/lib/modifiers/mute.ml index 253df21..3597876 100644 --- a/src/lib/modifiers/mute.ml +++ b/src/lib/modifiers/mute.ml @@ -6,7 +6,7 @@ open StdLabels *)let process : 'a Sig.modifier = fun (type el) m init -> - let module T = (val m:Sounds.T with type t = el) in + let module T = (val m:Sounds.Sig.T with type t = el) in let (((v1, v2), c) , ending) = init in let is_voyel = T.is_voyel v1 && T.is_voyel v2 in match is_voyel, c with diff --git a/src/lib/modifiers/nasal.ml b/src/lib/modifiers/nasal.ml index 8fdc60c..ec8ddb4 100644 --- a/src/lib/modifiers/nasal.ml +++ b/src/lib/modifiers/nasal.ml @@ -1,9 +1,9 @@ (* Remove the ending consonant, and transform the voyel into the nasal form *) let transform - : (module Sounds.T with type t = 'a) -> 'a Sig.consonants option -> 'a Sig.t -> 'a Sig.t + : (module Sounds.Sig.T with type t = 'a) -> 'a Sig.consonants option -> 'a Sig.t -> 'a Sig.t = fun (type el) m c init -> - let module T = (val m:Sounds.T with type t = el) in + let module T = (val m:Sounds.Sig.T with type t = el) in let (((v1, v2), _) , _) = init in begin match T.nasal v1, T.nasal v2 with @@ -22,7 +22,7 @@ let transform let process : 'a Sig.modifier = fun (type el) m init -> - let module T = (val m:Sounds.T with type t = el) in + let module T = (val m:Sounds.Sig.T with type t = el) in let (((v1, v2), c) , ending) = init in let ending = Option.bind ending (fun x -> x) in let opening = Option.map (fun v -> v.Sig.opening) c in diff --git a/src/lib/modifiers/sig.ml b/src/lib/modifiers/sig.ml index 1485247..4cf605f 100644 --- a/src/lib/modifiers/sig.ml +++ b/src/lib/modifiers/sig.ml @@ -9,4 +9,4 @@ type 'a group = 'a voyel * 'a consonants option type 'a t = 'a group * 'a option option -type 'a modifier = (module Sounds.T with type t = 'a) -> 'a t -> 'a t +type 'a modifier = (module Sounds.Sig.T with type t = 'a) -> 'a t -> 'a t diff --git a/src/lib/modifiers/vocalize.ml b/src/lib/modifiers/vocalize.ml index dab36ed..b390757 100644 --- a/src/lib/modifiers/vocalize.ml +++ b/src/lib/modifiers/vocalize.ml @@ -3,7 +3,7 @@ let process : 'a Sig.modifier = fun (type el) m init -> - let module T = (val m:Sounds.T with type t = el) in + let module T = (val m:Sounds.Sig.T with type t = el) in let (((v1, v2), c) , ending) = init in match c with |