X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmathql%2Fxmathql.dtd;h=88462d5d27111d80a61ebda874cc3d8cea1ba8cb;hb=6eae299f77793d89079a24bb8eaa50c5041ae4a7;hp=7b4f71045949c6dd43e82227e2a295caba74ee45;hpb=5a3c6e3eb8f8ed08152c43671ff21a04cbc57dac;p=helm.git

diff --git a/helm/mathql/xmathql.dtd b/helm/mathql/xmathql.dtd
index 7b4f71045..88462d5d2 100644
--- a/helm/mathql/xmathql.dtd
+++ b/helm/mathql/xmathql.dtd
@@ -25,7 +25,7 @@
 <!-- http://cs.unibo.it/helm/.                                         -->
 
 <!--*****************************************************************-->
-<!-- DTD FOR the MATHEMATICAL QUERY MARKUP LANGUAGE (MathQML)        -->
+<!-- DTD FOR the MATHEMATICAL QUERY MARKUP LANGUAGE (XMathQL)        -->
 <!-- First draft: April 2002, Irene Schena                           -->
 <!--*****************************************************************-->
 
@@ -38,29 +38,34 @@
 <!-- 3) reusing queries saved in a standard format                   -->
 <!-- The syntax reflects the structure of the grammar productions of -->
 <!-- MathQL.                                                         -->
-<!-- The %queryexpr parameter entity is used to allow all query      -->
-<!-- expression types to occur                                       -->
 <!-- Operators are unambiguous (binary or unary), so there isn't any -->
 <!-- grouping operator.                                              -->
-<!-- CONST is the constant string.                                   -->
-<!-- The attributes binder and rvar declare variables which are      -->
-<!-- referred to and used by means of respectively BINDER and RVAR   -->
+<!-- CONST is the constant string; rvar is for references and lvar   -->
+<!-- for list.                                                       -->
+<!-- The attributes binder, rvar, lvar declare variables which are   -->
+<!-- referred to and used by means of respectively BINDER, Rvar and  -->
+<!-- RVAR, Lvar and LVAR.                                            -->
+<!-- Rvar (Lvar) is casted to a list, on the contrary the use of RVAR-->
+<!-- (LVAR) is casted to a string.                                   -->
+<!-- PROPERTY works on a specified RDF property returning its value. -->
 <!--*****************************************************************-->
 
-<!ENTITY % position '(Conclusion|Hypothesis|Body|MainConclusion|
-                        MainHypothesis)'>
+<!ENTITY % position '(MainHypothesis|Hypothesis|MainConclusion|Conclusion|
+                      Body)'>
 
 <!ENTITY % bool '(True|False)'>
 
-<!-- MathQL query expression declaration -->
+<!ENTITY % token '(CONST|STAR|TWOSTARS|SLASH|QUESTIONMARK)'>
 
-<!ENTITY % queryexpr '(Union|Intersect|Diff|Select|Exists|Use|UsedBy|
-                   ConstructorsOf|Pattern|InTheory|TheoryRefTo|TypeOf|
-                   SuperTypeOf|SubTypeOf|Group)'>
+<!-- MathQL list expression declaration -->
+
+<!ENTITY % listexpr '(Rvar|Lvar|Reference|Pattern|Select|Exists|LetIn|
+                      Use|UsedBy|ConstructorsOf|InTheory|TheoryRefTo|
+                      TypeOf|SuperTypeOf|SubTypeOf|Union|Intersect|Diff)'>
 
 <!-- MathQL boolean expression declaration -->
 
-<!ENTITY % boolexpr '(AND|OR|NOT|BOOL|IS|GROUP)'>
+<!ENTITY % boolexpr '(BOOL|NOT|AND|OR|IS|SETEQUAL|SUBSET)'>
 
 <!-- MathQL string expression declaration -->
 
@@ -69,99 +74,127 @@
 <!ENTITY % stringexpr '(CONST|POSITION|RVAR|BINDER|%functexpr;)'>
 
 
-<!-- MathQL top-element -->
+<!-- MathQL query top-element -->
 
-<!ELEMENT MathQL %queryexpr;>
+<!ELEMENT MQLquery %listexpr;>
 
-<!-- MathQL query expressions -->
+<!-- MathQL list expressions -->
+<!ELEMENT Rvar EMPTY>
+<!ATTLIST Rvar
+          name CDATA #REQUIRED>
 
-<!ELEMENT Union (%queryexpr;, %queryexpr;)>
+<!ELEMENT Lvar EMPTY>
+<!ATTLIST Lvar
+          name CDATA #REQUIRED>
 
-<!ELEMENT Intersect (%queryexpr;, %queryexpr;)>
+<!ELEMENT Reference (RPrefix, RBody, Ext, (RFragmentID?))>
 
-<!ELEMENT Diff (%queryexpr;, %queryexpr;)>
+<!ELEMENT Pattern (PPrefix, PBody, (Ext?), (PFragmentID?))>
 
 <!ELEMENT Select (In, Where)>
 
 <!ELEMENT Exists (In, Where)>
 
-<!ELEMENT Use (%queryexpr;, Position)>
-
-<!ELEMENT Position EMPTY>
-<!ATTLIST Position
-          binder CDATA #REQUIRED>
-
-<!ELEMENT UsedBy (%queryexpr;, Position)>
+<!ELEMENT LetIn (%listexpr;, Target)>
 
