[Dotgnu-pnet-commits] pnetlib/System.Xml XmlDocument.cs, 1.17, 1.18 XmlTextReader.cs, 1.46, 1.47

[Adam Ballai <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/System.Xml
In directory subversions:/tmp/cvs-serv28662/System.Xml

Modified Files:
        XmlDocument.cs XmlTextReader.cs 
Log Message:


Index: XmlDocument.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Xml/XmlDocument.cs,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** XmlDocument.cs      8 Oct 2003 15:29:22 -0000       1.17
--- XmlDocument.cs      26 Nov 2003 16:21:48 -0000      1.18
***************
*** 720,723 ****
--- 720,724 ----
                                newNode = null,
                                resultNode = null;
+                               bool isEmptyElement = false;
                                
                                int startDepth = reader.Depth;
***************
*** 736,739 ****
--- 737,743 ----
                                                        }
  
+                                                       /* Grab Element Node 
State - isEmpty switches to true for <node/> */
+                                                       isEmptyElement = 
reader.IsEmptyElement;
+                                                       
                                                        if(reader.HasAttributes)
                                                        {
***************
*** 749,753 ****
                                                                }
                                                        }
! 
                                                        if(currentNode != null)
                                                        {
--- 753,757 ----
                                                                }
                                                        }
!                                                       
                                                        if(currentNode != null)
                                                        {
***************
*** 761,770 ****
                                                        // update result
                                                        resultNode = 
currentNode;
!                                                       // move child to 
currentNode
!                                                       currentNode = 
newElementNode;
                                                        break;
                                                case XmlNodeType.Attribute:
                                                        XmlAttribute 
newAttributeNode1 = CreateAttribute(reader.Name);
-                                                                               
 
                                                        
                                                        
if(reader.ReadAttributeValue())
--- 765,776 ----
                                                        // update result
                                                        resultNode = 
currentNode;
!                                                       if( isEmptyElement == 
false )
!                                                       {
!                                                               // move child 
to currentNode
!                                                               currentNode = 
newElementNode;
!                                                       }
                                                        break;
                                                case XmlNodeType.Attribute:
                                                        XmlAttribute 
newAttributeNode1 = CreateAttribute(reader.Name);
                                                        
                                                        
if(reader.ReadAttributeValue())
***************
*** 784,789 ****
                                                        break;
                                                case XmlNodeType.EndElement:
!                                                       
if(currentNode.ParentNode != null)
                                                                currentNode = 
currentNode.ParentNode;
                                                        break;
                                                case XmlNodeType.EndEntity:
--- 790,797 ----
                                                        break;
                                                case XmlNodeType.EndElement:
!                                                       if( 
currentNode.ParentNode != null )
!                                                       {
                                                                currentNode = 
currentNode.ParentNode;
+                                                       }
                                                        break;
                                                case XmlNodeType.EndEntity:

Index: XmlTextReader.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Xml/XmlTextReader.cs,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** XmlTextReader.cs    15 Nov 2003 06:08:01 -0000      1.46
--- XmlTextReader.cs    26 Nov 2003 16:21:48 -0000      1.47
***************
*** 548,551 ****
--- 548,552 ----
                                        {
                                                SkipWhite();
+                                               ch = reader.Peek();
                                                // more error checking
                                                if((char)ch != '>' && (char)ch 
!= '/')