Port the ppx from omp to ppxlib

.travis.yml

@@ -90,8 +90,6 @@ scripts:
       - |
         OCAMLC=`ocamlc -version`
         case ${OCAMLC:0:6} in
-          "4.02.3") OCAMLFORMAT_BINARY=YES;;
-          "4.03.0") OCAMLFORMAT_BINARY=YES;;
           "4.04.2") OCAMLFORMAT_BINARY=YES;;
           "4.05.0") OCAMLFORMAT_BINARY=YES;;
           "4.12.0") OCAMLFORMAT_BINARY=YES;;
@@ -121,8 +119,6 @@ scripts:
       - make build
       - |
         case `ocamlc -version` in
-          "4.02.3") TEST_ALIAS=@compatible;;
-          "4.03.0") TEST_ALIAS=@compatible;;
           "4.04.2") TEST_ALIAS=@compatible;;
           "4.05.0") TEST_ALIAS=@compatible;;
           "4.06.1") TEST_ALIAS=@compatible;;
@@ -197,12 +193,6 @@ matrix:
     - <<: *opam
       os: linux
       env: COMPILER=4.04.2
-    - <<: *opam
-      os: linux
-      env: COMPILER=4.03.0
-    - <<: *opam
-      os: linux
-      env: COMPILER=4.02.3
 
   allow_failures:
     - env: COMPILER=ocaml-variants.4.12.0+trunk REPOSITORIES=--repositories=default,beta=git+https://github.com/ocaml/ocaml-beta-repository.git
@@ -212,8 +202,6 @@ matrix:
     - env: COMPILER=4.07.1 USAGE_TEST=YES
     - env: COMPILER=4.06.1
     - env: COMPILER=4.05.0
-    - env: COMPILER=4.04.2
-    - env: COMPILER=4.03.0
 
   fast_finish: true
 

binaries.esy.json

@@ -3,8 +3,7 @@
     "ocaml": ">= 4.2.0",
     "@opam/cmdliner": "^1.0.0",
     "@opam/dune": "^2.7.0",
-    "@opam/ocaml-migrate-parsetree": "^1.7.0",
-    "@opam/ppx_tools_versioned": "^5.4.0"
+    "@opam/ppxlib": ">= 0.21.0"
   },
   "esy": {
     "build": "dune build -p bisect_ppx",

bisect_ppx.opam

@@ -23,17 +23,9 @@ depends: [
   "cmdliner" {>= "1.0.0"}
   "dune" {>= "2.7.0"}
   "ocaml" {>= "4.02.0"}
-  "ocaml-migrate-parsetree" {>= "1.7.0" & < "2.0.0"}
-  "ppx_tools_versioned" {>= "5.4.0"}
+  "ppxlib" {>= "0.21.0"}
 
-  "ocamlformat" {with-test & = "git.1bf68a7"}
-]
-
-pin-depends: [
-  # This is the last commit before ocamlformat's ppxlib conversion. A newer
-  # commit, or no pin at all, can be used once Bisect_ppx is also converted to
-  # ppxlib.
-  ["ocamlformat.git.1bf68a7" "git+https://github.com/ocaml-ppx/ocamlformat.git#1bf68a70f1480df80a8ab0bd20a799b8e1df0081"]
+  "ocamlformat" {with-test & = "0.16.0"}
 ]
 
 build: [

src/ppx/bucklescript/dune

@@ -1,3 +1,3 @@
 (executable
  (name ppx)
- (libraries bisect_ppx ocaml-migrate-parsetree))
+ (libraries bisect_ppx ppxlib))

src/ppx/bucklescript/ppx.ml

@@ -1,10 +1,3 @@
-let () =
-  let argc = Array.length Sys.argv in
-  let argv =
-    let output_file = Sys.argv.(argc - 1) in
-    Array.(append
-      (sub Sys.argv 0 (argc - 1))
-      [|"-o"; output_file; "--dump-ast"; "--conditional"|])
-  in
+let _ = Bisect_ppx.Register.conditional := true
 
-  Migrate_parsetree.Driver.run_main ~argv ()
+let () = Ppxlib.Driver.run_as_ppx_rewriter ()

src/ppx/dune

@@ -8,5 +8,6 @@
  (instrumentation.backend (ppx bisect_ppx))
  (synopsis "Code coverage for OCaml")
  (ppx_runtime_libraries bisect_ppx.runtime)
- (preprocess (pps ppx_tools_versioned.metaquot_411))
- (libraries bisect_ppx.common ocaml-migrate-parsetree ppx_tools_versioned str))
+ (preprocess (pps ppxlib.metaquot))
+ (flags (:standard -open Ocaml_shadow))
+ (libraries bisect_ppx.common ppxlib str))