ocaml 3.09 transition

[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 9229290e86511633095facbd8fb1f65979c096f1..decaa0ea761be56f337c1b67a7d4cd02f33e1cf3 100644 (file)
--- a/helm/ocaml/mathql_generator/mQueryGenerator.mli
+++ b/helm/ocaml/mathql_generator/mQueryGenerator.mli
@@ -23,36 +23,20 @@
  * http://cs.unibo.it/helm/.
  *)
 
-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 
-
-val locate  : string -> MathQL.query
+(*  AUTOR: Ferruccio Guidi <fguidi@cs.unibo.it>
+ *)
 
-val compose : spec list -> MathQL.query
+(* interface for the low-level constraints  *********************************)
 
-val builtin : MathQL.vvar -> string
+val locate     : string -> MathQL.query
 
-(* interface for the old constraints  ***************************************)
+val unreferred : string -> string -> MathQL.query
 
-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