Update for clangml 4.1.0

Makefile

-DUNE_INSTALL_PREFIX = _build/install/default
+DUNE=dune
+FLAGS=
+PROJECT_NAME=clangml-transforms
 
 .PHONY : all
-all : clangml-transforms.opam
-	dune build
+all :
+	$(DUNE) build $(FLAGS)
+
+.PHONY : clean
+clean :
+	$(DUNE) clean $(FLAGS)
 
 .PHONY : install
-install : all
-	dune build @install
-	dune install
+install :
+	$(DUNE) build @install $(FLAGS)
+	$(DUNE) install $(FLAGS)
 
-.PHONY : uninstall
-uninstall :
-	dune uninstall
+.PHONY : doc
+doc :
+	$(DUNE) build @doc $(FLAGS)
 
 .PHONY : tests
 tests :
-	dune runtest
-
-.PHONY : clean
-clean :
-	dune clean
+	$(DUNE) runtest $(FLAGS)
 
-clangml-transforms.opam : dune-project
-	dune build clangml-transforms.opam
+$(PROJECT_NAME).opam : dune-project $(PROJECT_NAME).opam.template
+	dune build $(PROJECT_NAME).opam

clangml-transforms.opam.template

+version: "0.25"
\ No newline at end of file

clangml-transforms/dune

 (library
   (name clangml_transforms)
   (public_name clangml-transforms)
+  (preprocess (pps refl.ppx))
   (wrapped false)
-  (preprocess (staged_pps override))
-  (libraries clangml clangml.lift dolog clangml_visitors))
+  (libraries clangml refl dolog))

dune-project

@@ -15,8 +15,7 @@
  (name clangml-transforms)
  (synopsis "Code transformers for clangml")
  (depends
-  (ocaml (>= 4.04))
-  (dune (>= 1.10))
-  (clangml (>= 4.0.1))
-  (dolog (>= 4.0.0))
-  (visitors (>= 20190711))))
+  (ocaml (and (>= 4.04.0) (< 4.11.0)))
+  (dune (>= 2.2.0))
+  (clangml (>= 4.1.0))
+  (dolog (>= 4.0.0))))

tests/dune

-(executable
+(test
   (name tests)
-  (libraries clangml-transforms clangml.compare clangml.show))
\ No newline at end of file
+  (preprocess (pps refl.ppx))
+  (libraries clangml-transforms refl))
\ No newline at end of file

tests/tests.ml

@@ -4,12 +4,12 @@ let has_errors = ref false
 
 let check_translation_decl source target =
   let transformed = For_memcad.transform_decl source in
-  if Clangml_compare.Decl.compare transformed target <> 0 then
+  if Refl.compare [%refl: Clang.Ast.decl] [] transformed target <> 0 then
     begin
       Format.eprintf "@[From:@ %a@]@.@[Got:@ %a@]@.@[Expected:@ %a@]@."
-        Clangml_show.pp_decl source
-        Clangml_show.pp_decl transformed
-        Clangml_show.pp_decl target;
+        (Refl.pp [%refl: Clang.Ast.decl] []) source
+        (Refl.pp [%refl: Clang.Ast.decl] []) transformed
+        (Refl.pp [%refl: Clang.Ast.decl] []) target;
       has_errors := true
     end
 
@@ -32,7 +32,7 @@ let () =
                 args = []}}}}}]}}} -> ()
         | decl ->
             Format.fprintf Format.err_formatter "%a\n"
-              Clangml_show.pp_decl decl;
+              (Refl.pp [%refl: Clang.Ast.decl] []) decl;
             assert false
       end
   | _ -> assert false
@@ -92,7 +92,7 @@ let () =
                     desc = StringLiteral { bytes = "false"}}}}}}}]}}} -> ()
         | decl ->
             Format.fprintf Format.err_formatter "%a\n"
-              Clangml_show.pp_decl decl;
+              (Refl.pp [%refl: Clang.Ast.decl] []) decl;
             assert false
       end
   | _ -> assert false
@@ -119,7 +119,7 @@ let () =
                 args = [{ desc = IntegerLiteral (Int 4)}]}}}}}]}}} -> ()
         | decl ->
             Format.fprintf Format.err_formatter "%a\n"
-              Clangml_show.pp_decl decl;
+              (Refl.pp [%refl: Clang.Ast.decl] []) decl;
             assert false
       end
   | _ -> assert false

visitors/clangml_visitors.ml

