Rename TypeDef...,type_def...,FunDef,fun_def to ...Decl,...decl

1 files changed, 15 insertions, 14 deletions

diff --git a/src/Modules.ml b/src/Modules.ml
index 1199d74a..3ee4c9ed 100644
--- a/src/Modules.ml
+++ b/src/Modules.ml
@@ -4,9 +4,10 @@ open CfimAst
 type 'id g_declaration_group = NonRec of 'id | Rec of 'id list
 [@@deriving show]
 
-type type_declaration_group = TypeDefId.id g_declaration_group [@@deriving show]
+type type_declaration_group = TypeDeclId.id g_declaration_group
+[@@deriving show]
 
-type fun_declaration_group = FunDefId.id g_declaration_group [@@deriving show]
+type fun_declaration_group = FunDeclId.id g_declaration_group [@@deriving show]
 
 (** Module declaration *)
 type declaration_group =
@@ -17,22 +18,22 @@ type declaration_group =
 type cfim_module = {
   name : string;
   declarations : declaration_group list;
-  types : type_def list;
-  functions : fun_def list;
+  types : type_decl list;
+  functions : fun_decl list;
 }
-(** CFIM module *)
+(** LLBC module - TODO: rename to crate *)
 
 let compute_defs_maps (m : cfim_module) :
-    type_def TypeDefId.Map.t * fun_def FunDefId.Map.t =
+    type_decl TypeDeclId.Map.t * fun_decl FunDeclId.Map.t =
   let types_map =
     List.fold_left
-      (fun m (def : type_def) -> TypeDefId.Map.add def.def_id def m)
-      TypeDefId.Map.empty m.types
+      (fun m (def : type_decl) -> TypeDeclId.Map.add def.def_id def m)
+      TypeDeclId.Map.empty m.types
   in
   let funs_map =
     List.fold_left
-      (fun m (def : fun_def) -> FunDefId.Map.add def.def_id def m)
-      FunDefId.Map.empty m.functions
+      (fun m (def : fun_decl) -> FunDeclId.Map.add def.def_id def m)
+      FunDeclId.Map.empty m.functions
   in
   (types_map, funs_map)
 
@@ -54,8 +55,8 @@ let split_declarations (decls : declaration_group list) :
     declaration groups.
  *)
 let split_declarations_to_group_maps (decls : declaration_group list) :
-    type_declaration_group TypeDefId.Map.t
-    * fun_declaration_group FunDefId.Map.t =
+    type_declaration_group TypeDeclId.Map.t
+    * fun_declaration_group FunDeclId.Map.t =
   let module G (M : Map.S) = struct
     let add_group (map : M.key g_declaration_group M.t)
         (group : M.key g_declaration_group) : M.key g_declaration_group M.t =
@@ -68,8 +69,8 @@ let split_declarations_to_group_maps (decls : declaration_group list) :
       List.fold_left add_group M.empty groups
   end in
   let types, funs = split_declarations decls in
-  let module TG = G (TypeDefId.Map) in
+  let module TG = G (TypeDeclId.Map) in
   let types = TG.create_map types in
-  let module FG = G (FunDefId.Map) in
+  let module FG = G (FunDeclId.Map) in
   let funs = FG.create_map funs in
   (types, funs)