Update for ClangML

clangml-transforms/dune

@@ -3,4 +3,4 @@
   (public_name clangml-transforms)
   (wrapped false)
   (preprocess (staged_pps override))
-  (libraries clangml clangml.lift dolog))
+  (libraries clangml clangml.lift dolog clangml_visitors))

clangml-transforms/for_memcad.ml

@@ -87,14 +87,14 @@ let close_node ((stmt, _stmts) as node) =
 let rec name_anonymous_fields (decl : Clang.Ast.decl list) =
   match decl with
   | [] -> []
-  | { desc = RecordDecl { keyword; name = ""; fields; bases }; _} as record ::
+  | { desc = RecordDecl { keyword; name = ""; fields; bases; final }; _} as record ::
     ({ desc = Field { name; qual_type = { desc =
       Elaborated { keyword = keyword';
         named_type = { desc = Record (Ident ""); _ } as named_type}; _}
       as qual_type; bitwidth; init }; _} as field)
     :: tail when keyword = keyword' ->
     { record with
-      desc = Clang.Ast.RecordDecl { keyword; name = "anon"; fields; bases }} ::
+      desc = Clang.Ast.RecordDecl { keyword; name = "anon"; fields; bases; final }} ::
     { field with desc = Field { name;  bitwidth; init;
       qual_type = { qual_type with desc = Elaborated {
       keyword; named_type = { named_type with desc = Record (Ident "anon") }}}}} ::

visitors/clangml_visitors.ml

@@ -5,6 +5,8 @@
     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 =
@@ -61,7 +63,8 @@
      module%import Ast = struct
        type concrete_location = _
        type source_location = _
-       type 'qual_type open_decoration = _ and co
+       type 'qual_type open_decoration = _
+       type ('a, 'qual_type) open_node = _
      end]
      [@@deriving
         visitors { variety = "iter"; name = "base_iter"; polymorphic = true },