rebuilt

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

diff --git a/helm/ocaml/metadata/metadataConstraints.ml b/helm/ocaml/metadata/metadataConstraints.ml
index 5dcfae44df4a831545956859f61ae1ad3f88e633..25803dc5c6e6647fe88e1c9bc7e85a066501c2d5 100644 (file)
--- a/helm/ocaml/metadata/metadataConstraints.ml
+++ b/helm/ocaml/metadata/metadataConstraints.ml
@@ -94,7 +94,7 @@ let at_least ~(dbd:Mysql.dbd) ?concl_card ?full_card
     let cur_tbl = tbln n in
     match metadata with
     | `Obj (uri, positions) ->
-        let tbl = MetadataTypes.obj_tbl in
+        let tbl = MetadataTypes.obj_tbl () in
         let from = (sprintf "%s as %s" tbl cur_tbl) :: from in
         let where =
           (sprintf "%s.h_occurrence = \"%s\"" cur_tbl uri) ::
@@ -105,7 +105,7 @@ let at_least ~(dbd:Mysql.dbd) ?concl_card ?full_card
         in
         ((n+1), from, where)
     | `Rel positions ->
-        let tbl = MetadataTypes.rel_tbl in
+        let tbl = MetadataTypes.rel_tbl () in
         let from = (sprintf "%s as %s" tbl cur_tbl) :: from in
         let where =
           mk_positions positions cur_tbl ::
@@ -115,8 +115,8 @@ let at_least ~(dbd:Mysql.dbd) ?concl_card ?full_card
         in
         ((n+1), from, where)
     | `Sort (sort, positions) ->
-        let tbl = MetadataTypes.sort_tbl in
-        let sort_str = MetadataPp.pp_sort sort in
+        let tbl = MetadataTypes.sort_tbl () in
+        let sort_str = CicPp.ppsort sort in
         let from = (sprintf "%s as %s" tbl cur_tbl) :: from in
         let where =
           (sprintf "%s.h_sort = \"%s\"" cur_tbl sort_str) ::
@@ -129,10 +129,10 @@ let at_least ~(dbd:Mysql.dbd) ?concl_card ?full_card
   in
   let (n,from,where) = List.fold_left add_constraint (0,[],[]) metadata in
   let (n,from,where) =
-    add_card_constr MetadataTypes.conclno_tbl (n,from,where) concl_card
+    add_card_constr (MetadataTypes.conclno_tbl ()) (n,from,where) concl_card
   in
   let (n,from,where) =
-    add_card_constr MetadataTypes.conclno_hyp_tbl (n,from,where) full_card
+    add_card_constr (MetadataTypes.conclno_hyp_tbl ()) (n,from,where) full_card
   in
   let from = String.concat ", " from in
   let where = String.concat " and " where in
@@ -407,7 +407,7 @@ let myspeciallist_of_facts  =
   [0,"cic:/Coq/Init/Logic/eq.ind#xpointer(1/1/1)"]
 let myspeciallist =
   [0,"cic:/Coq/Init/Logic/eq.ind#xpointer(1/1/1)";
-   0,"cic:/Coq/Init/Logic/sym_eq.con"; 
+(*   0,"cic:/Coq/Init/Logic/sym_eq.con"; *)
    0,"cic:/Coq/Init/Logic/trans_eq.con";
    0,"cic:/Coq/Init/Logic/f_equal.con";
    0,"cic:/Coq/Init/Logic/f_equal2.con";
@@ -547,7 +547,9 @@ let sigmatch ~(dbd:Mysql.dbd)
         let subsets = 
           let subsets = power constants in
           let types_no = List.length types in
+         if types_no > 0 then  
           (0,[]) :: List.map (function (n,l) -> (n+types_no,types@l)) subsets
+         else subsets
         in
         compute_exactly ~dbd ~facts ~where main subsets