X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c7a9fa36e4544fd9b7647d59c1108b49f368f243..678c48b37d06743464a6fca756dc0ca056a796e9:/src/common/txtstrm.cpp

diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp
index 4e8dae20ac..8fd6ffaaaf 100644
--- a/src/common/txtstrm.cpp
+++ b/src/common/txtstrm.cpp
@@ -6,7 +6,7 @@
 // Created:     28/06/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
-// Licence:   	wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -52,31 +52,31 @@ wxChar wxTextInputStream::NextNonSeparators()
     wxChar c = (wxChar) 0;
     for (;;)
     {
-	if (!m_input) return (wxChar) 0;
+        if (!m_input) return (wxChar) 0;
         c = m_input.GetC();
-	
-	if (c != wxT('\n') && 
-	    c != wxT('\r') &&
-	    !m_separators.Contains(c)) 
-	  return c;
+
+        if (c != wxT('\n') &&
+            c != wxT('\r') &&
+            !m_separators.Contains(c))
+          return c;
     }
 
 }
 
-inline bool wxTextInputStream::EatEOL(const wxChar &c)
+bool wxTextInputStream::EatEOL(const wxChar &c)
 {
-  if (c == wxT('\n')) return TRUE; // eat on UNIX
-  
-  if (c == wxT('\r')) // eat on both Mac and DOS
+    if (c == wxT('\n')) return TRUE; // eat on UNIX
+
+    if (c == wxT('\r')) // eat on both Mac and DOS
     {
-      if (!m_input) return TRUE;
-      wxChar c2 = m_input.GetC();
-      
-      if (c2 != wxT('\n'))  m_input.Ungetch( c2 ); // Don't eat on Mac
-      return TRUE;
+        if (!m_input) return TRUE;
+        wxChar c2 = m_input.GetC();
+
+        if (c2 != wxT('\n'))  m_input.Ungetch( c2 ); // Don't eat on Mac
+        return TRUE;
     }
 
-  return FALSE;
+    return FALSE;
 }
 
 void wxTextInputStream::SkipIfEndOfLine( wxChar c )
