From 8390af90e4018bd479ccc5228689d109499daf96 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Sun, 1 Jul 2018 17:00:02 +0700 Subject: [PATCH] Simplify versioning matching Signed-off-by: Rudi Grinberg --- src/installed_dune_file.ml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/installed_dune_file.ml b/src/installed_dune_file.ml index 1940b5ed..8c9b98e7 100644 --- a/src/installed_dune_file.ml +++ b/src/installed_dune_file.ml @@ -63,15 +63,13 @@ let load fname = | _ -> Loc.fail (Sexp.Loc.of_lexbuf lexbuf) "%s" bad_dune_file in - match version with - | "1" -> - Sexp.Of_sexp.parse of_sexp Univ_map.empty - (Io.Sexp.load ~lexer:Sexp.Lexer.jbuild_token ~mode:Single fname) - | "2" -> - Sexp.Of_sexp.parse of_sexp Univ_map.empty - (Io.Sexp.load ~lexer:Sexp.Lexer.token ~mode:Single fname) - | _ -> - Loc.fail version_loc "unknown version %S" version) + let lexer = + match version with + | "1" -> Sexp.Lexer.jbuild_token + | "2" -> Sexp.Lexer.token + | _ -> Loc.fail version_loc "unknown version %S" version + in + Sexp.Of_sexp.parse of_sexp Univ_map.empty lexer ~mode:Single fname let gen confs = let sexps =