diff --git a/clangml-transforms.opam.template b/clangml-transforms.opam.template deleted file mode 100644 index 0ae117ebbaf7b48c6db8a8d3c533209d844a8a51..0000000000000000000000000000000000000000 --- a/clangml-transforms.opam.template +++ /dev/null @@ -1 +0,0 @@ -version: "0.25" \ No newline at end of file diff --git a/clangml-transforms/for_memcad.ml b/clangml-transforms/for_memcad.ml index 0d841f04e57240b55bef4cf17f26f572a60ac891..d69146edea0fab50e948b659e684848c577bf77a 100644 --- a/clangml-transforms/for_memcad.ml +++ b/clangml-transforms/for_memcad.ml @@ -81,15 +81,15 @@ let rec name_anonymous_fields (decl : Clang.Ast.decl list) = | [] -> [] | { desc = RecordDecl ({ keyword; name = ""; _ } as record_decl); _} as record :: - ({ desc = Field { name; qual_type = { desc = + ({ desc = Field ({ qual_type = { desc = Elaborated ({ keyword = keyword'; named_type = { desc = Record { name = IdentifierName ""; _ }; _ } as named_type; _ } as elaborated); _} - as qual_type; bitwidth; init }; _} as field) + as qual_type; _ } as field_desc); _} as field) :: tail when keyword = keyword' -> { record with desc = Clang.Ast.RecordDecl { record_decl with name = "anon" }} :: - { field with desc = Field { name; bitwidth; init; + { field with desc = Field { field_desc with qual_type = { qual_type with desc = Elaborated { elaborated with named_type = { named_type with desc = Record (Clang.Ast.identifier_name "anon") }}}}} :: @@ -526,7 +526,7 @@ with type 'a Applicative.t = 'a Applicative.t = struct let visit_unary_expr_size_of env expr_or_trait : Clang.Ast.expr_desc * accu = let expr_or_trait, delayed_stmts = - Visit.visit [%refl: Clang.Ast.unary_expr_or_type_trait] [] + Visit.visit [%refl: Clang.Ast.expr_or_type] [] env expr_or_trait in let ty = match expr_or_trait with diff --git a/dune-project b/dune-project index 8c48bfb2d917fa6d5ff1416d53a5a5f27de42bd7..319dbd2327d78a656cce398f3214362ccb4b160a 100644 --- a/dune-project +++ b/dune-project @@ -10,6 +10,7 @@ (homepage "https://gitlab.inria.fr/memcad/clangml-transforms") (bug_reports "https://gitlab.inria.fr/memcad/clangml-transforms/issues") (documentation "https://gitlab.inria.fr/memcad/clangml-transforms") +(version "0.26") (package (name clangml-transforms) @@ -17,8 +18,8 @@ (depends (ocaml (and (>= 4.03.0) (< 4.12.0))) (dune (>= 1.11.0)) - (clangml (>= 4.1.0)) + (clangml (>= 4.2.0)) (dolog (>= 4.0.0)) (traverse (>= 0.2.0)) - (refl (>= 0.1.0)) + (refl (>= 0.2.1)) (odoc (and :with-doc (>= 1.5.1)))))