X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fmetadata%2FmetadataConstraints.ml;h=1b28e44d0b03632ffaec79d66b37f4948d679e58;hb=2e20f3cf00bfbb93b8ca9419aa36d22ddec49815;hp=2ebd46c2a69478986d70cb2b47f4082d257dfc08;hpb=6e986001aac7cc63b0e7d13447caae3729e0f833;p=helm.git diff --git a/helm/ocaml/metadata/metadataConstraints.ml b/helm/ocaml/metadata/metadataConstraints.ml index 2ebd46c2a..1b28e44d0 100644 --- a/helm/ocaml/metadata/metadataConstraints.ml +++ b/helm/ocaml/metadata/metadataConstraints.ml @@ -116,7 +116,7 @@ let at_least ~(dbd:Mysql.dbd) ?concl_card ?full_card ((n+1), from, where) | `Sort (sort, positions) -> let tbl = MetadataTypes.sort_tbl in - let sort_str = MetadataPp.pp_sort sort 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) :: @@ -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"; @@ -494,7 +494,7 @@ let cmatch ~(dbd:Mysql.dbd) ?(facts=false) t = else Some main, [0, []; types_no, types]) else - prefixes (constants_no+types_no) t + prefixes (constants_no+types_no+1) t in (match prefixes with Some main, all_concl -> @@ -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