X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fmathql%2FmathQL.ml;h=ed6abf54f454c0b6b6c32afd5d9b6858a5fe5059;hb=7646d66b5a68ad83611e19ac2634c86c16bc7d21;hp=e37b03d7ca9ce90e8a7d81ce112093a29c011c33;hpb=57a47d11437c168d5ee1c6024ae7a48df8a302ba;p=helm.git

diff --git a/helm/ocaml/mathql/mathQL.ml b/helm/ocaml/mathql/mathQL.ml
index e37b03d7c..ed6abf54f 100644
--- a/helm/ocaml/mathql/mathQL.ml
+++ b/helm/ocaml/mathql/mathQL.ml
@@ -43,17 +43,17 @@ type rvar = string (* the name of a variable for a resource *)
 
 type vvar = string (* the name of a variable for an attribute value *)
 
-type refine_op = Exact
-               | Sub
-	       | Super
+type refine_op = ExactOp
+               | SubOp
+	       | SuperOp
 
-type attr_list = vvar 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 * attr_list
+	     | Relation of refine_op * string * set_exp * vvar_list
              | Select of rvar * set_exp * boole_exp
 	     | Union of set_exp * set_exp
 	     | Intersect of set_exp * set_exp
@@ -71,11 +71,13 @@ and boole_exp = False
 	      | Eq of val_exp * val_exp
 	       
 and val_exp = Const of string list 
-            | Refof of set_exp 
+            | RefOf of set_exp 
 	    | Record of rvar * vvar
 	    | Fun of string * val_exp
 	    | Attribute of refine_op * string * val_exp
 
+type query = set_exp
+
 
 (* output data structures ***************************************************)
 
@@ -90,3 +92,5 @@ type attribute_set   = attribute_group list   (* the attributes of an URI *)
 type resource        = string * attribute_set (* an attributed URI *)
 
 type resource_set    = resource list          (* the query result *)
+
+type result = resource_set