Author: atsushi
Date: 2005-03-15 16:26:11 -0500 (Tue, 15 Mar 2005)
New Revision: 41862
Modified:
trunk/mcs/class/System.XML/Mono.Xml.XPath/ChangeLog
trunk/mcs/class/System.XML/Mono.Xml.XPath/DTMXPathDocumentBuilder2.cs
Log:
2004-03-15 Atsushi Enomoto <[EMAIL PROTECTED]>
* DTMXPathDocumentBuilder2.cs : skip only Read() internally called
xmlReader.Read(). Simplify loop a bit.
Modified: trunk/mcs/class/System.XML/Mono.Xml.XPath/ChangeLog
===================================================================
--- trunk/mcs/class/System.XML/Mono.Xml.XPath/ChangeLog 2005-03-15 21:24:18 UTC
(rev 41861)
+++ trunk/mcs/class/System.XML/Mono.Xml.XPath/ChangeLog 2005-03-15 21:26:11 UTC
(rev 41862)
@@ -1,5 +1,10 @@
2004-03-15 Atsushi Enomoto <[EMAIL PROTECTED]>
+ * DTMXPathDocumentBuilder2.cs : skip only Read() internally called
+ xmlReader.Read(). Simplify loop a bit.
+
+2004-03-15 Atsushi Enomoto <[EMAIL PROTECTED]>
+
* DTMXPathDocumentWriter2.cs : Eliminated Depth as well as -builder.
* DTMXPathNode2.cs, DTMXPathDocumentBuilder2.cs :
Eliminated Depth at all.
Modified: trunk/mcs/class/System.XML/Mono.Xml.XPath/DTMXPathDocumentBuilder2.cs
===================================================================
--- trunk/mcs/class/System.XML/Mono.Xml.XPath/DTMXPathDocumentBuilder2.cs
2005-03-15 21:24:18 UTC (rev 41861)
+++ trunk/mcs/class/System.XML/Mono.Xml.XPath/DTMXPathDocumentBuilder2.cs
2005-03-15 21:26:11 UTC (rev 41862)
@@ -263,8 +263,6 @@
goto case XmlNodeType.Text;
case XmlNodeType.CDATA:
case XmlNodeType.Text:
- if (value == null)
- skipRead = true;
AddNode (parent,
0,
prevSibling,
@@ -299,13 +297,14 @@
case XmlNodeType.Whitespace:
if (xmlReader.NodeType
!= XmlNodeType.Whitespace || xmlSpace == XmlSpace.Preserve)
value +=
xmlReader.Value;
- xmlReader.Read ();
+ loop = xmlReader.Read
();
+ skipRead = true;
continue;
default:
loop = false;
break;
}
- } while (loop && !xmlReader.EOF);
+ } while (loop);
nodes [nodeIndex].Value =
NonAtomicIndex (value);
nodes [nodeIndex].NodeType = type;
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
