Author: atsushi
Date: 2005-03-09 12:53:30 -0500 (Wed, 09 Mar 2005)
New Revision: 41608

Modified:
   trunk/mcs/class/System.XML/System.Xml/ChangeLog
   trunk/mcs/class/System.XML/System.Xml/XmlParserInput.cs
Log:
2005-03-09  Atsushi Enomoto <[EMAIL PROTECTED]>

        * XmlParserInput.cs : silly mixed line endings :(



Modified: trunk/mcs/class/System.XML/System.Xml/ChangeLog
===================================================================
--- trunk/mcs/class/System.XML/System.Xml/ChangeLog     2005-03-09 17:01:35 UTC 
(rev 41607)
+++ trunk/mcs/class/System.XML/System.Xml/ChangeLog     2005-03-09 17:53:30 UTC 
(rev 41608)
@@ -1,3 +1,7 @@
+2005-03-09  Atsushi Enomoto <[EMAIL PROTECTED]>
+
+       * XmlParserInput.cs : silly mixed line endings :(
+
 2005-03-08  Atsushi Enomoto <[EMAIL PROTECTED]>
 
        * XmlTextWriter.cs : namespace declaration check for those which starts

Modified: trunk/mcs/class/System.XML/System.Xml/XmlParserInput.cs
===================================================================
--- trunk/mcs/class/System.XML/System.Xml/XmlParserInput.cs     2005-03-09 
17:01:35 UTC (rev 41607)
+++ trunk/mcs/class/System.XML/System.Xml/XmlParserInput.cs     2005-03-09 
17:53:30 UTC (rev 41608)
@@ -1,11 +1,11 @@
-//
-// System.Xml.XmlParserInput
-//
-// Author:
-//     Atsushi Enomoto ([EMAIL PROTECTED])
-//
-//     (C)2003 Atsushi Enomoto
-//
+//
+// System.Xml.XmlParserInput
+//
+// Author:
+//     Atsushi Enomoto ([EMAIL PROTECTED])
+//
+//     (C)2003 Atsushi Enomoto
+//
 
 //
 // Permission is hereby granted, free of charge, to any person obtaining
@@ -27,190 +27,190 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-using System;
-using System.IO;
-using System.Text;
-using System.Xml;
-using System.Globalization;
-
-namespace System.Xml
-{
-       internal class XmlParserInput
-       {
-               #region ctor
-               public XmlParserInput (TextReader reader, string baseURI)
-                       : this (reader, baseURI, 1, 1)
-               {
-               }
-
-               public XmlParserInput (TextReader reader, string baseURI, int 
line, int column)
-               {
-                       this.reader = reader;
-                       this.line = line;
-                       this.column = column;
-                       this.baseURI = baseURI;
-               }
-               #endregion
-
-               #region Public Methods
-               // Read the next character and compare it against the
-               // specified character.
-               public void Close ()
-               {
-                       this.reader.Close ();
-               }
-
-               public void Expect (int expected)
-               {
-                       int ch = ReadChar ();
-
-                       if (ch != expected) {
-                               throw ReaderError (
-                                       String.Format 
(CultureInfo.InvariantCulture, 
-                                               "expected '{0}' ({1:X}) but 
found '{2}' ({3:X})",
-                                               (char)expected,
-                                               expected,
-                                               (char)ch,
-                                               ch));
-                       }
-               }
-
-               public void Expect (string expected)
-               {
-                       int len = expected.Length;
-                       for(int i=0; i< len; i++)
-                               Expect (expected[i]);
-               }
-
-               public void InsertParameterEntityBuffer (string value)
-               {
-                       this.peBuffer.Insert (peBufferIndex, ' ');
-                       this.peBuffer.Insert (peBufferIndex + 1, value);
-                       this.peBuffer.Insert (peBufferIndex + value.Length + 1, 
' ');
-                       peStored = true;
-               }
-
-               public int PeekChar ()
-               {
-                       if (peStored)
-                               return peBuffer [peBufferIndex];
-
-                       if (has_peek)
-                               return peek_char;
-
-                       peek_char = reader.Read ();
+using System;
+using System.IO;
+using System.Text;
+using System.Xml;
+using System.Globalization;
+
+namespace System.Xml
+{
+       internal class XmlParserInput
+       {
+               #region ctor
+               public XmlParserInput (TextReader reader, string baseURI)
+                       : this (reader, baseURI, 1, 1)
+               {
+               }
+
+               public XmlParserInput (TextReader reader, string baseURI, int 
line, int column)
+               {
+                       this.reader = reader;
+                       this.line = line;
+                       this.column = column;
+                       this.baseURI = baseURI;
+               }
+               #endregion
+
+               #region Public Methods
+               // Read the next character and compare it against the
+               // specified character.
+               public void Close ()
+               {
+                       this.reader.Close ();
+               }
+
+               public void Expect (int expected)
+               {
+                       int ch = ReadChar ();
+
+                       if (ch != expected) {
+                               throw ReaderError (
+                                       String.Format 
(CultureInfo.InvariantCulture, 
+                                               "expected '{0}' ({1:X}) but 
found '{2}' ({3:X})",
+                                               (char)expected,
+                                               expected,
+                                               (char)ch,
+                                               ch));
+                       }
+               }
+
+               public void Expect (string expected)
+               {
+                       int len = expected.Length;
+                       for(int i=0; i< len; i++)
+                               Expect (expected[i]);
+               }
+
+               public void InsertParameterEntityBuffer (string value)
+               {
+                       this.peBuffer.Insert (peBufferIndex, ' ');
+                       this.peBuffer.Insert (peBufferIndex + 1, value);
+                       this.peBuffer.Insert (peBufferIndex + value.Length + 1, 
' ');
+                       peStored = true;
+               }
+
+               public int PeekChar ()
+               {
+                       if (peStored)
+                               return peBuffer [peBufferIndex];
+
+                       if (has_peek)
+                               return peek_char;
+
+                       peek_char = reader.Read ();
                        if (peek_char >= 0xD800 && peek_char <= 0xDBFF) {
                                int i = reader.Read ();
                                if (i >= 0xDC00 && i <= 0xDFFF)
                                        peek_char += i;
                        }
-                       has_peek = true;
-                       return peek_char;
-               }
-
-               public int ReadChar ()
-               {
-                       int ch;
-
-                       if (peStored) {
-                               ch = peBuffer [peBufferIndex];
-                               peBufferIndex++;
-                               if (peBufferIndex == peBuffer.Length) {
-                                       peStored = false;
-                                       peBuffer.Length = 0;
-                                       peBufferIndex = 0;
-                               }
-                               // I decided not to add character to currentTag 
with respect to PERef value
-                               return ch;
-                       }
-
-                       if (has_peek) {
-                               ch = peek_char;
-                               has_peek = false;
-                       } else {
-                               ch = reader.Read ();
+                       has_peek = true;
+                       return peek_char;
+               }
+
+               public int ReadChar ()
+               {
+                       int ch;
+
+                       if (peStored) {
+                               ch = peBuffer [peBufferIndex];
+                               peBufferIndex++;
+                               if (peBufferIndex == peBuffer.Length) {
+                                       peStored = false;
+                                       peBuffer.Length = 0;
+                                       peBufferIndex = 0;
+                               }
+                               // I decided not to add character to currentTag 
with respect to PERef value
+                               return ch;
+                       }
+
+                       if (has_peek) {
+                               ch = peek_char;
+                               has_peek = false;
+                       } else {
+                               ch = reader.Read ();
                                if (ch >= 0xD800 && ch <= 0xDBFF) {
                                        int i = reader.Read ();
                                        if (i > 0xDC00 && i <= 0xDFFF)
                                                ch += i;
                                }
-                       }
-
-                       if (ch == '\n') {
-                               line++;
-                               column = 1;
-                       } else {
-                               column++;
-                       }
-                       return ch;
-               }
+                       }
 
-               #endregion
-
-               #region Public Properties
-               public string BaseURI {
-                       get { return baseURI; }
-               }
-
-               public bool HasPEBuffer {
-                       get { return peStored; }
-               }
-               
-               public int LineNumber {
-                       get { return line; }
-               }
-
-               public int LinePosition {
-                       get { return column; }
-               }
-
-               public bool InitialState {
-                       get { return initialState; }
-                       set { initialState = value; }
-               }
-
-               #endregion
-
-               #region Privates
-               TextReader reader;
-               bool has_peek;
-               int peek_char;
-               int line;
-               int column;
-               StringBuilder peBuffer = new StringBuilder ();
-               string baseURI;
-               bool peStored = false;
-               bool initialState = true;
-               int peBufferIndex;
-
-               private int ParseCharReference (string name)
-               {
-                       int ret = -1;
-                       if (name.Length > 0 && name [0] == '#') {
-                               if (name [1] == 'x')
-                                       ret = int.Parse (name.Substring (2, 
name.Length - 2), NumberStyles.None & NumberStyles.AllowHexSpecifier, 
CultureInfo.InvariantCulture);
-                               else
-                                       ret = int.Parse (name.Substring (1, 
name.Length - 1), CultureInfo.InvariantCulture);
-                       }
-                       return ret;
-               }
-
-               private int ParseKnownEntityReference (string name)
-               {
-                       switch (name) {
-                       case "quot": return '"';
-                       case "lt": return '<';
-                       case "gt": return '>';
-                       case "amp": return '&';
-                       case "apos": return '\'';
-                       }
-                       return -1;
-               }
-
-               private XmlException ReaderError (string message)
-               {
-                       return new XmlException (message, null, line, column);
-               }
-               #endregion
-       }
-}
+                       if (ch == '\n') {
+                               line++;
+                               column = 1;
+                       } else {
+                               column++;
+                       }
+                       return ch;
+               }
+
+               #endregion
+
+               #region Public Properties
+               public string BaseURI {
+                       get { return baseURI; }
+               }
+
+               public bool HasPEBuffer {
+                       get { return peStored; }
+               }
+               
+               public int LineNumber {
+                       get { return line; }
+               }
+
+               public int LinePosition {
+                       get { return column; }
+               }
+
+               public bool InitialState {
+                       get { return initialState; }
+                       set { initialState = value; }
+               }
+
+               #endregion
+
+               #region Privates
+               TextReader reader;
+               bool has_peek;
+               int peek_char;
+               int line;
+               int column;
+               StringBuilder peBuffer = new StringBuilder ();
+               string baseURI;
+               bool peStored = false;
+               bool initialState = true;
+               int peBufferIndex;
+
+               private int ParseCharReference (string name)
+               {
+                       int ret = -1;
+                       if (name.Length > 0 && name [0] == '#') {
+                               if (name [1] == 'x')
+                                       ret = int.Parse (name.Substring (2, 
name.Length - 2), NumberStyles.None & NumberStyles.AllowHexSpecifier, 
CultureInfo.InvariantCulture);
+                               else
+                                       ret = int.Parse (name.Substring (1, 
name.Length - 1), CultureInfo.InvariantCulture);
+                       }
+                       return ret;
+               }
+
+               private int ParseKnownEntityReference (string name)
+               {
+                       switch (name) {
+                       case "quot": return '"';
+                       case "lt": return '<';
+                       case "gt": return '>';
+                       case "amp": return '&';
+                       case "apos": return '\'';
+                       }
+                       return -1;
+               }
+
+               private XmlException ReaderError (string message)
+               {
+                       return new XmlException (message, null, line, column);
+               }
+               #endregion
+       }
+}

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to