Revert "_"

This reverts commit 440d328.

Signed-off-by: Rudi Grinberg <me@rgrinberg.com>

src/dune_pkg/dependency_formula.ml

@@ -6,18 +6,31 @@ let of_dependencies deps = Package_dependency.list_to_opam_filtered_formula deps
 let to_filtered_formula v = v
 let of_filtered_formula v = v
 let to_dyn = Opam_dyn.filtered_formula
-let ands = OpamFormula.ands
 
-let remove_packages (v : OpamTypes.filtered_formula) pkgs =
-  OpamFormula.map_up_formula
-    (function
-      | Atom (name, _condition) as a ->
-        if let name = Package_name.of_opam_package_name name in
-           Package_name.Set.mem pkgs name
-        then Empty
-        else a
-      | x -> x)
-    v
+let rec union = function
+  | [] -> OpamTypes.Empty
+  | x :: xs ->
+    let xs = union xs in
+    OpamTypes.And (x, xs)
+;;
+
+let rec remove_packages (v : OpamTypes.filtered_formula) pkgs =
+  match v with
+  | Empty -> OpamTypes.Empty
+  | Block b -> Block (remove_packages b pkgs)
+  | Atom (name, _condition) as a ->
+    let name = name |> OpamPackage.Name.to_string |> Package_name.of_string in
+    (match Package_name.Set.mem pkgs name with
+     | true -> Empty
+     | false -> a)
+  | And (l, r) ->
+    let l = remove_packages l pkgs in
+    let r = remove_packages r pkgs in
+    And (l, r)
+  | Or (l, r) ->
+    let l = remove_packages l pkgs in
+    let r = remove_packages r pkgs in
+    Or (l, r)
 ;;
 
 exception Found of Package_name.t

src/dune_pkg/dependency_formula.mli

@@ -13,8 +13,9 @@ val of_filtered_formula : OpamTypes.filtered_formula -> t
 (** Create a Dyn representation of the dependency formula *)
 val to_dyn : t -> Dyn.t
 
-(* Join all dependencies in the list to a single conjunction *)
-val ands : t list -> t
+(* Join two dependency formulas into one that represents a dependency on
+   both LHS and RHS *)
+val union : t list -> t
 
 (** Remove a package from the entire formula *)
 val remove_packages : t -> Package_name.Set.t -> t

src/dune_pkg/local_package.ml

@@ -74,10 +74,8 @@ module For_solver = struct
 
   let non_local_dependencies local_deps =
     let local_deps_names = Package_name.Set.of_list_map ~f:(fun d -> d.name) local_deps in
-    let formula =
-      List.map ~f:(fun { dependencies; _ } -> dependencies) local_deps
-      |> Dependency_formula.ands
-    in
+    let deps = List.map ~f:(fun { dependencies; _ } -> dependencies) local_deps in
+    let formula = Dependency_formula.union deps in
     Dependency_formula.remove_packages formula local_deps_names
   ;;
 end