mathql_generator: new constraint format (more type safe)

[helm.git] / helm / ocaml / mathql_generator / mQueryGenerator.mli

diff --git a/helm/ocaml/mathql_generator/mQueryGenerator.mli b/helm/ocaml/mathql_generator/mQueryGenerator.mli
index 6081cd02802819a92a06ca3520ff5a156717adeb..c4dc0f9e50903aa8d661fdf613cbab868a788ed3 100644 (file)
--- a/helm/ocaml/mathql_generator/mQueryGenerator.mli
+++ b/helm/ocaml/mathql_generator/mQueryGenerator.mli
@@ -26,45 +26,15 @@
 (*  AUTOR: Ferruccio Guidi <fguidi@cs.unibo.it>
  *)
 
-type uri = string
-type position = string
-type depth = string
-type sort = string 
-
-type spec = MustObj  of uri list * position list * depth list
-          | MustSort of sort list * position list * depth list
-          | MustRel  of position list * depth list
-          | OnlyObj  of uri list * position list * depth list
-          | OnlySort of sort list * position list * depth list
-          | OnlyRel  of position list * depth list
-          | Universe of position list 
-
-type builtin_t = MainHypothesis
-               | InHypothesis
-              | MainConclusion
-              | InConclusion
-              | InBody
-              | Set
-              | Prop
-              | Type
+(* interface for the low-level constraints  *********************************)
 
 val locate  : string -> MathQL.query
 
-val compose : spec list -> MathQL.query
-
-val builtin : builtin_t -> string
-
-(* interface for the old constraints  ***************************************)
-
-type old_depth = int option
- 
-type r_obj = uri * position * old_depth 
-type r_rel = position * old_depth
-type r_sort = position * old_depth * sort 
+val compose : MQGTypes.spec list -> MathQL.query
 
-type must_restrictions = (r_obj list * r_rel list * r_sort list)
-type only_restrictions =
- (r_obj list option * r_rel list option * r_sort list option)
-type universe = position list option
+(* interface for the high-level constraints  ********************************)
 
-val query_of_constraints : universe -> must_restrictions -> only_restrictions -> MathQL.query
+val query_of_constraints : MQGTypes.universe option -> 
+                           MQGTypes.must_restrictions ->
+                           MQGTypes.only_restrictions -> 
+                          MathQL.query