Modified Files:

1) grammar.txt xmathql.dtd: relation modified

diff --git a/helm/mathql/grammar.txt b/helm/mathql/grammar.txt
index 0416f01875a40890f9c7349ed4096c6279047b2b..abbda194ed939277c3d7524bb8806473627cbfc7 100644 (file)
--- 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>

diff --git a/helm/mathql/xmathql.dtd b/helm/mathql/xmathql.dtd
index 3cf73eba6950cfc96a6f460d6863da83e4e3a2c1..96b52a22b17c4f3a2a2a155374c597026748d883 100644 (file)
--- a/helm/mathql/xmathql.dtd
+++ b/helm/mathql/xmathql.dtd
@@ -89,9 +89,10 @@
 
 <!ELEMENT LetVIn (%stringsetexpr;, Vtarget)>
 
-<!ELEMENT Relation (Refine?,%setexpr;, Attr+)>
+<!ELEMENT Relation (PName?,%setexpr;, Attr+)>
 <!ATTLIST Relation
-          name CDATA #REQUIRED>
+          name CDATA #REQUIRED
+          refine (sub|super) #IMPLIED>
 
 <!ELEMENT Union (%setexpr;, %setexpr;)>
 
@@ -119,7 +120,7 @@
 <!ATTLIST Attr 
           binder CDATA #REQUIRED>
 
-<!ELEMENT Refine (SUB|SUPER|CONST+)>
+<!ELEMENT PName (CONST+)>
 
 <!-- MathQL boolean expressions -->