-[@@@ocaml.warning "-30"]
-
-[%%rewrite
-  module%import Clang__ = struct
-    module%import Clang__bindings = struct
-      type cxcursor =
-        Clang__.Clang__bindings.cxcursor [@opaque] [@@rewrite] [@@remove]
-      type cxtype =
-        Clang__.Clang__bindings.cxtype [@opaque] [@@rewrite] [@@remove]
-      type cxcursorkind =
-        Clang__.Clang__bindings.cxcursorkind [@opaque] [@@rewrite] [@@remove]
-      type clang_ext_declkind =
-        Clang__.Clang__bindings.clang_ext_declkind [@opaque] [@@rewrite] [@@remove]
-      type clang_ext_typekind =
-        Clang__.Clang__bindings.clang_ext_typekind [@opaque] [@@rewrite] [@@remove]
-      type cxfloat =
-        Clang__.Clang__bindings.cxfloat [@opaque] [@@rewrite] [@@remove]
-      type cxint =
-        Clang__.Clang__bindings.cxint [@opaque] [@@rewrite] [@@remove]
-      type cxlinkagekind =
-        Clang__.Clang__bindings.cxlinkagekind [@opaque] [@@rewrite] [@@remove]
-      type cxcallingconv =
-        Clang__.Clang__bindings.cxcallingconv [@opaque] [@@rewrite] [@@remove]
-      type cx_cxxaccessspecifier =
-        Clang__.Clang__bindings.cx_cxxaccessspecifier
-            [@opaque] [@@rewrite] [@@remove]
-      type cxtypekind =
-        Clang__.Clang__bindings.cxtypekind [@opaque] [@@rewrite] [@@remove]
-      type clang_ext_attrkind =
-        Clang__.Clang__bindings.clang_ext_attrkind [@opaque] [@@rewrite] [@@remove]
-      type clang_ext_binaryoperatorkind =
-        Clang__.Clang__bindings.clang_ext_binaryoperatorkind
-            [@opaque] [@@rewrite] [@@remove]
-      type clang_ext_unaryoperatorkind =
-        Clang__.Clang__bindings.clang_ext_unaryoperatorkind
-            [@opaque] [@@rewrite] [@@remove]
-      type clang_ext_unaryexpr =
-        Clang__.Clang__bindings.clang_ext_unaryexpr [@opaque] [@@rewrite] [@@remove]
-      type clang_ext_characterkind =
-        Clang__.Clang__bindings.clang_ext_characterkind [@opaque]
-            [@@rewrite] [@@remove]
-      type clang_ext_elaboratedtypekeyword =
-        Clang__.Clang__bindings.clang_ext_elaboratedtypekeyword
-            [@opaque] [@@rewrite] [@@remove]
-      type cxsourcelocation =
-        Clang__.Clang__bindings.cxsourcelocation [@opaque] [@@rewrite] [@@remove]
-      type clang_ext_stmtkind =
-        Clang__.Clang__bindings.clang_ext_stmtkind [@opaque] [@@rewrite] [@@remove]
-      type clang_ext_lambdacapturekind =
-        Clang__.Clang__bindings.clang_ext_lambdacapturekind [@opaque] [@@rewrite] [@@remove]
-      type clang_ext_lambdacapturedefault =
-        Clang__.Clang__bindings.clang_ext_lambdacapturedefault [@opaque] [@@rewrite] [@@remove]
-      type clang_ext_predefinedexpr_identkind =
-        Clang__.Clang__bindings.clang_ext_predefinedexpr_identkind [@opaque] [@@rewrite] [@@remove]
-      type clang_ext_stringkind =
-        Clang__.Clang__bindings.clang_ext_stringkind [@opaque] [@@rewrite] [@@remove]
-      type clang_ext_overloadedoperatorkind =
-        Clang__.Clang__bindings.clang_ext_overloadedoperatorkind [@opaque] [@@rewrite] [@@remove]
-      type clang_ext_exceptionspecificationtype =
-        Clang__.Clang__bindings.clang_ext_exceptionspecificationtype [@opaque] [@@rewrite] [@@remove]
-    end
-    module%import Clang__types = struct
-      type language = language [@opaque] [@@rewrite] [@@remove]
-    end
-  end
-
-  module%import Clang = struct
-    [%%recursive
-     module%import Ast = struct
-       type concrete_location = _
-       type source_location = _
-       type 'qual_type open_decoration = _
-       type ('a, 'qual_type) open_node = _
-     end]
-     [@@deriving
-        visitors { variety = "iter"; name = "base_iter"; polymorphic = true },
-        visitors { variety = "map"; name = "base_map"; polymorphic = true },
-        visitors {
-          variety = "reduce"; name = "base_reduce"; polymorphic = true },
-        visitors {
-          variety = "mapreduce"; name = "base_mapreduce"; polymorphic = true }]
-
-    [%%recursive
-     module%import Types = struct
-       type language = _ [@@rewrite]
-     end
-     module%import Ast = struct
-       type translation_unit = _ and co
-     end]
-       [@@deriving
-         visitors { variety = "iter"; ancestors = ["base_iter"] },
-         visitors { variety = "map"; ancestors = ["base_map"] },
-         visitors { variety = "reduce"; ancestors = ["base_reduce"] },
-         visitors { variety = "mapreduce"; ancestors = ["base_mapreduce"] }]
-  end]

visitors/dune

-(library
-  (name clangml_visitors)
-  (public_name clangml-transforms.visitors)
-  (preprocess (staged_pps override ppx_deriving visitors.ppx))
-; -warning 40: Overridden methods
-  (flags -open Stdcompat -w -7)
-  (libraries clangml visitors.runtime))
\ No newline at end of file