fixup! proposal rework of relop flag

ocaml · Oct 25, 2024 · 01f61c3 · 01f61c3
1 parent dd8302e
commit 01f61c3
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 26 deletions.
diff --git a/master_changes.md b/master_changes.md
@@ -128,6 +128,5 @@ users)
 ## opam-solver
 
 ## opam-format
-  * `OpamFomula`: export `string_of_relop` [#6197 @mbarbin]
 
 ## opam-core
diff --git a/src/client/opamAdminCommand.ml b/src/client/opamAdminCommand.ml
@@ -832,21 +832,20 @@ let check_command cli =
 
 let compare_versions_command_doc = "Compare two package versions"
 let compare_versions_command cli =
-  let operator : OpamFormula.relop option Term.t =
-     let make_flag (relop : OpamFormula.relop) =
-       let flag_name =
-         match relop with
-         | `Eq -> "eq"
-         | `Neq -> "neq"
-         | `Geq -> "geq"
-         | `Gt -> "gt"
-         | `Leq -> "leq"
-         | `Lt -> "lt"
-       in
-       let doc = Printf.sprintf "assert V0 %s V1" (OpamFormula.string_of_relop relop) in
-       OpamArg.(cli_from cli2_4), Some relop, [ flag_name ], doc
-     in
-     OpamArg.mk_vflag ~cli None (List.map make_flag OpamFormula.all_relop)
+  let relop_flag =
+    let make_flag (relop, name) =
+      let doc =
+        Printf.sprintf "assert V0 %s V1" (OpamFormula.string_of_relop relop)
+      in
+      OpamArg.(cli_from cli2_4), Some relop, [ name ], doc
+    in
+    let relops =
+      List.map make_flag
+        [ `Eq, "eq" ; `Neq, "neq" ;
+          `Geq, "geq" ; `Gt, "gt" ;
+          `Leq, "leq" ; `Lt, "lt" ]
+    in
+    OpamArg.mk_vflag ~cli None relops
   in
   let version_arg n =
     let doc =
@@ -893,7 +892,7 @@ let compare_versions_command cli =
          else `False)
   in
   OpamArg.mk_command ~cli OpamArg.(cli_from cli2_4) command ~doc ~man
-    Term.(const cmd $ version_arg 0 $ version_arg 1 $ operator)
+    Term.(const cmd $ version_arg 0 $ version_arg 1 $ relop_flag)
 
 let pattern_list_arg =
   OpamArg.arg_list "PATTERNS"

diff --git a/src/format/opamFormula.ml b/src/format/opamFormula.ml
@@ -11,8 +11,6 @@
 
 type relop = [`Eq|`Neq|`Geq|`Gt|`Leq|`Lt]
 
-let all_relop = [ `Eq ; `Neq ; `Geq ; `Gt ; `Leq ; `Lt ]
-
 let neg_relop = function
   | `Eq -> `Neq
   | `Neq -> `Eq

diff --git a/src/format/opamFormula.mli b/src/format/opamFormula.mli
@@ -17,13 +17,6 @@ type relop = OpamParserTypes.FullPos.relop_kind (* = [ `Eq | `Neq | `Geq | `Gt |
 
 val compare_relop : relop -> relop -> int
 
-(** A list containing each available operator once. *)
-val all_relop : relop list
-
-(** Returns a string representing the operator in infix syntax, as
-    used in opam files (">", "=", etc.) *)
-val string_of_relop : relop -> string
-
 (** Version constraints for OPAM *)
 type version_constraint = relop * OpamPackage.Version.t