2003-06-02 Atsushi Enomoto <ginga@kit.hi-ho.ne.jp>

	* XmlDocumentNavigator.cs : quick fix for MoveToFirstChild().
	* XmlConvert.cs : fixed VerifyNCName() to check correctly.

svn path=/trunk/mcs/; revision=15064

diff --git a/mcs/class/System.XML/System.Xml/ChangeLog b/mcs/class/System.XML/System.Xml/ChangeLog
index 57e3544488f73ad7fd55b0b8a16bec5d57991f5d..9abc44fa081c5ae0a2e2fcfac24ff12c3c34930b 100644 (file)
--- a/mcs/class/System.XML/System.Xml/ChangeLog
+++ b/mcs/class/System.XML/System.Xml/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-02  Atsushi Enomoto <ginga@kit.hi-ho.ne.jp>
+
+       * XmlDocumentNavigator.cs : quick fix for MoveToFirstChild().
+       * XmlConvert.cs : fixed VerifyNCName() to check correctly.
+
 2003-06-01  Atsushi Enomoto <ginga@kit.hi-ho.ne.jp>
 
        * XmlDocumentNavigator.cs : Compute document node one time.

diff --git a/mcs/class/System.XML/System.Xml/XmlConvert.cs b/mcs/class/System.XML/System.Xml/XmlConvert.cs
index e8c0983db9470dd63de806a9b5b1627db6e7cc69..643ea24d8eb541014de5f11facbd5f6613d6f4e1 100755 (executable)
--- a/mcs/class/System.XML/System.Xml/XmlConvert.cs
+++ b/mcs/class/System.XML/System.Xml/XmlConvert.cs
@@ -421,7 +421,7 @@ namespace System.Xml {
                        if(ncname == null)
                                throw new ArgumentNullException("ncname");
 
-                       if(XmlConstructs.IsValidName(ncname, out innerEx))
+                       if(XmlConstructs.IsValidNCName(ncname, out innerEx))
                                return ncname;
                        
                        throw new XmlException("'"+ncname+"' is not a valid XML NCName",innerEx);

diff --git a/mcs/class/System.XML/System.Xml/XmlDocumentNavigator.cs b/mcs/class/System.XML/System.Xml/XmlDocumentNavigator.cs
index c22d8d910d283f2a8181bedc308d30dd49dad3d3..e86b81f32b5dcacbc59ab7bac4d6c9927646a0ba 100644 (file)
--- a/mcs/class/System.XML/System.Xml/XmlDocumentNavigator.cs
+++ b/mcs/class/System.XML/System.Xml/XmlDocumentNavigator.cs
@@ -223,10 +223,10 @@ namespace System.Xml
                                                return false;
                                        bool loop = true;
                                        do {
-                                               switch (node.NodeType) {
+                                               switch (n.NodeType) {
                                                case XmlNodeType.XmlDeclaration:
                                                case XmlNodeType.DocumentType:
-                                                       n = node.NextSibling;
+                                                       n = n.NextSibling;
                                                        if (n == null)
                                                                return false;
                                                        break;
@@ -235,6 +235,7 @@ namespace System.Xml
                                                        break;
                                                }
                                        } while (loop);
+                                       node = n;
                                }
                                else
                                        node = node.FirstChild;