X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fmathql%2FmathQL.ml;h=d375d92afeac7ecf3971081247b8ad2dd5316e71;hb=8c216145bfbaa71af9568b0849160e46c11d3426;hp=5ccdf79d77440f0e30f91c3c239f8903bf53b462;hpb=e948a077c64bf1e1fb29cce626e04f2c93a5ba3c;p=helm.git

diff --git a/helm/ocaml/mathql/mathQL.ml b/helm/ocaml/mathql/mathQL.ml
index 5ccdf79d7..d375d92af 100644
--- a/helm/ocaml/mathql/mathQL.ml
+++ b/helm/ocaml/mathql/mathQL.ml
@@ -47,13 +47,15 @@ type refine_op = ExactOp
                | SubOp
 	       | SuperOp
 
+type path = string list
+
 type vvar_list = vvar list
 
 type set_exp = SVar of svar
 	     | RVar of rvar
              | Ref of val_exp
              | Pattern of val_exp
-	     | Relation of refine_op * string * set_exp * vvar_list
+	     | Relation of refine_op * path * set_exp * vvar_list
              | Select of rvar * set_exp * boole_exp
 	     | Union of set_exp * set_exp
 	     | Intersect of set_exp * set_exp
@@ -64,7 +66,7 @@ type set_exp = SVar of svar
 and boole_exp = False
               | True
 	      | Not of boole_exp
-	      | Ex of boole_exp
+	      | Ex of rvar list * boole_exp   
 	      | And of boole_exp * boole_exp
 	      | Or of boole_exp * boole_exp
 	      | Sub of val_exp * val_exp
@@ -74,9 +76,9 @@ and boole_exp = False
 and val_exp = Const of string list 
             | RefOf of set_exp 
 	    | Record of rvar * vvar
-	    | VVar of string
+	    | VVar of vvar
 	    | Fun of string * val_exp
-	    | Attribute of refine_op * string * val_exp
+	    | Attribute of refine_op * path * val_exp
 
 type query = set_exp