From c6b9538995874c6595874e88bc7bf8965e50f14b Mon Sep 17 00:00:00 2001
From: Irene Schena <irene.schena@unibo.it>
Date: Mon, 23 Sep 2002 12:50:45 +0000
Subject: [PATCH] Modified Files: 1) grammar.txt xmathql.dtd: relation modified

---
 helm/mathql/grammar.txt | 14 +++++++-------
 helm/mathql/xmathql.dtd |  7 ++++---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/helm/mathql/grammar.txt b/helm/mathql/grammar.txt
index 0416f0187..abbda194e 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>
diff --git a/helm/mathql/xmathql.dtd b/helm/mathql/xmathql.dtd
index 3cf73eba6..96b52a22b 100644
--- 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 -->
 
-- 
2.39.2