X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fmathql%2Fxmathql.dtd;h=69b0cab9e0eeb991bacededc4bfc2a50d657dca5;hb=fde1a6daa3aaa72c5c7536f4d2c65a3873b1c1bc;hp=e32b0299fb7dbe57b8a7289fb0de99288cc6273e;hpb=11ca09baa5979991650a11878ce807a21ba978ea;p=helm.git

diff --git a/helm/mathql/xmathql.dtd b/helm/mathql/xmathql.dtd
index e32b0299f..69b0cab9e 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,31 +38,38 @@
 <!-- 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   -->
+<!-- SORTBY operator for sorting query results.                      -->
+<!-- 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 % order '(ascendant|descendant)'>
 
+<!ENTITY % position '(MainHypothesis|Hypothesis|MainConclusion|Conclusion|
+                      Body)'>
+
 <!ENTITY % bool '(True|False)'>
 
-<!-- MathQL query expression declaration -->
+<!ENTITY % token '(CONST|STAR|TWOSTARS|SLASH|QUESTIONMARK)'>
+
+<!-- MathQL list expression declaration -->
 
-<!ENTITY % queryexpr '(Union|Intersect|Diff|SortBy|Select|Exists|Use|UsedBy|
-                   ConstructorsOf|Pattern|InTheory|TheoryRefTo|TypeOf|
-                   SuperTypeOf|SubTypeOf|Group)'>
+<!ENTITY % listexpr '(Rvar|Lvar|Reference|Pattern|Select|LetIn|SortBy|
+                      Use|UsedBy|ConstructorsOf|InTheory|TheoryRefTo|
+                      TypeOf|SuperTypeOf|SubTypeOf|Union|Intersect|Diff|
+                      Minimize)'>
 
 <!-- MathQL boolean expression declaration -->
 
-<!ENTITY % boolexpr '(AND|OR|NOT|BOOL|IS|GROUP)'>
+<!ENTITY % boolexpr '(BOOL|NOT|AND|OR|IS|SETEQUAL|SUBSET|EXISTS)'>
 
 <!-- MathQL string expression declaration -->
 
@@ -71,106 +78,136 @@
 <!ENTITY % stringexpr '(CONST|POSITION|RVAR|BINDER|%functexpr;)'>
 
 
-<!-- MathQL top-element -->
+<!-- MathQL query top-element -->
 
-<!ELEMENT MathQL %queryexpr;>
+<!ELEMENT MQLquery %listexpr;>
 
-<!-- MathQL query expressions -->
-
-<!ELEMENT Union (%queryexpr;, %queryexpr;)>
+<!-- MathQL list expressions -->
+<!ELEMENT Rvar EMPTY>
+<!ATTLIST Rvar
+          name CDATA #REQUIRED>
 
-<!ELEMENT Intersect (%queryexpr;, %queryexpr;)>
+<!ELEMENT Lvar EMPTY>
+<!ATTLIST Lvar
+          name CDATA #REQUIRED>
 
-<!ELEMENT Diff (%queryexpr;, %queryexpr;)>
+<!ELEMENT Reference (RPrefix, RBody, Ext, (RFragmentID?))>
 
-<!ELEMENT SortBy (%queryexpr;, SortField)>
+<!ELEMENT Pattern (PPrefix, PBody, (Ext?), (PFragmentID?))>
 
 <!ELEMENT Select (In, Where)>
 
-<!ELEMENT Exists (In, Where)>
+<!ELEMENT LetIn (%listexpr;, Target)>
 
-<!ELEMENT Use (%queryexpr;, Position)>
+<!ELEMENT Use (%listexpr;, Position)>
 
-<!ELEMENT Position EMPTY>
-<!ATTLIST Position
-          binder CDATA #REQUIRED>
+<!ELEMENT UsedBy (%listexpr;, Position)>
 
-<!ELEMENT UsedBy (%queryexpr;, Position)>
+<!ELEMENT ConstructorsOf %listexpr;>
 
-<!ELEMENT ConstructorsOf %queryexpr;>
+<!ELEMENT InTheory (%listexpr;, ItemType)>
 
-<!ELEMENT Pattern (Prefix, TokenList, (FragmentID?))>
+<!ELEMENT TheoryRefTo %listexpr;>
 
-<!ELEMENT InTheory (%queryexpr;, ItemType)>
-
-<!ELEMENT ItemType EMPTY>
-<!ATTLIST ItemType
-          binder CDATA #REQUIRED>
-
-<!ELEMENT TheoryRefTo %queryexpr;>
-
-<!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 SortField %functexpr;>
-<!ATTLIST SortField 
-          order %order; #IMPLIED>
+<!ELEMENT Intersect (%listexpr;, %listexpr;)>
 
-<!ELEMENT In %queryexpr;>
+<!ELEMENT Diff (%listexpr;, %listexpr;)>
 
-<!ELEMENT Where %boolexpr;>
-<!ATTLIST Where
-          rvar CDATA #REQUIRED>
+<!ELEMENT SortBy (%listexpr;, SortField)>
 
-<!ELEMENT STAR EMPTY>
+<!ELEMENT Minimize %listexpr;>
 
-<!ELEMENT TWOSTARS EMPTY>
+<!-- MathQL list sub-expressions -->
 
-<!ELEMENT SLASH EMPTY>
+<!ELEMENT RPrefix (CONST)>
 
-<!ELEMENT QUESTIONMARK EMPTY>
+<!ELEMENT RBody (CONST)>
+
+<!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 (#PCDATA)>
+<!ELEMENT In %listexpr;>
 
-<!-- XPointers have max depth = 2 (see CIC inductive definitions) -->
-<!ELEMENT FragmentID ((NUMBER|STAR), (NUMBER|STAR)?)>
+<!ELEMENT Where %boolexpr;>
+<!ATTLIST Where
+          rvar CDATA #REQUIRED>
 
-<!-- MathQL boolean expressions -->
+<!ELEMENT Target %listexpr;>
+<!ATTLIST Target
+          lvar CDATA #REQUIRED>
 
-<!ELEMENT AND (%boolexpr;, %boolexpr;)>
+<!ELEMENT Position EMPTY>
+<!ATTLIST Position
+          binder CDATA #REQUIRED>
 
-<!ELEMENT OR (%boolexpr;, %boolexpr;)>
+<!ELEMENT ItemType EMPTY>
+<!ATTLIST ItemType
+          binder CDATA #REQUIRED>
 
-<!ELEMENT NOT %boolexpr;>
+<!ELEMENT SortField %functexpr;>
+<!ATTLIST SortField 
+          order %order; #IMPLIED>
 
-<!ELEMENT IS (%stringexpr;, %stringexpr;)>
+<!-- MathQL boolean expressions -->
 
 <!ELEMENT BOOL EMPTY>
 <!ATTLIST BOOL
           value %bool; #REQUIRED>
 
+<!ELEMENT NOT %boolexpr;>
+
+<!ELEMENT AND (%boolexpr;, %boolexpr;)>
+
+<!ELEMENT OR (%boolexpr;, %boolexpr;)>
+
+<!ELEMENT IS (%stringexpr;, %stringexpr;)>
+
+<!ELEMENT SETEQUAL (%listexpr;, %listexpr;)>
+
+<!ELEMENT SUBSET (%listexpr;, %listexpr;)>
+
+<!ELEMENT EXISTS (RVAR, %listexpr;)>
+
 <!-- MathQL string expressions -->
 
 <!ELEMENT CONST (#PCDATA)>