Skip to content

Commit f1918c2

Browse files
committed
fix build on < 4.05 versions
1 parent 4c13850 commit f1918c2

File tree

1 file changed

+10
-12
lines changed

1 file changed

+10
-12
lines changed

src/kernel/mconfig.ml

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -342,25 +342,23 @@ let merlin_flags = [
342342
(
343343
"-assocsuffix",
344344
Marg.param "suffix:reader"
345-
(fun assocpair merlin ->
346-
let splitList = String.split_on_char ~sep:':' assocpair in
347-
match splitList with
348-
| [suffix;reader] ->
349-
{merlin with
345+
(fun assoc_pair merlin ->
346+
match Misc.rev_string_split ~on:':' assoc_pair with
347+
| [reader;suffix] ->
348+
{merlin with
350349
extension_to_reader = (suffix,reader)::merlin.extension_to_reader}
351-
| _ -> merlin
350+
| _ -> merlin
352351
),
353352
"Associate suffix with reader"
354353
);
355354
(
356355
"-addsuffix",
357-
Marg.param "implementation Suffix, interface Suffix"
358-
(fun suffixPair merlin ->
359-
let splitList = String.split_on_char ~sep:',' suffixPair in
360-
match splitList with
361-
| [impl;intf] ->
356+
Marg.param "implementation Suffix, interface Suffix"
357+
(fun suffix_pair merlin ->
358+
match Misc.rev_string_split ~on:':' suffix_pair with
359+
| [intf;impl] ->
362360
{merlin with suffixes = (impl,intf)::merlin.suffixes}
363-
| _ -> merlin
361+
| _ -> merlin
364362
),
365363
"Add a suffix implementation,interface pair"
366364
);

0 commit comments

Comments
 (0)