while construction inserted

[helm.git] / helm / ocaml / mathql / mathQL.ml

diff --git a/helm/ocaml/mathql/mathQL.ml b/helm/ocaml/mathql/mathQL.ml
index 7e82fe5474a1919e49bfa08e25fa00c45dda5b69..8ba562ab210648bea3c44a2c8cce9b9fd883093c 100644 (file)
--- a/helm/ocaml/mathql/mathQL.ml
+++ b/helm/ocaml/mathql/mathQL.ml
@@ -51,8 +51,6 @@ type svar = string (* the name of a variable for a resource set *)
 
 type avar = string (* the name of a variable for a resource *)
 
-type vvar = string (* the name of a variable for an attribute value *)
-
 type inverse = bool 
 
 type refine = RefineExact
@@ -73,58 +71,29 @@ type xml = bool
 
 type source = bool
 
-type bin = BinFJoin (* full union - with attr handling *)
-         | BinFMeet (* full intersection - with attr handling *)
-         | BinFDiff (* full difference - with attr handling *)
-
 type gen = GenFJoin (* full union - with attr handling *)
          | GenFMeet (* full intersection - with attr handling *)
 
-type test = Xor
-          | Or
-         | And
-          | Sub
-         | Meet
-         | Eq
-         | Le
-         | Lt
-
-type query = Empty
-           | SVar of svar
+type query = Const of result
+          | SVar of svar
           | AVar of avar
-           | Subj of msval
+          | Dot of avar * path
+          | Ex of avar list * query
+          | Select of avar * query * query
+          | Let of svar option * query * query
+          | Fun of path * path list * query list
+          | Gen of path * query list
+          | Add of bool * groups * query
+          | For of gen * avar * query * query
+          | While of gen * query * query
           | Property of inverse * refine * path * 
                         main * istrue * isfalse list * exp_list *
-                        pattern * msval
-           | Select of avar * query * msval
-          | Bin of bin * query * query
-          | LetSVar of svar * query * query
-          | LetVVar of vvar * msval * query
-          | For of gen * avar * query * query 
-          | Add of bool * groups * query
-          | If of msval * query * query
-          | Log of xml * source * query
-          | StatQuery of query
-          | Keep of allbut * path list * query
-          
-and msval = False
-          | True
-          | Not of msval
-         | Ex of avar list * msval
-         | Test of test * msval * msval
-         | Const of string
-         | Set of msval list
-          | Proj of path option * query 
-         | Dot of avar * path
-         | VVar of vvar
-         | StatVal of msval
-         | Count of msval
-         | Align of string * msval
-
-and groups = Attr of (path * msval) list list
+                        pattern * query
+
+and groups = Attr of (path * query) list list
            | From of avar
 
-and con = pattern * path * msval
+and con = pattern * path * query
 
 and istrue = con list