Start using ocamlformat

dune-project

@@ -36,5 +36,3 @@
            ("ocaml" (>= "4.08"))
          )
 )
-
-(formatting disabled)

src/bin/dune

 (executable
-  (name           main)
-  (public_name    colibrics)
-  (libraries
-    ; external deps
-    cmdliner fmt gen
-    ; dolmen deps
-    dolmen dolmen.intf dolmen.std
-    dolmen_type dolmen_loop
-    ; colibrics
-    colibrics
-  )
-   (package colibrics)
-)
+ (name main)
+ (public_name colibrics)
+ (libraries
+  ; external deps
+  cmdliner
+  fmt
+  gen
+  ; dolmen deps
+  dolmen
+  dolmen.intf
+  dolmen.std
+  dolmen_type
+  dolmen_loop
+  ; colibrics
+  colibrics)
+ (package colibrics))
 
 ; Rule to generate a man page for colibrics
+
 (rule
-  (target        colibrics.1)
-  (action (with-outputs-to %{target} (run colibrics --help=groff)))
-)
+ (target colibrics.1)
+ (action
+  (with-outputs-to
+   %{target}
+   (run colibrics --help=groff))))
 
 ; Install the man page
+
 (install
- (files    colibrics.1)
- (section  man)
- (package  colibrics)
-)
+ (files colibrics.1)
+ (section man)
+ (package colibrics))

src/lib/constraints/dune

 (rule
  (targets simple.mlw)
- (action (run generator/generate_simple.exe %{dep:constraints.json} %{dep:simple.template.mlw} simple.mlw))
-)
+ (action
+  (run generator/generate_simple.exe %{dep:constraints.json}
+    %{dep:simple.template.mlw} simple.mlw)))
 
 (rule
  (targets dune.generated)
- (action (run generator/generate_simple.exe %{dep:constraints.json} %{dep:dune.template.generated} dune.generated))
-  (mode promote)
-)
+ (action
+  (run generator/generate_simple.exe %{dep:constraints.json}
+    %{dep:dune.template.generated} dune.generated))
+ (mode promote))
 
 (include dune.generated)

src/lib/constraints/generator/dune

 (executable
  (name generate_simple)
- (preprocess (pps ppx_deriving_yojson))
- (libraries jingoo yojson logs core)
-)
+ (preprocess
+  (pps ppx_deriving_yojson))
+ (libraries jingoo yojson logs core))

