From 9c0daa24defa2e488b60d84530b42f420b6182f0 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Sun, 1 Jul 2018 23:00:17 +0700 Subject: [PATCH] Don't hard code parsing_context for sub systems Signed-off-by: Rudi Grinberg --- src/installed_dune_file.ml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/installed_dune_file.ml b/src/installed_dune_file.ml index 803a4918..422f20fc 100644 --- a/src/installed_dune_file.ml +++ b/src/installed_dune_file.ml @@ -1,6 +1,6 @@ open Import -let parse_sub_systems sexps = +let parse_sub_systems ~parsing_context sexps = List.filter_map sexps ~f:(fun sexp -> let name, ver, data = Sexp.Of_sexp.(parse (triple string (located Syntax.Version.t) raw) @@ -21,11 +21,6 @@ let parse_sub_systems sexps = |> Sub_system_name.Map.mapi ~f:(fun name (_, version, data) -> let (module M) = Jbuild.Sub_system_info.get name in Syntax.check_supported M.syntax version; - let parsing_context = - Univ_map.singleton (Syntax.key M.syntax) - (* This is wrong, see #909 *) - (0, 0) - in M.T (Sexp.Of_sexp.parse M.parse parsing_context data)) let of_sexp = @@ -40,8 +35,9 @@ let of_sexp = sum [ "dune", (version >>= fun () -> - list raw >>| fun l -> - parse_sub_systems l) + get_all >>= fun parsing_context -> + list raw >>| + parse_sub_systems ~parsing_context) ] let load fname =