[Dotgnu-pnet-commits] CVS: pnetlib/System.Xml XmlTextReader.cs,1.16,1.17

[adam ballai <address@hidden>]

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

Modified Files:
        XmlTextReader.cs 
Log Message:


Index: XmlTextReader.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet//pnetlib/System.Xml/XmlTextReader.cs,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** XmlTextReader.cs    11 Jan 2003 03:04:20 -0000      1.16
--- XmlTextReader.cs    11 Jan 2003 11:10:22 -0000      1.17
***************
*** 490,500 ****
                                        builder.Append((char)ch);
                                        linePosition++;
!                                       if((char)reader.Peek() == '>' )
!                                       {
!                                               nodeType = XmlNodeType.Element;
!                                               return builder.ToString();
!                                       }
!                                       else if((char)reader.Peek() == '/')
                                        {
                                                nodeType = 
XmlNodeType.EndElement;
                                                isEmpty = true;
--- 490,497 ----
                                        builder.Append((char)ch);
                                        linePosition++;
!                                       if((char)ch == '/')
                                        {
+                                               SkipWhite();
+                                               Expect('>');
                                                nodeType = 
XmlNodeType.EndElement;
                                                isEmpty = true;
***************
*** 504,508 ****
                                        {
                                                nodeType = XmlNodeType.Element;
-                                               ungetch = ch;
                                                return builder.ToString(0, 
builder.Length -1);
                                        }
--- 501,504 ----
***************
*** 595,604 ****
                                        case '/':
                                                // Check for correct structure 
!                                               if(structFlag != true)
                                                {
                                                        SkipWhite();
!                                                       Expect('>');
                                                        nodeType = 
XmlNodeType.EndElement;
!                                                       isEmpty = true;
                                                }
                                                else
--- 591,602 ----
                                        case '/':
                                                // Check for correct structure 
!                                               if(structFlag == true)
                                                {
+                                                       ClearNodeInfo();
                                                        SkipWhite();
!                                                       name = 
ReadIdentifier(-1);
!                                                       SetName(name);
                                                        nodeType = 
XmlNodeType.EndElement;
!                                                       value = String.Empty;
                                                }
                                                else
***************
*** 760,775 ****
                                                                // reset buffer
                                                                builder = new 
StringBuilder();
!                                                               
!                                                               
if((char)reader.Peek() == '/')
                                                                {
-                                                                       
ReadChar();
-                                                                       
SkipWhite();
                                                                        
Expect('>');
                                                                }
!                                                               else if 
((char)reader.Peek() == '>')
                                                                {
!                                                                       
ReadChar();
                                                                }
!                                                               
                                                                break;
                                                        }
--- 758,772 ----
                                                                // reset buffer
                                                                builder = new 
StringBuilder();
!                                                               ch = ReadChar();
!                                                               if((char)ch == 
'/')
                                                                {
                                                                        
Expect('>');
+                                                                       break;
                                                                }
!                                                               else if 
((char)ch == '>')
                                                                {
!                                                                       break;
                                                                }
!                                                               ungetch = ch;
                                                                break;
                                                        }
***************
*** 793,801 ****
                                                        break;
                                                }
!                                               
!                                               nodeType = XmlNodeType.Text;
!                                               ch = ReadChar();
!                                               value = builder.ToString();
!                                               AnalyzeChar(ch, false);
                                                break;
                                        
--- 790,809 ----
                                                        break;
                                                }
!                                               else
!                                               {
!                                                       nodeType = 
XmlNodeType.Text;
!                                                       value += (char)ch;
!                                                       
!                                                       ch = ReadChar(); 
!                                                       if((char)ch != '<')
!                                                       {
!                                                               AnalyzeChar(ch, 
false);
!                                                               break;
!                                                       }
!                                                       else
!                                                       {
!                                                               ungetch = ch;
!                                                       }
!                                               }
                                                break;