Support upcoming ppxlib (was "ppx_base") (#554)

ocaml · Feb 27, 2018 · c324736 · c324736
1 parent ebce851
commit c324736
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/gen_rules.ml b/src/gen_rules.ml
@@ -1082,7 +1082,11 @@ module Gen(P : Params) = struct
           if List.exists deps ~f:(function
             | "ppx_driver" | "ppx_type_conv" -> true
             | _ -> false) then
-            pps @ [(Loc.none, Pp.of_string "ppx_driver.runner")]
+            pps @ [match Scope.name scope with
+              | Some "ppxlib" ->
+                Loc.none, Pp.of_string "ppxlib.runner"
+              | _ ->
+                Loc.none, Pp.of_string "ppx_driver.runner"]
           else
             pps
         in

diff --git a/src/super_context.ml b/src/super_context.ml
@@ -926,7 +926,7 @@ module PP = struct
 
   let uses_ppx_driver ~pps =
     match (List.last pps : (_ * Pp.t) option :> (_ * string) option) with
-    | Some (_, "ppx_driver.runner") -> true
+    | Some (_, ("ppx_driver.runner" | "ppxlib.runner")) -> true
     | Some _ | None -> false
 
   let promote_correction ~uses_ppx_driver fn build =