X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=etc%2Feffect.dtd;h=9df3aeca8d8549618ee7fe475f1e6c148d0532c4;hb=09eee9b1bd1d75f696272f2fe37385c5f50f309d;hp=4c88db72ff6a50950d389598dfb4e879b1b42708;hpb=2afd2596b1fe3b898467e8780a669f646b0b527b;p=libfirm

diff --git a/etc/effect.dtd b/etc/effect.dtd
index 4c88db72f..9df3aeca8 100644
--- a/etc/effect.dtd
+++ b/etc/effect.dtd
@@ -6,7 +6,7 @@
 * Modified by: Boris Boesler
 * Created:     Y.X.2004
 * CVS-ID:      $Id$
-* Copyright:   (c) 1999-2004 Universität Karlsruhe
+* Copyright:   (c) 1999-2004 Universität Karlsruhe
 * Licence:     This file is protected by GPL -  GNU GENERAL PUBLIC LICENSE.
 -->
 
@@ -16,16 +16,16 @@
 <!-- allow nodes/entity accesses to reference other nodes/an entity -->
 <!ENTITY	% firm.id		"id ID #REQUIRED">
 
-<!-- allow a node to specify a type -->
+<!-- allow a node to specify a type --> <!-- rename to firm.typeref -->
 <!ENTITY	% firm.type		"type CDATA #REQUIRED">
 
 <!-- allow a node to specify a field -->
 <!ENTITY	% firm.entity		"entity CDATA #REQUIRED">
 
-<!-- allow a node to specify a typeid -->
+<!-- allow a node to specify a typeid --> <!-- wird das jemals gebraucht? -->
 <!ENTITY	% typeid		"typeid CDATA #REQUIRED">
 
-<!-- allow a node to specify an owner -->
+<!-- allow an eneity to specify an owner -->
 <!ENTITY	% firm.owner		"owner CDATA #REQUIRED">
 
 <!-- the root element -->
@@ -33,7 +33,7 @@
 <!ATTLIST  	effects
 			module		CDATA		#IMPLIED>
 
-<!-- an entity reference -->
+<!-- a type reference -->
 <!ELEMENT	type	EMPTY>
 <!ATTLIST	type
 			%firm.id;
@@ -50,22 +50,22 @@
 <!-- a single effect -->
 <!ELEMENT  	effect (arg*, (load|store|alloc|call|join|unknown)*, raise?, ret)>
 <!ATTLIST  	effect
-			procname	CDATA		#REQUIRED;
+			procname	CDATA		#REQUIRED <!-- warum keine firm.entity? -->
 			%firm.owner;>
 
 <!-- procedure argument -->
 <!ELEMENT	arg			EMPTY>
 <!ATTLIST 	arg
 			%firm.id;
-			number		CDATA		#REQUIRED;
-		        %firm.type>
+			number		CDATA		#REQUIRED
+		    %firm.type;>
 
 <!-- reference another value -->
 <!ELEMENT	valref		EMPTY>
 <!ATTLIST	valref
 			refid		IDREF		#REQUIRED>
 
-<!-- load effect -->
+<!-- select element for use with store, load and call -->
 <!-- for static entities, use a 'select' without a child element -->
 <!ELEMENT	select		(valref?)>
 <!ATTLIST	select		%firm.entity;>
@@ -76,7 +76,7 @@
 			%firm.id;>
 
 <!-- store effect -->
-<!ELEMENT	store		(select,valref)>
+<!ELEMENT	store		((valref|select),valref)>
 
 <!-- alloc effect -->
 <!ELEMENT	alloc		EMPTY>
@@ -105,6 +105,18 @@
 <!--
 
  $Log$
+ Revision 1.12  2004/11/24 14:53:10  liekweg
+ Annotated after writing Tech Report
+
+ Revision 1.11  2004/11/02 14:30:56  liekweg
+ Re-allow multi-input join
+
+ Revision 1.10  2004/10/29 18:52:32  liekweg
+ Allow only two values for join
+
+ Revision 1.9  2004/10/29 18:38:36  liekweg
+ ** Allow store ::= ((valref|select),valref)
+
  Revision 1.8  2004/10/25 13:51:32  boesler
  minor changes like owner