1 files changed, 59 insertions, 16 deletions

diff --git a/src/PrintPure.ml b/src/PrintPure.ml
index 000a85d8..539cfabf 100644
--- a/src/PrintPure.ml
+++ b/src/PrintPure.ml
@@ -15,16 +15,15 @@ module SymbolicValueId = V.SymbolicValueId
 module FunDefId = A.FunDefId
 
 type type_formatter = {
-  type_var_id_to_string : T.TypeVarId.id -> string;
-  type_def_id_to_string : T.TypeDefId.id -> string;
+  type_var_id_to_string : TypeVarId.id -> string;
+  type_def_id_to_string : TypeDefId.id -> string;
 }
 
 type value_formatter = {
-  type_var_id_to_string : T.TypeVarId.id -> string;
-  type_def_id_to_string : T.TypeDefId.id -> string;
-  adt_variant_to_string : T.TypeDefId.id -> T.VariantId.id -> string;
-  adt_field_names :
-    T.TypeDefId.id -> T.VariantId.id option -> string list option;
+  type_var_id_to_string : TypeVarId.id -> string;
+  type_def_id_to_string : TypeDefId.id -> string;
+  adt_variant_to_string : TypeDefId.id -> VariantId.id -> string;
+  adt_field_names : TypeDefId.id -> VariantId.id option -> string list option;
 }
 
 let value_to_type_formatter (fmt : value_formatter) : type_formatter =
@@ -34,13 +33,12 @@ let value_to_type_formatter (fmt : value_formatter) : type_formatter =
   }
 
 type ast_formatter = {
-  type_var_id_to_string : T.TypeVarId.id -> string;
-  type_def_id_to_string : T.TypeDefId.id -> string;
-  adt_variant_to_string : T.TypeDefId.id -> T.VariantId.id -> string;
+  type_var_id_to_string : TypeVarId.id -> string;
+  type_def_id_to_string : TypeDefId.id -> string;
+  adt_variant_to_string : TypeDefId.id -> VariantId.id -> string;
   adt_field_to_string :
-    T.TypeDefId.id -> T.VariantId.id option -> T.FieldId.id -> string;
-  adt_field_names :
-    T.TypeDefId.id -> T.VariantId.id option -> string list option;
+    TypeDefId.id -> VariantId.id option -> FieldId.id -> string;
+  adt_field_names : TypeDefId.id -> VariantId.id option -> string list option;
   fun_def_id_to_string : A.FunDefId.id -> string;
 }
 
@@ -56,9 +54,14 @@ let ast_to_type_formatter (fmt : ast_formatter) : type_formatter =
   let fmt = ast_to_value_formatter fmt in
   value_to_type_formatter fmt
 
-(* TODO: there is a bit of duplication with Print.fun_def_to_ast_formatter *)
-let fun_def_to_ast_formatter (type_defs : T.type_def T.TypeDefId.Map.t)
-    (fun_defs : A.fun_def A.FunDefId.Map.t) (fdef : A.fun_def) : ast_formatter =
+(* TODO: there is a bit of duplication with Print.fun_def_to_ast_formatter.
+
+   TODO: use the pure defs as inputs? Note that it is a bit annoying for the
+   functions (there is a difference between the forward/backward functions...)
+   while we only need those definitions to lookup proper names for the def ids.
+*)
+let fun_def_to_ast_formatter (type_defs : T.type_def TypeDefId.Map.t)
+    (fun_defs : A.fun_def FunDefId.Map.t) (fdef : A.fun_def) : ast_formatter =
   let type_var_id_to_string vid =
     let var = T.TypeVarId.nth fdef.signature.type_params vid in
     Print.Types.type_var_to_string var
@@ -97,6 +100,8 @@ let type_id_to_string (fmt : type_formatter) (id : T.type_id) : string =
       match aty with
       | Box -> (* Boxes should have been eliminated *) failwith "Unreachable")
 
+let type_var_to_string = Print.Types.type_var_to_string
+
 let rec ty_to_string (fmt : type_formatter) (ty : ty) : string =
   match ty with
   | Adt (id, tys) -> (
@@ -113,3 +118,41 @@ let rec ty_to_string (fmt : type_formatter) (ty : ty) : string =
   | Str -> "str"
   | Array aty -> "[" ^ ty_to_string fmt aty ^ "; ?]"
   | Slice sty -> "[" ^ ty_to_string fmt sty ^ "]"
+
+let field_to_string fmt (f : field) : string =
+  f.field_name ^ " : " ^ ty_to_string fmt f.field_ty
+
+let variant_to_string fmt (v : variant) : string =
+  v.variant_name ^ "("
+  ^ String.concat ", " (List.map (field_to_string fmt) v.fields)
+  ^ ")"
+
+let type_def_to_string (type_def_id_to_string : TypeDefId.id -> string)
+    (def : type_def) : string =
+  let types = def.type_params in
+  let type_var_id_to_string id =
+    match List.find_opt (fun tv -> tv.T.index = id) types with
+    | Some tv -> type_var_to_string tv
+    | None -> failwith "Unreachable"
+  in
+  let fmt = { type_var_id_to_string; type_def_id_to_string } in
+  let name = Print.name_to_string def.name in
+  let params =
+    if types = [] then ""
+    else " " ^ String.concat " " (List.map type_var_to_string types)
+  in
+  match def.kind with
+  | Struct fields ->
+      if List.length fields > 0 then
+        let fields =
+          String.concat ","
+            (List.map (fun f -> "\n  " ^ field_to_string fmt f) fields)
+        in
+        "struct " ^ name ^ params ^ "{" ^ fields ^ "}"
+      else "struct " ^ name ^ params ^ "{}"
+  | Enum variants ->
+      let variants =
+        List.map (fun v -> "|  " ^ variant_to_string fmt v) variants
+      in
+      let variants = String.concat "\n" variants in
+      "enum " ^ name ^ params ^ " =\n" ^ variants