From bedad1f6898da158054d687ca84b3ef8fa608fa8 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Sun, 1 Jul 2018 17:08:15 +0700 Subject: [PATCH] Set version when parsing dune files Signed-off-by: Rudi Grinberg --- src/installed_dune_file.ml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/installed_dune_file.ml b/src/installed_dune_file.ml index 8c9b98e7..a1afb4a6 100644 --- a/src/installed_dune_file.ml +++ b/src/installed_dune_file.ml @@ -63,13 +63,15 @@ let load fname = | _ -> Loc.fail (Sexp.Loc.of_lexbuf lexbuf) "%s" bad_dune_file in - let lexer = + let (lexer, syntax) = match version with - | "1" -> Sexp.Lexer.jbuild_token - | "2" -> Sexp.Lexer.token + | "1" -> (Sexp.Lexer.jbuild_token, (0, 0)) + | "2" -> (Sexp.Lexer.token, (1, 0)) | _ -> Loc.fail version_loc "unknown version %S" version in - Sexp.Of_sexp.parse of_sexp Univ_map.empty lexer ~mode:Single fname + Sexp.Of_sexp.parse of_sexp + (Univ_map.singleton (Syntax.key Stanza.syntax) syntax) + (Io.Sexp.load ~lexer ~mode:Single fname)) let gen confs = let sexps =