From f67051433df98fea85f4af84c12b637f11315277 Mon Sep 17 00:00:00 2001 From: Stefano Zacchiroli Date: Mon, 24 Jan 2005 16:20:29 +0000 Subject: [PATCH] uses CicPp.ppsort --- helm/ocaml/metadata/metadataConstraints.ml | 2 +- helm/ocaml/metadata/metadataPp.ml | 8 +------- helm/ocaml/metadata/metadataPp.mli | 1 - 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/helm/ocaml/metadata/metadataConstraints.ml b/helm/ocaml/metadata/metadataConstraints.ml index 2c04562d8..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) :: diff --git a/helm/ocaml/metadata/metadataPp.ml b/helm/ocaml/metadata/metadataPp.ml index 33f10427f..e2e21662b 100644 --- a/helm/ocaml/metadata/metadataPp.ml +++ b/helm/ocaml/metadata/metadataPp.ml @@ -57,16 +57,10 @@ let metadata_ns = "http://www.cs.unibo.it/helm/schemas/schema-helm" let uri_of_pos pos = String.concat "#" [metadata_ns; pp_position pos] *) -let pp_sort = function - | Cic.Prop -> "Prop" - | Cic.Set -> "Set" - | Cic.Type _ -> "Type" - | Cic.CProp -> "CProp" - type t = [ `Int of int | `String of string | `Null ] let columns_of_metadata ~about metadatas = - let sort s = `String (pp_sort s) in + let sort s = `String (CicPp.ppsort s) in let source = `String about in let occurrence u = `String u in List.fold_left diff --git a/helm/ocaml/metadata/metadataPp.mli b/helm/ocaml/metadata/metadataPp.mli index 4ab5f7e76..bd37a9959 100644 --- a/helm/ocaml/metadata/metadataPp.mli +++ b/helm/ocaml/metadata/metadataPp.mli @@ -28,7 +28,6 @@ val pp_position: MetadataTypes.position -> string val pp_position_tag: MetadataTypes.position -> string (* val pp_constr: MetadataTypes.constr -> string *) -val pp_sort: Cic.sort -> string (** Pretty printer and OCamlDBI friendly interface *) -- 2.39.2