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) ::
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 ::
in
((n+1), from, where)
| `Sort (sort, positions) ->
- let tbl = MetadataTypes.sort_tbl 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 =
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