@@ -88,11 +88,13 @@ void wxTextInputStream::SkipIfEndOfLine( wxChar c )
 wxUint32 wxTextInputStream::Read32()
 {
     /* I only implemented a simple integer parser */
+    // VZ: what about using strtol()?? (TODO)
+
     int sign;
     wxInt32 i;
 
     if (!m_input) return 0;
-    int c = NextNonSeparators(); 
+    int c = NextNonSeparators();
     if (c==(wxChar)0) return 0;
 
     i = 0;
@@ -141,11 +143,16 @@ wxUint8 wxTextInputStream::Read8()
 
 double wxTextInputStream::ReadDouble()
 {
-    /* I only implemented a simple float parser */
+    /* I only implemented a simple float parser
+     * VZ: what about using strtod()?? (TODO)
+     */
+
     double f;
-    int sign;
+    int theSign;
+
+    if (!m_input)
+        return 0;
 
-    if (!m_input) return 0;
     int c = NextNonSeparators();
     if (c==(wxChar)0) return 0;
 
@@ -153,22 +160,22 @@ double wxTextInputStream::ReadDouble()
     if (! (c == wxT('.') || c == wxT(',') || c == wxT('-') || c == wxT('+') || isdigit(c)) )
     {
         m_input.Ungetch(c);
-        return 0.0;
+        return 0;
     }
 
     if (c == wxT('-'))
     {
-        sign = -1;
+        theSign = -1;
         c = m_input.GetC();
     } else
     if (c == wxT('+'))
     {
-        sign = 1;
+        theSign = 1;
         c = m_input.GetC();
     }
     else
     {
-        sign = 1;
+        theSign = 1;
     }
 
     while (isdigit(c))
@@ -184,46 +191,45 @@ double wxTextInputStream::ReadDouble()
         c = m_input.GetC();
 
         while (isdigit(c))
-	{
+        {
             f += (c-wxT('0'))*f_multiplicator;
             f_multiplicator /= 10;
             c = m_input.GetC();
         }
 
         if (c == wxT('e'))
-	{
+        {
             double f_multiplicator = 0.0;
             int i, e;
 
             c = m_input.GetC();
 
             switch (c)
-	    {
+            {
                 case wxT('-'): f_multiplicator = 0.1;  break;
-		case wxT('+'): f_multiplicator = 10.0; break;
-	    }
+                case wxT('+'): f_multiplicator = 10.0; break;
+            }
 
             e = Read8();  // why only max 256 ?
 
             for (i=0;i<e;i++)
                 f *= f_multiplicator;
         }
-	else
-	    SkipIfEndOfLine( c );
+        else
+            SkipIfEndOfLine( c );
     }
     else
     {
         m_input.Ungetch(c);
     }
 
-    f *= sign;
-
+    f *= theSign;
     return f;
 }
 
 wxString wxTextInputStream::ReadString()
 {
-  return ReadLine();
+    return ReadLine();
 }
 
 wxString wxTextInputStream::ReadLine()
@@ -231,13 +237,16 @@ wxString wxTextInputStream::ReadLine()
     wxChar c;
     wxString line;
 
-    for (;;)
+    while ( !m_input.Eof() )
     {
-        if (!m_input) break;
         c = m_input.GetC();
-	
-	if (EatEOL(c)) break;
-	
+        
+        if ( !m_input )
+            break;
+
+        if (EatEOL(c))
+            break;
+
         line += c;
     }
 
@@ -246,22 +255,31 @@ wxString wxTextInputStream::ReadLine()
 
 wxString wxTextInputStream::ReadWord()
 {
-    if (!m_input) return "";
-  
     wxString word;
-    wxChar c=NextNonSeparators();
-    if (c==(wxChar)0) return "";
 
-    for (;;)
-    {
-	if (m_separators.Contains(c)) break;
-	
-	if (EatEOL(c)) break;
-	
-        word += c;
+    if ( !m_input )
+        return word;
 
-	if (!m_input) break;
+    wxChar c = NextNonSeparators();
+    if ( !c )
+        return word;
+
+    word += c;
+    
+    while ( !m_input.Eof() )
+    {
         c = m_input.GetC();
+        
+        if (!m_input)
+            break;
+            
+        if (m_separators.Contains(c))
+            break;
+
+        if (EatEOL(c))
+            break;
+
+        word += c;
     }
 
     return word;
@@ -269,21 +287,23 @@ wxString wxTextInputStream::ReadWord()
 
 wxTextInputStream& wxTextInputStream::operator>>(wxString& word)
 {
-  word = ReadWord();
-  return *this;
+    word = ReadWord();
+    return *this;
 }
 
-wxTextInputStream& wxTextInputStream::operator>>(wxChar& c)
+wxTextInputStream& wxTextInputStream::operator>>(char& c)
 {
     if (!m_input)
     {
-        c = (wxChar) 0;
+        c = 0;
         return *this;
     }
 
     c = m_input.GetC();
 
-    if (EatEOL(c)) c=wxT('\n');
+    if (EatEOL(c))
+        c = '\n';
+
     return *this;
 }
 
@@ -343,7 +363,7 @@ wxTextOutputStream::~wxTextOutputStream()
 {
 }
 
-void wxTextOutputStream::SetMode( wxEOL mode = wxEOL_NATIVE )
+void wxTextOutputStream::SetMode(wxEOL mode)
 {
     m_mode = mode;
     if (m_mode == wxEOL_NATIVE)
@@ -397,19 +417,19 @@ void wxTextOutputStream::WriteString(const wxString& string)
         wxChar c = string[i];
         if (c == wxT('\n'))
         {
-	    if (m_mode == wxEOL_DOS)
-	    {
+            if (m_mode == wxEOL_DOS)
+            {
                  c = wxT('\r');
                  m_output.Write( (const void*)(&c), sizeof(wxChar) );
                  c = wxT('\n');
                  m_output.Write( (const void*)(&c), sizeof(wxChar) );
-	    } else 
-	    if (m_mode == wxEOL_MAC)
-	    {
+            } else
+            if (m_mode == wxEOL_MAC)
+            {
                  c = wxT('\r');
                  m_output.Write( (const void*)(&c), sizeof(wxChar) );
-	    } else
-	    {
+            } else
+            {
                  c = wxT('\n');
                  m_output.Write( (const void*)(&c), sizeof(wxChar) );
             }
@@ -433,9 +453,14 @@ wxTextOutputStream& wxTextOutputStream::operator<<(const wxString& string)
     return *this;
 }
 
-wxTextOutputStream& wxTextOutputStream::operator<<(wxChar c)
+wxTextOutputStream& wxTextOutputStream::operator<<(char c)
 {
-    WriteString( wxString(c) );
+    // these strange manipulations are needed in Unicode mode
+    char buf[2];
+    buf[0] = c;
+    buf[1] = 0;
+
+    WriteString( wxString(buf) );
     return *this;
 }
 
@@ -444,7 +469,7 @@ wxTextOutputStream& wxTextOutputStream::operator<<(wxInt16 c)
     wxString str;
     str.Printf(wxT("%d"), (signed int)c);
     WriteString(str);
-    
+
     return *this;
 }
 
@@ -453,7 +478,7 @@ wxTextOutputStream& wxTextOutputStream::operator<<(wxInt32 c)
     wxString str;
     str.Printf(wxT("%ld"), (signed long)c);
     WriteString(str);
-    
+
     return *this;
 }
 
@@ -462,7 +487,7 @@ wxTextOutputStream& wxTextOutputStream::operator<<(wxUint16 c)
     wxString str;
     str.Printf(wxT("%u"), (unsigned int)c);
     WriteString(str);
-    
+
     return *this;
 }