-<!ELEMENT ConstructorsOf %queryexpr;>
+<!ELEMENT Use (%listexpr;, Position)>
 
-<!ELEMENT Pattern (Prefix, TokenList, (FragmentID?))>
+<!ELEMENT UsedBy (%listexpr;, Position)>
 
-<!ELEMENT InTheory (%queryexpr;, ItemType)>
+<!ELEMENT ConstructorsOf %listexpr;>
 
-<!ELEMENT ItemType EMPTY>
-<!ATTLIST ItemType
-          binder CDATA #REQUIRED>
+<!ELEMENT InTheory (%listexpr;, ItemType)>
 
-<!ELEMENT TheoryRefTo %queryexpr;>
+<!ELEMENT TheoryRefTo %listexpr;>
 
-<!ELEMENT TypeOf %queryexpr;>
+<!ELEMENT TypeOf %listexpr;>
 <!ATTLIST TypeOf
           binder CDATA #REQUIRED>
 
-<!ELEMENT SuperTypeOf %queryexpr;>
+<!ELEMENT SuperTypeOf %listexpr;>
 <!ATTLIST SuperTypeOf
           binder CDATA #REQUIRED>
 
-<!ELEMENT SubTypeOf %queryexpr;>
+<!ELEMENT SubTypeOf %listexpr;>
 <!ATTLIST SubTypeOf
           binder CDATA #REQUIRED>
 
-<!-- MathQL query sub-expressions -->
+<!ELEMENT Union (%listexpr;, %listexpr;)>
 
-<!ELEMENT In %queryexpr;>
+<!ELEMENT Intersect (%listexpr;, %listexpr;)>
 
-<!ELEMENT Where %boolexpr;>
-<!ATTLIST Where
-          rvar CDATA #REQUIRED>
+<!ELEMENT Diff (%listexpr;, %listexpr;)>
 
-<!ELEMENT STAR EMPTY>
+<!-- MathQL list sub-expressions -->
 
-<!ELEMENT TWOSTARS EMPTY>
+<!ELEMENT RPrefix (CONST)>
 
-<!ELEMENT SLASH EMPTY>
+<!ELEMENT RBody (CONST)>
 
-<!ELEMENT QUESTIONMARK EMPTY>
+<!ELEMENT RFragmentID (NUMBER)+>
+
+<!ELEMENT Ext (CONST)>
+
+<!ELEMENT PPrefix (CONST|STAR)>
+
+<!ELEMENT PBody (%token;)+>
+
+<!-- XPointers have max depth = 2 (see CIC inductive definitions) -->
+<!ELEMENT PFragmentID (NUMBER|TWOSTARS|STAR)+>
 
 <!ELEMENT NUMBER EMPTY>
 <!ATTLIST NUMBER
           value NMTOKEN #REQUIRED>
 
+<!-- We need SLASH for grouping CONST with QUESTIONMARK -->
+<!ELEMENT SLASH EMPTY>
+
 <!-- STAR expands only to objects of the specified dir before the last "/": 
      ex. cic:/Algebra/* expands to every object in Algebra only            -->
+<!ELEMENT STAR EMPTY>
+
 <!-- TWOSTARS expands till the most complete name (with extension if not 
      specifified)                                                          -->
+<!ELEMENT TWOSTARS EMPTY>
+
 <!-- QUESTIONMARK matches one character except "/"                         --> 
-<!ELEMENT TokenList (CONST|STAR|TWOSTARS|SLASH|QUESTIONMARK)+>
+<!ELEMENT QUESTIONMARK EMPTY>
 
-<!ELEMENT Prefix (CONST|STAR)>
+<!ELEMENT In %listexpr;>
 
-<!-- XPointers have max depth = 2 (see CIC inductive definitions) -->
-<!ELEMENT FragmentID (NUMBER|TWOSTARS|STAR)+>
+<!ELEMENT Where %boolexpr;>
+<!ATTLIST Where
+          rvar CDATA #REQUIRED>
+
+<!ELEMENT Target %listexpr;>
+<!ATTLIST Target
+          lvar CDATA #REQUIRED>
+
+<!ELEMENT Position EMPTY>
+<!ATTLIST Position
+          binder CDATA #REQUIRED>
+
+<!ELEMENT ItemType EMPTY>
+<!ATTLIST ItemType
+          binder CDATA #REQUIRED>
 
 <!-- MathQL boolean expressions -->
 
+<!ELEMENT BOOL EMPTY>
+<!ATTLIST BOOL
+          value %bool; #REQUIRED>
+
+<!ELEMENT NOT %boolexpr;>
+
 <!ELEMENT AND (%boolexpr;, %boolexpr;)>
 
 <!ELEMENT OR (%boolexpr;, %boolexpr;)>
 
-<!ELEMENT NOT %boolexpr;>
-
 <!ELEMENT IS (%stringexpr;, %stringexpr;)>
 
-<!ELEMENT BOOL EMPTY>
-<!ATTLIST BOOL
-          value %bool; #REQUIRED>
+<!ELEMENT SETEQUAL (%listexpr;, %listexpr;)>
+
+<!ELEMENT SUBSET (%listexpr;, %listexpr;)>
 
 <!-- MathQL string expressions -->