matthieu
/
dune
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't hard code parsing_context for sub systems 

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
This commit is contained in:
Rudi Grinberg 2018-07-01 23:00:17 +07:00
parent ba9335badf
commit 9c0daa24de
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/installed_dune_file.ml
View File

@ -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 =