ocaml 3.09 transition

[helm.git] / helm / ocaml / metadata / metadataTypes.ml

diff --git a/helm/ocaml/metadata/metadataTypes.ml b/helm/ocaml/metadata/metadataTypes.ml
index 3f55b886f8b2b0ea19ddbbec115b1427a5f3499d..81eb35817dcfc3ad960d03a44650b0ebe63a91bb 100644 (file)
--- a/helm/ocaml/metadata/metadataTypes.ml
+++ b/helm/ocaml/metadata/metadataTypes.ml
@@ -32,9 +32,16 @@ let mainhyp_pos = position_prefix ^ "MainHypothesis"
 let inhyp_pos = position_prefix ^ "InHypothesis"
 let inbody_pos = position_prefix ^ "InBody"
 
+type relation = 
+  | Eq of int
+  | Le of int
+  | Lt of int
+  | Ge of int
+  | Gt of int
+
 type main_position =
-  [ `MainConclusion of int option (* Pi depth *)
-  | `MainHypothesis of int option (* Pi depth *)
+  [ `MainConclusion of relation option (* Pi depth *)
+  | `MainHypothesis of relation option (* Pi depth *)
   ]
 
 type position =
@@ -49,13 +56,13 @@ type pi_depth = int
 type metadata =
   [ `Sort of Cic.sort * main_position
   | `Rel of main_position
-  | `Obj of string * position
+  | `Obj of UriManager.uri * position
   ]
 
 type constr =
   [ `Sort of Cic.sort * main_position list
   | `Rel of main_position list
-  | `Obj of string * position list
+  | `Obj of UriManager.uri * position list
   ]
 
 let constr_of_metadata: metadata -> constr = function
@@ -67,42 +74,39 @@ let constr_of_metadata: metadata -> constr = function
 let sort_tbl_original = "refSort"
 let rel_tbl_original = "refRel"
 let obj_tbl_original = "refObj"
-let conclno_tbl_original = "no_inconcl_aux"
-let conclno_hyp_tbl_original = "no_concl_hyp"
 let name_tbl_original = "objectName"
+let count_tbl_original = "count"
+let hits_tbl_original = "hits"
 
   (** the names currently used *)
 let sort_tbl_real = ref sort_tbl_original
 let rel_tbl_real = ref rel_tbl_original
 let obj_tbl_real = ref obj_tbl_original
-let conclno_tbl_real = ref conclno_tbl_original
-let conclno_hyp_tbl_real = ref conclno_hyp_tbl_original
 let name_tbl_real = ref name_tbl_original 
+let count_tbl_real = ref count_tbl_original
 
   (** the exported symbols *)
 let sort_tbl () = ! sort_tbl_real ;; 
 let rel_tbl () = ! rel_tbl_real ;; 
 let obj_tbl () = ! obj_tbl_real ;; 
-let conclno_tbl () = ! conclno_tbl_real ;; 
-let conclno_hyp_tbl () = ! conclno_hyp_tbl_real ;; 
 let name_tbl () = ! name_tbl_real ;; 
+let count_tbl () = ! count_tbl_real ;; 
 
   (** to use the owned tables *)
 let ownerize_tables owner =
   sort_tbl_real := ( sort_tbl_original ^ "_" ^ owner) ;
   rel_tbl_real := ( rel_tbl_original ^ "_" ^ owner) ;
   obj_tbl_real := ( obj_tbl_original ^ "_" ^ owner) ;
-  conclno_tbl_real := ( conclno_tbl_original ^ "_" ^ owner) ;
-  conclno_hyp_tbl_real := ( conclno_hyp_tbl_original ^ "_" ^ owner) ;
-  name_tbl_real := ( name_tbl_original ^ "_" ^ owner) 
+  name_tbl_real := ( name_tbl_original ^ "_" ^ owner);
+  count_tbl_real := ( count_tbl_original ^ "_" ^ owner)
 ;;
 
 let library_sort_tbl =   sort_tbl_original
 let library_rel_tbl = rel_tbl_original
 let library_obj_tbl = obj_tbl_original
-let library_conclno_tbl = conclno_tbl_original
-let library_conclno_hyp_tbl = conclno_hyp_tbl_original
 let library_name_tbl = name_tbl_original
+let library_count_tbl = count_tbl_original
+let library_hits_tbl = hits_tbl_original
 
 let are_tables_ownerized () =
   sort_tbl () <> library_sort_tbl