X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fdtd%2Fcic.dtd;h=164945d2a0b238ed1fd51f5ff9708c35d1504a5f;hb=d891eccad8306283c5b1e6c1e9a8c56b2ebd5309;hp=e16b10287fb612c16f20a2dfd84404573e49b243;hpb=eecd02f892cd859e137c550aaa0f2668986c5f2b;p=helm.git

diff --git a/helm/dtd/cic.dtd b/helm/dtd/cic.dtd
index e16b10287..164945d2a 100644
--- a/helm/dtd/cic.dtd
+++ b/helm/dtd/cic.dtd
@@ -1,38 +1,39 @@
 <?xml encoding="ISO-8859-1"?>
 
-<!--*****************************************************************-->
-<!-- DTD FOR CIC OBJECTS:                                            -->
-<!--  First draft: September 1999, Claudio Sacerdoti Coen            -->
-<!--  Revised: February 3 2000, Claudio Sacerdoti Coen, Irene Schena -->
-<!--  Last Revision: April 4 2000, Claudio Sacerdoti Coen            -->
-<!--  Last Revision: June 19 2000, Claudio Sacerdoti Coen            -->
-<!--  Last Revision: June 20 2000, Claudio Sacerdoti Coen            -->
-<!--*****************************************************************-->
+<!-- DTD FOR CIC OBJECTS: -->
 
 <!-- CIC term declaration -->
 
 <!ENTITY % term '(LAMBDA|CAST|PROD|REL|SORT|APPLY|VAR|META|IMPLICIT|CONST|
-                  ABST|MUTIND|MUTCONSTRUCT|MUTCASE|FIX|COFIX)'>
+                  LETIN|MUTIND|MUTCONSTRUCT|MUTCASE|FIX|COFIX|instantiate)'>
+
+<!-- CIC sorts -->
+
+<!ENTITY % sort '(Prop|Set|Type)'>
+
+<!-- CIC sequents -->
+
+<!ENTITY % sequent '((Decl|Def|Hidden)*,Goal)'>
 
 <!-- CIC objects: -->
 
-<!ELEMENT Definition (body, type)>
-<!ATTLIST Definition
+<!-- CSC: so far params is equal to the one of the only body.  -->
+<!ELEMENT ConstantType %term;>
+<!ATTLIST ConstantType
           name       CDATA      #REQUIRED
           params     CDATA      #REQUIRED
-          paramMode  (POSSIBLE) #IMPLIED
           id         ID         #REQUIRED>
 
-<!ELEMENT Axiom (type)>
-<!ATTLIST Axiom
-          name   CDATA #REQUIRED
-          params CDATA #REQUIRED
-          id     ID    #REQUIRED>
+<!ELEMENT ConstantBody %term;>
+<!ATTLIST ConstantBody
+          for        CDATA      #REQUIRED
+          params     CDATA      #REQUIRED
+          id         ID         #REQUIRED>
 
-<!ELEMENT CurrentProof (Conjecture*,body,type)>
+<!ELEMENT CurrentProof (Conjecture*,body)>
 <!ATTLIST CurrentProof
-          name CDATA #REQUIRED
-          id   ID    #REQUIRED>
+          of         CDATA      #REQUIRED
+          id         ID         #REQUIRED>
 
 <!ELEMENT InductiveDefinition (InductiveType+)>
 <!ATTLIST InductiveDefinition
@@ -40,45 +41,75 @@
           params   CDATA   #REQUIRED
           id       ID      #REQUIRED>
 
-<!ELEMENT Variable (type)>
+<!ELEMENT Variable (body?,type)>
 <!ATTLIST Variable
           name CDATA #REQUIRED
           id   ID    #REQUIRED>
 
+<!ELEMENT Sequent %sequent;>
+<!ATTLIST Sequent
+          no  NMTOKEN #REQUIRED
+          id  ID      #REQUIRED>
+
 <!-- Elements used in CIC objects, which are not terms: -->
 
 <!ELEMENT InductiveType (arity,Constructor*)>
 <!ATTLIST InductiveType
           name      CDATA        #REQUIRED
-          inductive (true|false) #REQUIRED>
+          inductive (true|false) #REQUIRED
+          id        ID           #REQUIRED>
 
-<!ELEMENT Conjecture %term;>
+<!ELEMENT Conjecture %sequent;>
 <!ATTLIST Conjecture
-          no NMTOKEN #REQUIRED>
+          no NMTOKEN #REQUIRED
+          id ID      #REQUIRED>
 
 <!ELEMENT Constructor %term;>
 <!ATTLIST Constructor
           name CDATA #REQUIRED>
 
+<!ELEMENT Decl %term;>
+<!ATTLIST Decl
+          name CDATA #IMPLIED
+          id   ID    #REQUIRED>
+
+<!ELEMENT Def %term;>
+<!ATTLIST Def
+          name CDATA #IMPLIED
+          id   ID    #REQUIRED>
+
+<!ELEMENT Hidden EMPTY>
+<!ATTLIST Hidden
+          id ID #REQUIRED>
+
+<!ELEMENT Goal %term;>
+
 <!-- CIC terms: -->
 
-<!ELEMENT LAMBDA (source,target)>
+<!ELEMENT LAMBDA (decl*,target)>
 <!ATTLIST LAMBDA
-          id ID #REQUIRED>
+          sort %sort; #REQUIRED>
+
+<!ELEMENT LETIN (def*,target)>
+<!ATTLIST LETIN
+          sort %sort; #REQUIRED>
 
