Author: atsushi
Date: 2005-03-07 12:12:00 -0500 (Mon, 07 Mar 2005)
New Revision: 41533
Modified:
trunk/mcs/class/System.XML/System.Xml/ChangeLog
trunk/mcs/class/System.XML/System.Xml/DTDValidatingReader.cs
trunk/mcs/class/System.XML/System.Xml/XmlDocument.cs
Log:
2005-03-07 Atsushi Enomoto <[EMAIL PROTECTED]>
* XmlDocument.cs : ugh, so I introduced extraneous reader.Read() in
ReadNode() for EntityReference and it resulted in unexpected skip.
* DTDValidatingReader.cs : On EndEntity, LocalName and Name should
return the name of entity. Removed unused entityReaderNameStack.
Modified: trunk/mcs/class/System.XML/System.Xml/ChangeLog
===================================================================
--- trunk/mcs/class/System.XML/System.Xml/ChangeLog 2005-03-07 16:30:34 UTC
(rev 41532)
+++ trunk/mcs/class/System.XML/System.Xml/ChangeLog 2005-03-07 17:12:00 UTC
(rev 41533)
@@ -1,5 +1,12 @@
2005-03-07 Atsushi Enomoto <[EMAIL PROTECTED]>
+ * XmlDocument.cs : ugh, so I introduced extraneous reader.Read() in
+ ReadNode() for EntityReference and it resulted in unexpected skip.
+ * DTDValidatingReader.cs : On EndEntity, LocalName and Name should
+ return the name of entity. Removed unused entityReaderNameStack.
+
+2005-03-07 Atsushi Enomoto <[EMAIL PROTECTED]>
+
* DTDValidatingReader.cs : reverted one change in r40985. Entity stack
is nothing to do with ReadAttributeValue().
Modified: trunk/mcs/class/System.XML/System.Xml/DTDValidatingReader.cs
===================================================================
--- trunk/mcs/class/System.XML/System.Xml/DTDValidatingReader.cs
2005-03-07 16:30:34 UTC (rev 41532)
+++ trunk/mcs/class/System.XML/System.Xml/DTDValidatingReader.cs
2005-03-07 17:12:00 UTC (rev 41533)
@@ -59,7 +59,6 @@
XmlValidatingReader validatingReader)
{
entityReaderStack = new Stack ();
- entityReaderNameStack = new Stack ();
entityReaderDepthStack = new Stack ();
this.reader = reader;
this.sourceTextReader = reader as XmlTextReader;
@@ -83,7 +82,6 @@
}
Stack entityReaderStack;
- Stack entityReaderNameStack;
Stack entityReaderDepthStack;
XmlReader reader;
XmlTextReader sourceTextReader;
@@ -393,14 +391,12 @@
if (DTD == null || DTD.EntityDecls
[reader.Name] == null)
throw NotWFError (String.Format
("Entity '{0}' was not declared.", reader.Name));
entityReaderStack.Push (reader);
- entityReaderNameStack.Push (reader.Name);
entityReaderDepthStack.Push (Depth);
reader = sourceTextReader = nextEntityReader;
nextEntityReader = null;
return ReadContent ();
} else if (reader.EOF && entityReaderStack.Count > 0) {
reader = entityReaderStack.Pop () as XmlReader;
- entityReaderNameStack.Pop ();
entityReaderDepthStack.Pop ();
sourceTextReader = reader as XmlTextReader;
return ReadContent ();
@@ -1062,6 +1058,8 @@
get {
if (currentTextValue != null ||
consumedAttribute)
return String.Empty;
+ if (entityReaderStack.Count > 0 && reader.EOF)
+ return ((XmlReader)
entityReaderStack.Peek ()).LocalName; // name of EndEntity
else if (NodeType == XmlNodeType.Attribute)
return (string) attributeLocalNames
[currentAttribute];
else if (IsDefault)
@@ -1075,6 +1073,8 @@
get {
if (currentTextValue != null ||
consumedAttribute)
return String.Empty;
+ if (entityReaderStack.Count > 0 && reader.EOF)
+ return ((XmlReader)
entityReaderStack.Peek ()).Name; // name of EndEntity
else if (NodeType == XmlNodeType.Attribute)
return currentAttribute;
else if (IsDefault)
Modified: trunk/mcs/class/System.XML/System.Xml/XmlDocument.cs
===================================================================
--- trunk/mcs/class/System.XML/System.Xml/XmlDocument.cs 2005-03-07
16:30:34 UTC (rev 41532)
+++ trunk/mcs/class/System.XML/System.Xml/XmlDocument.cs 2005-03-07
17:12:00 UTC (rev 41533)
@@ -875,9 +875,8 @@
{
reader.ResolveEntity ();
reader.Read ();
- for (XmlNode child; reader.NodeType !=
XmlNodeType.EndEntity && ((child = ReadNode (reader)) != null);)
+ for (XmlNode child; reader.NodeType !=
XmlNodeType.EndEntity && (child = ReadNode (reader)) != null;)
n.InsertBefore (child, null,
false, false);
- reader.Read (); // skip EndEntity
}
break;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches