X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmathql%2Fgrammar.txt;h=5622761a3381db959570f04bbd778f456bc1d31f;hb=5325734bc2e4927ed7ec146e35a6f0f2b49f50c1;hp=0416f01875a40890f9c7349ed4096c6279047b2b;hpb=4f195220f9e7ee0fcb0de4d78a3e5817b70ea803;p=helm.git

diff --git a/helm/mathql/grammar.txt b/helm/mathql/grammar.txt
index 0416f0187..5622761a3 100644
--- a/helm/mathql/grammar.txt
+++ b/helm/mathql/grammar.txt
@@ -18,7 +18,7 @@ MATHEMATICAL QUERY LANGUAGE (MathQL)
                                                   contesto *)
        |  LET <vvar> BE <string-set> IN <set>  (* assegnamento a value-var
 						  in contesto*)
-       |  RELATION <refine_op> <quoted-constant-string> <set> ATTR <vvar-list>
+       |  RELATION <refine_op> <quoted-constant-string-path> <set> ATTR <vvar-list>
        		                               (* unione insieme risorse in
 						  relazione specificata con le
 						  risorse in set, ognuna con 
@@ -27,17 +27,17 @@ MATHEMATICAL QUERY LANGUAGE (MathQL)
        |  <set> INTERSECT <set>                (* intersezione *)
        |  <set> DIFF <set>                     (* differenza *)
 
-<refine_op> := <quoted-constant-string-set>    (* relazione (proprieta') 
-					          strutturata *)
+<refine_op> := ""			       (* relazione (proprieta') *)
       	    |  SUB			       (* proprieta' e 
 						  sotto-proprieta' *)
 	    |  SUPER			       (* proprieta' e 
 						  super-proprieta' *)
 
-<quoted-constant-string-set> := ""
-			     |  <quoted-constant-string>
-			     |  <quoted-constant-string> <quoted-constant-string-set>
-						(* insieme di stringhe *)
+<quoted-constant-string-path> := <quoted-constant-string> 
+					       (* relazione (proprieta') *)
+			      |  <quoted-constant-string> "/" <quoted-constant-string-path>
+					       (* insieme di stringhe:
+						  proprieta' strutturata *)
 
 <vvar-list> := <vvar>
             |  <vvar> , <vvar-list>
@@ -57,7 +57,8 @@ MATHEMATICAL QUERY LANGUAGE (MathQL)
 						  insiemi stringhe *)
        |  EX <bool>			       (* existential on attributes
 						  of references *)
-<string-set> := {}				   (* insieme vuoto*)
+<string-set> := ( <string-set> )               (* parentesizzazione *)
+             |  {}			       (* insieme vuoto*)
 	     |  <quoted-constant-string>       (* stringa singoletto *)
              |  {<quoted-constant-string-list>}(* insieme stringhe *)
              |  REFOF <set>		       (* insieme riferimenti *)