-<!ELEMENT PROD (source,target)>
+<!ELEMENT PROD (decl*,target)>
 <!ATTLIST PROD
-          id ID #REQUIRED>
+          type %sort; #REQUIRED>
 
 <!ELEMENT CAST (term,type)>
 <!ATTLIST CAST
-          id ID #REQUIRED>
+          id   ID     #REQUIRED
+          sort %sort; #REQUIRED>
 
 <!ELEMENT REL EMPTY>
 <!ATTLIST REL
           value  NMTOKEN #REQUIRED
           binder CDATA   #REQUIRED
-          id     ID      #REQUIRED>
+          id     ID      #REQUIRED
+          idref  IDREF   #REQUIRED
+          sort   %sort;  #REQUIRED>
 
 <!ELEMENT SORT EMPTY>
 <!ATTLIST SORT
@@ -87,17 +118,23 @@
 
 <!ELEMENT APPLY (%term;)+>
 <!ATTLIST APPLY
-          id ID #REQUIRED>
+          id   ID     #REQUIRED
+          sort %sort; #REQUIRED>
 
 <!ELEMENT VAR EMPTY>
 <!ATTLIST VAR
-          relUri CDATA #REQUIRED
-          id     ID    #REQUIRED>
-
-<!ELEMENT META EMPTY>
+          uri  CDATA  #REQUIRED
+          id   ID     #REQUIRED
+          sort %sort; #REQUIRED>
+
+<!-- The substitutions are ordered by increasing DeBrujin  -->
+<!-- index. An empty substitution means that that index is -->
+<!-- not accessible.                                       -->
+<!ELEMENT META (substitution*)>
 <!ATTLIST META
-          no NMTOKEN #REQUIRED
-          id ID      #REQUIRED>
+          no              NMTOKEN #REQUIRED
+          id              ID      #REQUIRED
+          sort            %sort;  #REQUIRED>
 
 <!ELEMENT IMPLICIT EMPTY>
 <!ATTLIST IMPLICIT
@@ -105,13 +142,9 @@
 
 <!ELEMENT CONST EMPTY>
 <!ATTLIST CONST
-          uri CDATA #REQUIRED
-          id  ID    #REQUIRED>
-
-<!ELEMENT ABST EMPTY>
-<!ATTLIST ABST
-          uri CDATA #REQUIRED
-          id  ID    #REQUIRED>
+          uri  CDATA  #REQUIRED
+          id   ID     #REQUIRED
+          sort %sort; #REQUIRED>
 
 <!ELEMENT MUTIND EMPTY>
 <!ATTLIST MUTIND
@@ -124,42 +157,68 @@
           uri      CDATA   #REQUIRED
           noType   NMTOKEN #REQUIRED
           noConstr NMTOKEN #REQUIRED
-          id       ID      #REQUIRED>
+          id       ID      #REQUIRED
+          sort     %sort;  #REQUIRED>
 
 <!ELEMENT MUTCASE (patternsType,inductiveTerm,pattern*)>
 <!ATTLIST MUTCASE
           uriType CDATA   #REQUIRED
           noType  NMTOKEN #REQUIRED
-          id      ID      #REQUIRED>
+          id      ID      #REQUIRED
+          sort    %sort;  #REQUIRED>
 
 <!ELEMENT FIX (FixFunction+)>
 <!ATTLIST FIX
           noFun NMTOKEN #REQUIRED
-          id    ID      #REQUIRED>
+          id    ID      #REQUIRED
+          sort  %sort;  #REQUIRED>
 
 <!ELEMENT COFIX (CofixFunction+)>
 <!ATTLIST COFIX
           noFun NMTOKEN #REQUIRED
-          id    ID      #REQUIRED>
+          id    ID      #REQUIRED
+          sort  %sort;  #REQUIRED>
 
 <!-- Elements used in CIC terms: -->
 
 <!ELEMENT FixFunction (type,body)>
 <!ATTLIST FixFunction
           name     CDATA   #REQUIRED
+          id       ID      #REQUIRED
           recIndex NMTOKEN #REQUIRED>
 
 <!ELEMENT CofixFunction (type,body)>
 <!ATTLIST CofixFunction
+          id       ID      #REQUIRED
           name     CDATA   #REQUIRED>
 
+<!ELEMENT substitution ((%term;)?)>
+
+<!-- Explicit named substitutions: -->
+
+<!ELEMENT instantiate ((CONST|MUTIND|MUTCONSTRUCT),arg+)>
+<!ATTLIST instantiate
+          id ID #IMPLIED>
+
 <!-- Sintactic sugar for CIC terms and for CIC objects: -->
 
-<!ELEMENT source %term;>
+<!ELEMENT arg %term;>
+<!ATTLIST arg
+          relUri CDATA #REQUIRED>
+
+<!ELEMENT decl %term;>
+<!ATTLIST decl
+          id     ID     #REQUIRED
+          type   %sort; #REQUIRED
+          binder CDATA  #IMPLIED>
+          
+<!ELEMENT def %term;>
+<!ATTLIST def
+          id     ID     #REQUIRED
+          sort   %sort; #REQUIRED
+          binder CDATA  #IMPLIED>
 
 <!ELEMENT target %term;>
-<!ATTLIST target
-          binder CDATA #IMPLIED>
 
 <!ELEMENT term %term;>