Fix decompose_rec

types/types.ml

@@ -2451,16 +2451,22 @@ struct
             (decompose_type y)
         ) (Pair.get bdd) [])) dnf acc
     and aux2 acc = function
-      | (l, (b, t)) :: rest -> aux2 (acc @ [b, l, t]) rest
+      | (l, (b, t)) :: rest -> aux2 (acc @ [b, l, decompose_type t]) rest
       | _ -> assert false
     and aux acc make = function
       | (l, _(*???*), b) :: rest -> aux (acc @ [make b (aux2 [] l)]) make rest
       | [] -> acc
+    and _format_dnf acc = function
+      | (`Atm a) :: rest -> _format_dnf (acc @ [`Atm a]) rest
+      | (`Var x) :: rest -> _format_dnf (acc @ [`Var x]) rest
+      | [] -> acc
+    and format_dnf acc = function
+      | (l1, l2) :: rest -> format_dnf acc [_format_dnf [] l1, _format_dnf []l2]
+      | [] -> acc
     and decompose_rec any make dnf acc =
+      let dnf = format_dnf [] dnf in
       decompose_kind any (fun bdd ->
 	cup (aux [] make (Record.get bdd))) dnf acc
-(*      ignore(decompose_kind any (fun bdd ->
-cup (decompose_dnf (ty any) (aux [] make) (Record.get bdd) [])) dnf acc); [{def=`Type(empty); node=None}]*)
     and decompose_type t =
       try
         DescrHash.find memo t