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

Simplify Dep_conf.t 

Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
This commit is contained in:
Jeremie Dimino 2018-07-09 18:47:55 +01:00 committed by Rudi Grinberg
parent 0b2bda03ed
commit eb68a9067d
1 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/jbuild.ml
View File

@ -299,31 +299,29 @@ module Dep_conf = struct
| Package of String_with_vars.t
| Universe
let dep_cons =
let sw = String_with_vars.t in
[ "file" , (sw >>| fun x -> File x)
; "alias" , (sw >>| fun x -> Alias x)
; "alias_rec" , (sw >>| fun x -> Alias_rec x)
; "glob_files" , (sw >>| fun x -> Glob_files x)
; "package" , (sw >>| fun x -> Package x)
; "universe" , return Universe
; "files_recursively_in",
(Syntax.renamed_in Stanza.syntax (1, 0) ~to_:"source_tree"
>>= fun () ->
sw >>| fun x -> Source_tree x)
; "source_tree",
(Syntax.since Stanza.syntax (1, 0) >>= fun () ->
sw >>| fun x -> Source_tree x)
]
let make_dep_parser ~single ~many =
let t =
let t =
let sw = String_with_vars.t in
sum
[ "file" , (sw >>| fun x -> File x)
; "alias" , (sw >>| fun x -> Alias x)
; "alias_rec" , (sw >>| fun x -> Alias_rec x)
; "glob_files" , (sw >>| fun x -> Glob_files x)
; "package" , (sw >>| fun x -> Package x)
; "universe" , return Universe
; "files_recursively_in",
(Syntax.renamed_in Stanza.syntax (1, 0) ~to_:"source_tree"
>>= fun () ->
sw >>| fun x -> Source_tree x)
; "source_tree",
(Syntax.since Stanza.syntax (1, 0) >>= fun () ->
sw >>| fun x -> Source_tree x)
]
in
peek_exn >>= function
| Template _ | Atom _ | Quoted_string _ ->
String_with_vars.t >>| fun x -> single (File x)
| List _ -> many
let t =
make_dep_parser ~single:(fun x -> x) ~many:(sum dep_cons)
String_with_vars.t >>| fun x -> File x
| List _ -> t
open Sexp
let sexp_of_t = function