- split metadata type in metadata and constraints. Metadata are computed

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

diff --git a/helm/ocaml/metadata/metadataTypes.ml b/helm/ocaml/metadata/metadataTypes.ml
index 0db48f299dde415b8e8584556527d163167f8a8f..a5bbfaf097ad128f280fde538769b1a54907c6eb 100644 (file)
--- a/helm/ocaml/metadata/metadataTypes.ml
+++ b/helm/ocaml/metadata/metadataTypes.ml
@@ -23,7 +23,10 @@
  * http://helm.cs.unibo.it/
  *)
 
-type main_position = [ `MainConclusion | `MainHypothesis ]
+type main_position =
+  [ `MainConclusion of int option (* Pi depth *)
+  | `MainHypothesis of int option (* Pi depth *)
+  ]
 
 type position =
   [ main_position
@@ -35,11 +38,22 @@ type position =
 type pi_depth = int
 
 type metadata =
-  [ `Sort of Cic.sort * main_position * pi_depth
-  | `Rel of main_position * pi_depth
-  | `Obj of string * position * pi_depth option
+  [ `Sort of Cic.sort * main_position
+  | `Rel of main_position
+  | `Obj of string * position
+  ]
+
+type constr =
+  [ `Sort of Cic.sort * main_position list
+  | `Rel of main_position list
+  | `Obj of string * position list
   ]
 
+let constr_of_metadata: metadata -> constr = function
+  | `Sort (sort, pos) -> `Sort (sort, [pos])
+  | `Rel pos -> `Rel [pos]
+  | `Obj (uri, pos) -> `Obj (uri, [pos])
+
 let sort_tbl = "refSort"
 let rel_tbl = "refRel"
 let obj_tbl = "refObj"