Author: atsushi
Date: 2006-02-20 10:00:34 -0500 (Mon, 20 Feb 2006)
New Revision: 57069
Modified:
trunk/mcs/class/System.XML/System.Xml/ChangeLog
trunk/mcs/class/System.XML/System.Xml/DTDValidatingReader2.cs
trunk/mcs/class/System.XML/System.Xml/EntityResolvingXmlReader.cs
trunk/mcs/class/System.XML/System.Xml/XmlNodeReader2.cs
trunk/mcs/class/System.XML/System.Xml/XmlTextReader2.cs
Log:
2006-02-20 Atsushi Enomoto <[EMAIL PROTECTED]>
* EntityResolvingXmlReader.cs, XmlNodeReader2.cs, XmlTextReader2.cs :
in get_NodeType() entity reader existence check is faster.
* DTDValidatingReader2.cs : IsDefault could be avoided.
Modified: trunk/mcs/class/System.XML/System.Xml/ChangeLog
===================================================================
--- trunk/mcs/class/System.XML/System.Xml/ChangeLog 2006-02-20 14:43:58 UTC
(rev 57068)
+++ trunk/mcs/class/System.XML/System.Xml/ChangeLog 2006-02-20 15:00:34 UTC
(rev 57069)
@@ -1,5 +1,11 @@
2006-02-20 Atsushi Enomoto <[EMAIL PROTECTED]>
+ * EntityResolvingXmlReader.cs, XmlNodeReader2.cs, XmlTextReader2.cs :
+ in get_NodeType() entity reader existence check is faster.
+ * DTDValidatingReader2.cs : IsDefault could be avoided.
+
+2006-02-20 Atsushi Enomoto <[EMAIL PROTECTED]>
+
* XmlNodeReaderImpl.cs : optimized Depth.
2006-02-20 Atsushi Enomoto <[EMAIL PROTECTED]>
Modified: trunk/mcs/class/System.XML/System.Xml/DTDValidatingReader2.cs
===================================================================
--- trunk/mcs/class/System.XML/System.Xml/DTDValidatingReader2.cs
2006-02-20 14:43:58 UTC (rev 57068)
+++ trunk/mcs/class/System.XML/System.Xml/DTDValidatingReader2.cs
2006-02-20 15:00:34 UTC (rev 57069)
@@ -1015,7 +1015,7 @@
public override bool HasValue {
get {
- return IsDefault ? true :
+ return currentAttribute >= 0 ? true :
currentTextValue != null ? true :
reader.HasValue;
}
Modified: trunk/mcs/class/System.XML/System.Xml/EntityResolvingXmlReader.cs
===================================================================
--- trunk/mcs/class/System.XML/System.Xml/EntityResolvingXmlReader.cs
2006-02-20 14:43:58 UTC (rev 57068)
+++ trunk/mcs/class/System.XML/System.Xml/EntityResolvingXmlReader.cs
2006-02-20 15:00:34 UTC (rev 57069)
@@ -146,10 +146,12 @@
public override XmlNodeType NodeType {
get {
- if (Current == entity)
+ if (entity != null) {
+ if (entity.ReadState ==
ReadState.Initial)
+ return source.NodeType;
return entity.EOF ?
XmlNodeType.EndEntity : entity.NodeType;
- else
- return source.NodeType;
+ }
+ return source.NodeType;
}
}
Modified: trunk/mcs/class/System.XML/System.Xml/XmlNodeReader2.cs
===================================================================
--- trunk/mcs/class/System.XML/System.Xml/XmlNodeReader2.cs 2006-02-20
14:43:58 UTC (rev 57068)
+++ trunk/mcs/class/System.XML/System.Xml/XmlNodeReader2.cs 2006-02-20
15:00:34 UTC (rev 57069)
@@ -171,8 +171,11 @@
public override XmlNodeType NodeType {
get {
- if (Current == entity)
- return entity.EOF ?
XmlNodeType.EndEntity : entity.NodeType;
+ if (entity != null)
+ return entity.ReadState ==
ReadState.Initial ?
+ source.NodeType :
+ entity.EOF ?
XmlNodeType.EndEntity :
+ entity.NodeType;
else
return source.NodeType;
}
Modified: trunk/mcs/class/System.XML/System.Xml/XmlTextReader2.cs
===================================================================
--- trunk/mcs/class/System.XML/System.Xml/XmlTextReader2.cs 2006-02-20
14:43:58 UTC (rev 57068)
+++ trunk/mcs/class/System.XML/System.Xml/XmlTextReader2.cs 2006-02-20
15:00:34 UTC (rev 57069)
@@ -210,8 +210,11 @@
public override XmlNodeType NodeType {
get {
- if (Current == entity)
- return entity.EOF ?
XmlNodeType.EndEntity : entity.NodeType;
+ if (entity != null)
+ return entity.ReadState ==
ReadState.Initial ?
+ source.NodeType :
+ entity.EOF ?
XmlNodeType.EndEntity :
+ entity.NodeType;
else
return source.NodeType;
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches