forked from
anil.recoil.org/monopam
Monorepo management for opam overlays
monopam: track ocaml-sexpt rename to ocaml-sexp
Swap the [sexpt] dependency for [sexp] in dune-project, lib/dune, and
the opam file. Drop the [module Sexp = Sexpt.Sexp] aliases in
dune_project.ml and lint.ml (the new package exports Sexp directly).
In dune_project.ml, [parse_string_many]'s error type changed from
[string] to a structured [Sexp.Error.t]; format it explicitly with
[Sexp.Error.to_string] so the error message carries through to the
existing [err_parse] helper.
+5
-10
+1
-1
dune-project
+1
-1
dune-project
+1
-1
lib/dune
+1
-1
lib/dune
+1
-3
lib/dune_project.ml
+1
-3
lib/dune_project.ml
···
19
19
Fmt.(list ~sep:(any ", ") string)
20
20
t.packages
21
21
22
-
module Sexp = Sexpt.Sexp
23
-
24
22
let err_parse msg = Error (Fmt.str "S-expression parse error: %s" msg)
25
23
26
24
(** Extract string from a Sexp.Atom, or None if it's a List *)
···
187
185
let parse content =
188
186
let content = preprocess_dune_strings content in
189
187
match Sexp.parse_string_many content with
190
-
| Error err -> err_parse err
188
+
| Error err -> err_parse (Sexp.Error.to_string err)
191
189
| Ok sexps -> (
192
190
match string_field "name" sexps with
193
191
| None -> Error "dune-project missing (name ...) stanza"
+1
-4
lib/lint.ml
+1
-4
lib/lint.ml
···
196
196
197
197
(* ---- Dune file scanning (for executable deps not in META) ---- *)
198
198
199
-
module Sexp = Sexpt.Sexp
200
-
201
199
let parse_sexps content =
202
200
match Sexp.parse_string_many content with Ok sexps -> sexps | Error _ -> []
203
201
···
401
399
let all_deps =
402
400
String_set.fold
403
401
(fun pkg acc ->
404
-
String_set.union acc
405
-
(reexports_of_pkg ~fs ~build_lib ~index pkg))
402
+
String_set.union acc (reexports_of_pkg ~fs ~build_lib ~index pkg))
406
403
direct_deps direct_deps
407
404
in
408
405
let dune_pkgs = dune_needed_packages ~fs ~index subtree_path in