robur/opam-graph
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Opam_graph: Some cleanup + small optimization

Browse source
This commit is contained in:
rand00 2022-03-18 12:56:08 +01:00
parent 538640d23b
commit e0c3dd0f23
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/opam_graph.ml
View file

@ -79,7 +79,7 @@ let pp_graph ppf graph =
(Name_set.elements deps)))) (Name_set.elements deps))))
graph.nodes graph.nodes
let dependencies ?(transitive=false) (switch : OpamFile.SwitchExport.t) = let dependencies ~transitive (switch : OpamFile.SwitchExport.t) =
let root_pkg = root switch in let root_pkg = root switch in
let top = root_pkg.OpamPackage.name in let top = root_pkg.OpamPackage.name in
let graph = { top ; nodes = Name_map.empty } in let graph = { top ; nodes = Name_map.empty } in
@ -124,9 +124,9 @@ type assoc_stats = int SMap.t
let calc_sharing_stats (deps:graph) : assoc_stats = let calc_sharing_stats (deps:graph) : assoc_stats =
Name_map.fold (fun _pkg deps acc_stats -> Name_map.fold (fun _pkg deps acc_stats ->
Name_set.fold (fun pkg acc_stats -> Name_set.fold (fun dep acc_stats ->
let pkg_name = OpamPackage.Name.to_string pkg in let dep_name = OpamPackage.Name.to_string dep in
acc_stats |> SMap.update pkg_name (function acc_stats |> SMap.update dep_name (function
| None -> Some 1 | None -> Some 1
| Some count -> Some (succ count)) | Some count -> Some (succ count))
) deps acc_stats ) deps acc_stats
@ -136,7 +136,7 @@ module Ui = struct
let dependencies ?(transitive=true) data : assoc_graph = let dependencies ?(transitive=true) data : assoc_graph =
(*> todo can be made more efficient*) (*> todo can be made more efficient*)
let all_direct_deps = dependencies data in let all_direct_deps = dependencies ~transitive:false data in
let root = all_direct_deps.top in let root = all_direct_deps.top in
let root_str = OpamPackage.Name.to_string root let root_str = OpamPackage.Name.to_string root
in in
@ -144,9 +144,10 @@ module Ui = struct
all_direct_deps.nodes all_direct_deps.nodes
|> Name_map.find root |> Name_map.find root
in in
(*> todo can be made more efficient*)
let all_transitive_deps = let all_transitive_deps =
dependencies ~transitive data in if transitive = false then all_direct_deps else
dependencies ~transitive data
in
let direct_deps_w_transitive_deps = let direct_deps_w_transitive_deps =
direct_deps direct_deps
|> Name_set.elements |> Name_set.elements