X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=etc%2Feffect.dtd;h=9df3aeca8d8549618ee7fe475f1e6c148d0532c4;hb=505d3662efed6efbca2c43eea2fe23b87816b285;hp=7e505d9bfc23e4231c7f89755c51e6fb08f72edf;hpb=484e6e796f6e62b6846f1b2854e0a5c73a9080c7;p=libfirm

diff --git a/etc/effect.dtd b/etc/effect.dtd
index 7e505d9bf..9df3aeca8 100644
--- a/etc/effect.dtd
+++ b/etc/effect.dtd
@@ -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,7 +50,7 @@
 <!-- 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 -->
@@ -65,7 +65,7 @@
 <!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;>
@@ -92,7 +92,7 @@
 <!ATTLIST	unknown		%firm.id;>
 
 <!-- join two or more values -->
-<!ELEMENT	join		(valref,valref)>
+<!ELEMENT	join		(valref,valref+)>
 <!ATTLIST	join		%firm.id;>
 
 <!-- raise an exception -->
@@ -105,6 +105,12 @@
 <!--
 
  $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