cleanup

Author: gares

src/compiler.ml

@@ -567,7 +567,7 @@ type program = {
   type_abbrevs : type_abbrev_declaration C.Map.t;
   modes : (mode * Loc.t) C.Map.t;
   clauses : (preterm,attribute) Ast.Clause.t list;
-  prolog_program : preindex;
+  prolog_program : index;
   indexing : (mode * indexing) C.Map.t;
   chr : block_constraint list;
   local_names : int;
@@ -615,7 +615,7 @@ type 'a query = {
   type_abbrevs : type_abbrev_declaration C.Map.t;
   modes : mode C.Map.t;
   clauses : (preterm,Assembled.attribute) Ast.Clause.t list;
-  prolog_program : preindex;
+  prolog_program : index;
   chr : block_constraint list;
   initial_depth : int;
   query : preterm;

src/data.ml

@@ -159,21 +159,21 @@ and prolog_prog = {
 
 (* These two are the same, but the latter should not be mutated *)
 
-and preindex = clause Bl.t first_lvl_idx
-and index = clause Bl.t first_lvl_idx
-and 'clause_list first_lvl_idx = { idx : 'clause_list second_lvl_idx Ptmap.t; time : int; times : times }
-and 'clause_list second_lvl_idx =
+and clause_list = clause Bl.t
+and index = first_lvl_idx
+and first_lvl_idx = { idx : second_lvl_idx Ptmap.t; time : int; times : times }
+and second_lvl_idx =
 | TwoLevelIndex of {
     mode : mode;
     argno : int;
-    all_clauses : 'clause_list;        (* when the query is flexible *)
-    flex_arg_clauses : 'clause_list;   (* when the query is rigid but arg_id ha nothing *)
-    arg_idx : 'clause_list Ptmap.t;    (* when the query is rigid (includes in each binding flex_arg_clauses) *)
+    all_clauses : clause_list;        (* when the query is flexible *)
+    flex_arg_clauses : clause_list;   (* when the query is rigid but arg_id ha nothing *)
+    arg_idx : clause_list Ptmap.t;    (* when the query is rigid (includes in each binding flex_arg_clauses) *)
   }
 | BitHash of {
     mode : mode;
     args : int list;
-    args_idx : 'clause_list Ptmap.t; (* clause, insertion time *)
+    args_idx : clause_list Ptmap.t; (* clause, insertion time *)
   }
 | IndexWithDiscriminationTree of {
     mode : mode;
@@ -183,7 +183,7 @@ and 'clause_list second_lvl_idx =
 [@@deriving show]
 
 let stop = ref false
-let close_index ({idx; time; times} : preindex) : index =
+let close_index ({idx; time; times} : index) : index =
   { idx =idx; time = 0; times = StrMap.empty }
 
 type constraints = stuck_goal list

src/runtime.ml

@@ -2800,7 +2800,7 @@ let rec add1clause_compile_time ~depth { idx; time; times } ~graft predicate cla
       let idx = Ptmap.add predicate (make_new_Map_snd_level_index 0 []) idx in
       add1clause_compile_time ~depth { idx; time; times } ~graft predicate clause name
 
-let update_indexing (indexing : (mode * indexing) Constants.Map.t) (index : preindex) : preindex =
+let update_indexing (indexing : (mode * indexing) Constants.Map.t) (index : index) : index =
   let idx =
     C.Map.fold (fun predicate (mode, indexing) m ->
       Ptmap.add predicate 
@@ -2820,7 +2820,7 @@ let update_indexing (indexing : (mode * indexing) Constants.Map.t) (index : prei
     in
       { index with idx }
 
-let add_to_index ~depth ~predicate ~graft clause name index : preindex =
+let add_to_index ~depth ~predicate ~graft clause name index : index =
   add1clause_compile_time ~depth ~graft index predicate clause name
 
 let make_empty_index ~depth ~indexing =
@@ -4237,7 +4237,7 @@ end;*)
   let search = exec (fun () ->
     (* let o = open_out "/tmp/log" in
      let fmt = Format.formatter_of_out_channel o in
-    Format.fprintf fmt "%a\n%!" pp_preindex compiled_program.index;
+    Format.fprintf fmt "%a\n%!" pp_index compiled_program.index;
     close_out o; *)
      [%spy "dev:trail:init" ~rid (fun fmt () -> T.print_trail fmt) ()];
      let gid[@trace] = UUID.make () in

src/runtime.mli

@@ -74,14 +74,14 @@ module CompileTime : sig
   (* updates how predicates are indexed *)
   val update_indexing :
     (mode * indexing) Constants.Map.t ->
-      preindex -> preindex
+      index -> index
 
   (* adds 1 clause to its index *)
   val add_to_index :
     depth:int ->
     predicate:constant ->
     graft:Elpi_parser.Ast.Structured.insertion option ->
-    clause -> string option -> preindex -> preindex
+    clause -> string option -> index -> index
 
   (* can raise CannotDeclareClauseForBuiltin *)
   val clausify1 :