src/lib/dune

 (library
-        (public_name colibrics)
-        (libraries zarith)
-       (flags (-w -3))
-)
+ (public_name colibrics)
+ (libraries zarith)
+ (flags
+  (-w -3)))
 
 (rule
-   (deps cp.mlw all.mlw utils/tagtbl.mlw utils/extstd.mlw cp.drv constraints/simple.mlw)
-   (targets utils__extstd__Int63.ml utils__extstd__Bool.ml cp__Impl0.ml cp__Var.ml cp__Var0.ml cp__Type.ml cp__DomB.ml cp__DomI.ml constraints__simple__Simple.ml cp__ConstraintHelpers.ml all__All.ml all__API.ml all__APIDefensive.ml)
-   (action (run why3 extract -L . -D ocaml64 -D cp.drv -o . --modular
-     utils.extstd.Int63 utils.extstd.Bool cp.Impl0 cp.Var cp.Var0 cp.Type cp.DomI cp.DomB constraints.simple.Simple cp.ConstraintHelpers all.All all.API all.APIDefensive))
-)
+ (deps cp.mlw all.mlw utils/tagtbl.mlw utils/extstd.mlw cp.drv
+   constraints/simple.mlw)
+ (targets utils__extstd__Int63.ml utils__extstd__Bool.ml cp__Impl0.ml
+   cp__Var.ml cp__Var0.ml cp__Type.ml cp__DomB.ml cp__DomI.ml
+   constraints__simple__Simple.ml cp__ConstraintHelpers.ml all__All.ml
+   all__API.ml all__APIDefensive.ml)
+ (action
+  (run why3 extract -L . -D ocaml64 -D cp.drv -o . --modular
+    utils.extstd.Int63 utils.extstd.Bool cp.Impl0 cp.Var cp.Var0 cp.Type
+    cp.DomI cp.DomB constraints.simple.Simple cp.ConstraintHelpers all.All
+    all.API all.APIDefensive)))
 
 (copy_files constraints/*.ml)

src_colibri2/bin/dune

 (executable
-  (name           main)
-  (public_name    colibri2)
-  (flags -linkall)
-  (libraries
-    ; external deps
-    cmdliner fmt gen
-    ; dolmen deps
-    dolmen dolmen.intf dolmen.std
-    dolmen_type dolmen_loop
-    ; colibrics
-    colibri2.solver
-    colibri2.theories.bool
-    colibri2.theories.LRA
-    colibri2.theories.quantifiers
-  )
-   (package colibri2)
-)
+ (name main)
+ (public_name colibri2)
+ (flags -linkall)
+ (libraries
+  ; external deps
+  cmdliner
+  fmt
+  gen
+  ; dolmen deps
+  dolmen
+  dolmen.intf
+  dolmen.std
+  dolmen_type
+  dolmen_loop
+  ; colibrics
+  colibri2.solver
+  colibri2.theories.bool
+  colibri2.theories.LRA
+  colibri2.theories.quantifiers)
+ (package colibri2))
 
 ; Rule to generate a man page for colibrics
+
 (rule
-  (target        colibri2.1)
-  (action (with-outputs-to %{target} (run colibri2 --help=groff)))
-)
+ (target colibri2.1)
+ (action
+  (with-outputs-to
+   %{target}
+   (run colibri2 --help=groff))))
 
 ; Install the man page
+
 (install
- (files    colibri2.1)
- (section  man)
- (package  colibri2)
-)
+ (files colibri2.1)
+ (section man)
+ (package colibri2))

src_colibri2/core/structures/dune

@@ -3,7 +3,8 @@
  (public_name colibri2.core.structures)
  (synopsis
    "core structures for colibri2, e.g. terms, semantic terms, values, etc")
- (libraries containers ocamlgraph colibri2.stdlib colibri2.popop_lib str dolmen.std)
+ (libraries containers ocamlgraph colibri2.stdlib colibri2.popop_lib str
+   dolmen.std)
  (preprocess
   (pps ppx_deriving.std))
  (flags :standard -w +a-4-42-44-48-50-58-32-60-40-9@8 -color always -open

src_colibri2/popop_lib/dune

@@ -3,7 +3,8 @@
 (library
  (name colibri2_popop_lib)
  (public_name colibri2.popop_lib)
- (synopsis "Temporary for colibri2 (intended to be replaced by another library)")
+ (synopsis
+   "Temporary for colibri2 (intended to be replaced by another library)")
  (libraries str unix zarith base fmt)
  (preprocess
   (pps ppx_deriving.std ppx_hash))

src_colibri2/solver/dune

@@ -3,7 +3,8 @@
  (public_name colibri2.solver)
  (synopsis "colibri2's solver")
  (libraries containers zarith ocamlgraph gen dolmen spelll colibri2.stdlib
-   colibri2.popop_lib str colibri2.core colibri2.core.structures dolmen_loop dolmen_type)
+   colibri2.popop_lib str colibri2.core colibri2.core.structures dolmen_loop
+   dolmen_type)
  (preprocess
   (pps ppx_deriving.std))
  (flags :standard -w +a-4-42-44-48-50-58-32-60-40-9@8 -color always -open

src_colibri2/tests/dune

 (executable
  (modes byte exe)
  (name tests)
- (libraries containers colibri2.core colibri2.theories.bool colibri2.theories.LRA
-   ounit2 colibri2.solver colibri2.stdlib)
+ (libraries containers colibri2.core colibri2.theories.bool
+   colibri2.theories.LRA ounit2 colibri2.solver colibri2.stdlib)
  (flags :standard -w +a-4-42-44-48-50-58-32-60-9@8 -color always)
  (ocamlopt_flags :standard -O3 -unbox-closures -unbox-closures-factor 20))
 
 (rule
  (alias runtest)
  (deps
-  (:< tests.exe)
- )
+  (:< tests.exe))
  (action
   (run %{<})))

src_colibri2/tests/generate_tests/dune

 (executable
- (name generate_dune_tests)
-)
+ (name generate_dune_tests))

src_colibri2/tests/solve/dimacs/sat/dune

@@ -2,7 +2,11 @@
 
 (rule
  (alias runtest)
- (deps (glob_files *.cnf) (glob_files *.smt2))
- (action (with-stdout-to dune.inc (run %{exe:../../../generate_tests/generate_dune_tests.exe} . sat)))
- (mode promote)
-)
+ (deps
+  (glob_files *.cnf)
+  (glob_files *.smt2))
+ (action
+  (with-stdout-to
+   dune.inc
+   (run %{exe:../../../generate_tests/generate_dune_tests.exe} . sat)))
+ (mode promote))

src_colibri2/tests/solve/dimacs/unsat/dune

@@ -2,7 +2,11 @@
 
 (rule
  (alias runtest)
- (deps (glob_files *.cnf) (glob_files *.smt2))
- (action (with-stdout-to dune.inc (run %{exe:../../../generate_tests/generate_dune_tests.exe} . unsat)))
- (mode promote)
-)
+ (deps
+  (glob_files *.cnf)
+  (glob_files *.smt2))
+ (action
+  (with-stdout-to
+   dune.inc
+   (run %{exe:../../../generate_tests/generate_dune_tests.exe} . unsat)))
+ (mode promote))

src_colibri2/tests/solve/smt_lra/sat/dune

@@ -2,7 +2,11 @@
 
 (rule
  (alias runtest)
- (deps (glob_files *.cnf) (glob_files *.smt2))
- (action (with-stdout-to dune.inc (run %{exe:../../../generate_tests/generate_dune_tests.exe} . sat)))
- (mode promote)
-)
+ (deps
+  (glob_files *.cnf)
+  (glob_files *.smt2))
+ (action
+  (with-stdout-to
+   dune.inc
+   (run %{exe:../../../generate_tests/generate_dune_tests.exe} . sat)))
+ (mode promote))

src_colibri2/tests/solve/smt_lra/unsat/dune

@@ -2,7 +2,11 @@
 
 (rule
  (alias runtest)
- (deps (glob_files *.cnf) (glob_files *.smt2))
- (action (with-stdout-to dune.inc (run %{exe:../../../generate_tests/generate_dune_tests.exe} . unsat)))
- (mode promote)
-)
+ (deps
+  (glob_files *.cnf)
+  (glob_files *.smt2))
+ (action
+  (with-stdout-to
+   dune.inc
+   (run %{exe:../../../generate_tests/generate_dune_tests.exe} . unsat)))
+ (mode promote))

src_colibri2/tests/solve/smt_quant/sat/dune

@@ -2,7 +2,11 @@
 
 (rule
  (alias runtest)
- (deps (glob_files *.cnf) (glob_files *.smt2))
- (action (with-stdout-to dune.inc (run %{exe:../../../generate_tests/generate_dune_tests.exe} . sat)))
- (mode promote)
-)
+ (deps
+  (glob_files *.cnf)
+  (glob_files *.smt2))
+ (action
+  (with-stdout-to
+   dune.inc
+   (run %{exe:../../../generate_tests/generate_dune_tests.exe} . sat)))
+ (mode promote))

src_colibri2/tests/solve/smt_quant/unsat/dune

@@ -2,7 +2,11 @@
 
 (rule
  (alias runtest)
- (deps (glob_files *.cnf) (glob_files *.smt2))
- (action (with-stdout-to dune.inc (run %{exe:../../../generate_tests/generate_dune_tests.exe} . unsat)))
- (mode promote)
-)
+ (deps
+  (glob_files *.cnf)
+  (glob_files *.smt2))
+ (action
+  (with-stdout-to
+   dune.inc
+   (run %{exe:../../../generate_tests/generate_dune_tests.exe} . unsat)))
+ (mode promote))

src_colibri2/tests/solve/smt_uf/sat/dune

@@ -2,7 +2,11 @@
 
 (rule
  (alias runtest)
- (deps (glob_files *.cnf) (glob_files *.smt2))
- (action (with-stdout-to dune.inc (run %{exe:../../../generate_tests/generate_dune_tests.exe} . sat)))
- (mode promote)
-)
+ (deps
+  (glob_files *.cnf)
+  (glob_files *.smt2))
+ (action
+  (with-stdout-to
+   dune.inc
+   (run %{exe:../../../generate_tests/generate_dune_tests.exe} . sat)))
+ (mode promote))

src_colibri2/tests/solve/smt_uf/unsat/dune

@@ -2,7 +2,11 @@
 
 (rule
  (alias runtest)
- (deps (glob_files *.cnf) (glob_files *.smt2))
- (action (with-stdout-to dune.inc (run %{exe:../../../generate_tests/generate_dune_tests.exe} . unsat)))
- (mode promote)
-)
+ (deps
+  (glob_files *.cnf)
+  (glob_files *.smt2))
+ (action
+  (with-stdout-to
+   dune.inc
+   (run %{exe:../../../generate_tests/generate_dune_tests.exe} . unsat)))
+ (mode promote))

src_colibri2/theories/LRA/dune

@@ -5,8 +5,7 @@
  (libraries containers ocamlgraph colibri2.stdlib colibri2.popop_lib
    colibri2.core.structures colibri2.core colibri2.theories.bool)
  (preprocess
-  (pps ppx_deriving.std ppx_hash
- ))
+  (pps ppx_deriving.std ppx_hash))
  (flags :standard -w +a-4-42-44-48-50-58-32-60-40-9@8 -color always -open
    Containers -open Colibri2_stdlib -open Std -open Colibri2_core -open
    Colibri2_theories_bool)