Remove dependency on ocaml-migrate-parsetree

(and rely on ppxlib, which thankfully offers a compatibility register function)

Author: AltGr

learn-ocaml-client.opam

@@ -34,7 +34,6 @@ depends: [
   "lwt_ssl"
   "ocaml" {(>= "4.12") & (< "4.13~")}
   "ocamlfind" {build}
-  "ocaml-migrate-parsetree" {= "1.8.0"}
   "ocp-indent-nlfork"
   "ocplib-json-typed" {>= "0.7"}
   "ocp-ocamlres" {>= "0.4"}

learn-ocaml-client.opam.locked

@@ -72,7 +72,6 @@ depends: [
   "ocaml" {= "4.12.1"}
   "ocaml-compiler-libs" {= "v0.12.4"}
   "ocaml-config" {= "2"}
-  "ocaml-migrate-parsetree" {= "1.8.0"}
   "ocaml-options-vanilla" {= "1"}
   "ocaml-syntax-shims" {= "1.0.0"}
   "ocamlbuild" {= "0.14.1"}

learn-ocaml.opam

@@ -49,7 +49,6 @@ depends: [
   "markup-lwt"
   "ocaml" {(>= "4.12") & (< "4.13~")}
   "ocamlfind" {build}
-  "ocaml-migrate-parsetree" {= "1.8.0"}
   "ocp-indent-nlfork" {>= "1.5.5"}
   "ocplib-json-typed" {>= "0.7"}
   "ocplib-json-typed-browser" {>= "0.7"}

learn-ocaml.opam.locked

@@ -80,7 +80,6 @@ depends: [
   "ocaml" {= "4.12.1"}
   "ocaml-compiler-libs" {= "v0.12.4"}
   "ocaml-config" {= "2"}
-  "ocaml-migrate-parsetree" {= "1.8.0"}
   "ocaml-options-vanilla" {= "1"}
   "ocaml-syntax-shims" {= "1.0.0"}
   "ocamlbuild" {= "0.14.1"}

src/grader/introspection.ml

@@ -162,7 +162,7 @@ let get_value lid ty =
         Typetexp.transl_type_scheme !Toploop.toplevel_env (Ty.obj ty) in
       let path, { Types.val_type; _ } =
         Env.find_value_by_name lid !Toploop.toplevel_env in
-      if Ctype.moregeneral !Toploop.toplevel_env true val_type exp_type then
+      if Ctype.is_moregeneral !Toploop.toplevel_env true val_type exp_type then
         Present (Obj.obj @@ Toploop.eval_value_path !Toploop.toplevel_env path)
       else
         failwith (Format.asprintf "Wrong type %a." Printtyp.type_sch val_type)
@@ -327,8 +327,14 @@ let sample_value ty =
   | true ->
     let path, { Types.val_type; _ } =
       Env.find_value_by_name (Longident.Lident lid) !Toploop.toplevel_env in
-    let gty = Types.{ty with desc = Tarrow (Asttypes.Nolabel, Predef.type_unit, ty, Cok) } in
-    if Ctype.moregeneral !Toploop.toplevel_env true val_type gty then
+    let gty =
+      Types.Private_type_expr.create
+        Types.(Tarrow (Asttypes.Nolabel, Predef.type_unit, ty, Cok))
+        ~level:ty.Types.level
+        ~scope:ty.Types.scope
+        ~id:ty.Types.id
+    in
+    if Ctype.is_moregeneral !Toploop.toplevel_env true val_type gty then
       (Obj.obj @@ Toploop.eval_value_path !Toploop.toplevel_env path)
     else (failwith "sampler has the wrong type !")
   | false ->

src/ppx-metaquot/dune

@@ -1,7 +1,8 @@
 (executable
  (name genlifter)
- (libraries ppx_tools compiler-libs)
  (modules Genlifter)
+ (preprocess (action (run %{bin:cppo} -V OCAML:%{ocaml_version} %{input-file})))
+ (libraries compiler-libs.common ppx_tools)
 )
 
 (rule

src/ppx-metaquot/exercise_ppx_main.ml

@@ -6,4 +6,4 @@
  * included LICENSE file for details. *)
 
 let () =
-  Migrate_parsetree.Driver.run_main ~exit_on_error:true ()
+  Ppxlib.Driver.run_as_ppx_rewriter ()

src/ppx-metaquot/grader_ppx.ml

@@ -6,7 +6,12 @@
  * included LICENSE file for details. *)
 
 let () =
-  Migrate_parsetree.Driver.register ~name:"ppx_metaquot" (module Migrate_parsetree.OCaml_412)
-    (fun _config _cookies -> Ppx_metaquot.Main.expander []);
+  let mapper = Ppx_metaquot.expander [] in
+  let impl = mapper.Ast_mapper.structure mapper in
+  let intf = mapper.Ast_mapper.signature mapper in
+  Ppxlib.Driver.register_transformation_using_ocaml_current_ast
+    "ppx_metaquot" ~impl ~intf
+
+let () =
   Ppxlib.Driver.register_transformation "print_recorder" ~impl:Printer_recorder.expand;
   Ppxlib.Driver.register_transformation "sample_recorder" ~impl:Sampler_recorder.expand

src/ppx-metaquot/grader_ppx_main.ml

@@ -6,4 +6,4 @@
  * included LICENSE file for details. *)
 
 let () =
-  Migrate_parsetree.Driver.run_main ~exit_on_error:true ()
+  Ppxlib.Driver.run_as_ppx_rewriter ()

src/repo/learnocaml_precompile_exercise.ml

@@ -43,7 +43,7 @@ let ocamlc ?(dir=Sys.getcwd ()) ?(opn=[]) ?(ppx=[]) ~source ~target args =
   if is_fresh ~dir target source then Lwt.return_unit else
   let args =
     List.fold_right (fun ppx args ->
-        "-ppx" :: Filename.concat !grading_cmis_dir (ppx^" --as-ppx") :: args)
+        "-ppx" :: Filename.concat !grading_cmis_dir ppx :: args)
       ppx args
   in
   let args = "-I" :: dir :: "-I" :: !grading_cmis_dir :: args in