X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Focaml%2Fmathql%2FmathQL.ml;h=b76bd4ed55631b81bb4e417e4a6ad3ea575a7743;hb=381006cf8b418cfdeaf145ab7df9e8f2b19ae2e6;hp=61a7646aa6261d842ff07fa38e8fd84906f04f27;hpb=fb7df84a9ffea7a67817b303a1d6983fb52e963d;p=helm.git

diff --git a/helm/ocaml/mathql/mathQL.ml b/helm/ocaml/mathql/mathQL.ml
index 61a7646aa..b76bd4ed5 100644
--- a/helm/ocaml/mathql/mathQL.ml
+++ b/helm/ocaml/mathql/mathQL.ml
@@ -23,44 +23,26 @@
  * http://www.cs.unibo.it/helm/.
  *)
 
-(******************************************************************************)
-(*                                                                            *)
-(*                               PROJECT HELM                                 *)
-(*                                                                            *)
-(*                     Ferruccio Guidi <fguidi@cs.unibo.it>                   *)
-(*                     Irene Schena  <schena@cs.unibo.it>                     *)
-(*                                 10/09/2002                                 *)
-(*                                                                            *)
-(*                                                                            *)
-(******************************************************************************)
-
+(*  AUTOR: Ferruccio Guidi <fguidi@cs.unibo.it>
+ *)
 
 (* output data structures ***************************************************)
 
-type path            = string * (string list) (* the name of an attribute *)
-
-type value           = string list            (* the value of an attribute *)
-
-type attribute       = path * value           (* an attribute *)
-
-type attribute_group = attribute list         (* a group of attributes *)
+module I : Avs.Type = ListAvs
 
-type attribute_set   = attribute_group list   (* the attributes of an URI *)
+type value = Avs.value (* a linearized attribute value *)
 
-type resource        = string * attribute_set (* an attributed URI *)
+type path = Avs.path   (* the name of an attribute *)
 
-type resource_set    = resource list          (* the query result *)
-
-type result = resource_set
+type group = I.group (* an group of attribures *)
 
+type result = I.avs  (* the query result *)
 
 (* input data structures ****************************************************)
 
 type svar = string (* the name of a variable for a resource set *)
 
-type rvar = string (* the name of a variable for a resource *)
-
-type vvar = string (* the name of a variable for an attribute value *)
+type avar = string (* the name of a variable for a resource *)
 
 type inverse = bool 
 
@@ -68,35 +50,44 @@ type refine = RefineExact
             | RefineSub
 	    | RefineSuper
 
-type assign = path * path 
-
-type set_exp = SVar of svar
-	     | RVar of rvar
-             | Ref of val_exp
-             | Pattern of val_exp
-	     | Relation of inverse * refine * path * set_exp * assign list
-             | Select of rvar * set_exp * boole_exp
-	     | Union of set_exp * set_exp
-	     | Intersect of set_exp * set_exp
-	     | Diff of set_exp * set_exp
-	     | LetSVar of svar * set_exp * set_exp
-	     | LetVVar of vvar * val_exp * set_exp
-	     
-and boole_exp = False
-              | True
-	      | Not 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
-	      | Meet of val_exp * val_exp
-	      | Eq of val_exp * val_exp
-	       
-and val_exp = Const of string list 
-            | RefOf of set_exp 
-	    | Record of rvar * path
-	    | VVar of vvar
-	    | Property of inverse * refine * path * val_exp
-	    | Fun of string * val_exp
-
-type query = set_exp
+type main = path
+
+type pattern = bool
+
+type exp = path * (path option) 
+
+type exp_list = exp list
+
+type allbut = bool
+
+type xml = bool
+
+type source = bool
+
+type gen = GenFJoin (* full union - with attr handling *)
+         | GenFMeet (* full intersection - with attr handling *)
+
+type query = Const of (string * (path * query) list list) list
+	   | SVar of svar
+	   | AVar of avar
+	   | 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 * query
+
+and groups = Attr of (path * query) list list
+           | From of avar
+
+and con = pattern * path * query
+
+and istrue = con list
+
+and isfalse = con list