Stupid timeout bug fixed

[wxWidgets.git] / src / common / txtstrm.cpp

diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp
index 100e6ec68984b84062b13c32e41638f04b1094e6..4e8dae20acbba014b49e15bfe75bfe1a7a87177c 100644 (file)
--- a/src/common/txtstrm.cpp
+++ b/src/common/txtstrm.cpp
@@ -38,8 +38,8 @@
 // wxTextInputStream
 // ----------------------------------------------------------------------------
 
 // wxTextInputStream
 // ----------------------------------------------------------------------------
 

-wxTextInputStream::wxTextInputStream(wxInputStream& s)
-  : m_input(&s)
+wxTextInputStream::wxTextInputStream(wxInputStream &s, const wxString &sep)
+  : m_input(s), m_separators(sep)

 {
 }
 
 {
 }
 


@@ -47,58 +47,42 @@ wxTextInputStream::~wxTextInputStream()
 {
 }
 
 {
 }
 

-wxChar wxTextInputStream::NextNonWhiteSpace()
+wxChar wxTextInputStream::NextNonSeparators()

 {
     wxChar c = (wxChar) 0;
     for (;;)
     {
 {
     wxChar c = (wxChar) 0;
     for (;;)
     {

-        c = m_input->GetC();

        if (!m_input) return (wxChar) 0;
        if (!m_input) return (wxChar) 0;

+        c = m_input.GetC();

        
        

-       if (c != T('\n') &&
-           c != T('\r') &&
-           c != T('\t') &&
-           c != T(' '))
-       {
-           return c;
-       }
+       if (c != wxT('\n') && 
+           c != wxT('\r') &&
+           !m_separators.Contains(c)) 
+         return c;

     }
 
     }
 

-    // this shouldn't happen
-    return (wxChar) 0;

 }
 
 }
 

-void wxTextInputStream::SkipIfEndOfLine( wxChar c )
+inline bool wxTextInputStream::EatEOL(const wxChar &c)

 {
 {

-    if (c == T('\n'))
+  if (c == wxT('\n')) return TRUE; // eat on UNIX
+  
+  if (c == wxT('\r')) // eat on both Mac and DOS

     {
     {

-        // eat on UNIX
-       return;
+      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 (c == T('\r'))
-    {
-        // eat on both Mac and DOS
-       
-        wxChar c2 = m_input->GetC();
-        if (!m_input) return;
-       
-        if (c2 == T('\n'))
-        {
-           // eat on DOS
-           return;
-       }
-        else
-       {
-           // Don't eat on Mac
-            m_input->Ungetch( c2 );
-       }
-    }
-    else
-    {
-        // no line terminator
-        m_input->Ungetch( c );
-    }
+  return FALSE;
+}
+
+void wxTextInputStream::SkipIfEndOfLine( wxChar c )
+{
+    if (EatEOL(c)) return;
+    else m_input.Ungetch( c );  // no line terminator

 }
 
 wxUint32 wxTextInputStream::Read32()
 }
 
 wxUint32 wxTextInputStream::Read32()


@@ -107,25 +91,26 @@ wxUint32 wxTextInputStream::Read32()
     int sign;
     wxInt32 i;
 
     int sign;
     wxInt32 i;
 

-    int c = NextNonWhiteSpace();

     if (!m_input) return 0;
     if (!m_input) return 0;

+    int c = NextNonSeparators(); 
+    if (c==(wxChar)0) return 0;

 
     i = 0;
 
     i = 0;

-    if (! (c == T('-') || c == T('+') || isdigit(c)) )
+    if (! (c == wxT('-') || c == wxT('+') || isdigit(c)) )

     {
     {

-        m_input->Ungetch(c);
+        m_input.Ungetch(c);

         return 0;
     }
 
         return 0;
     }
 

-    if (c == T('-'))
+    if (c == wxT('-'))

     {
         sign = -1;
     {
         sign = -1;

-        c = m_input->GetC();
+        c = m_input.GetC();

     } else
     } else

-    if (c == T('+'))
+    if (c == wxT('+'))

     {
         sign = 1;
     {
         sign = 1;

-        c = m_input->GetC();
+        c = m_input.GetC();

     } else
     {
         sign = 1;
     } else
     {
         sign = 1;


@@ -133,8 +118,8 @@ wxUint32 wxTextInputStream::Read32()
 
     while (isdigit(c))
     {
 
     while (isdigit(c))
     {

-        i = i*10 + (c - (int)T('0'));
-        c = m_input->GetC();
+        i = i*10 + (c - (int)wxT('0'));
+        c = m_input.GetC();

     }
 
     SkipIfEndOfLine( c );
     }
 
     SkipIfEndOfLine( c );


@@ -160,25 +145,26 @@ double wxTextInputStream::ReadDouble()
     double f;
     int sign;
 
     double f;
     int sign;
 

-    int c = NextNonWhiteSpace();
-    if (!m_input) return 0.0;
+    if (!m_input) return 0;
+    int c = NextNonSeparators();
+    if (c==(wxChar)0) return 0;

 
     f = 0.0;
 
     f = 0.0;

-    if (! (c == T('.') || c == T('-') || c == T('+') || isdigit(c)) )
+    if (! (c == wxT('.') || c == wxT(',') || c == wxT('-') || c == wxT('+') || isdigit(c)) )

     {
     {

-        m_input->Ungetch(c);
+        m_input.Ungetch(c);

         return 0.0;
     }
 
         return 0.0;
     }
 

-    if (c == T('-'))
+    if (c == wxT('-'))

     {
         sign = -1;
     {
         sign = -1;

-        c = m_input->GetC();
+        c = m_input.GetC();

     } else
     } else

-    if (c == T('+'))
+    if (c == wxT('+'))

     {
         sign = 1;
     {
         sign = 1;

-        c = m_input->GetC();
+        c = m_input.GetC();

     }
     else
     {
     }
     else
     {


@@ -187,34 +173,34 @@ double wxTextInputStream::ReadDouble()
 
     while (isdigit(c))
     {
 
     while (isdigit(c))
     {

-        f = f*10 + (c - T('0'));
-        c = m_input->GetC();
+        f = f*10 + (c - wxT('0'));
+        c = m_input.GetC();

     }
 
     }
 

-    if (c == T('.'))
+    if (c == wxT('.') || c == wxT(','))

     {
         double f_multiplicator = (double) 0.1;
 
     {
         double f_multiplicator = (double) 0.1;
 

-        c = m_input->GetC();
+        c = m_input.GetC();

 
         while (isdigit(c))
        {
 
         while (isdigit(c))
        {

-            f += (c-T('0'))*f_multiplicator;
+            f += (c-wxT('0'))*f_multiplicator;

             f_multiplicator /= 10;
             f_multiplicator /= 10;

-            c = m_input->GetC();
+            c = m_input.GetC();

         }
 
         }
 

-        if (c == T('e'))
+        if (c == wxT('e'))

        {
             double f_multiplicator = 0.0;
             int i, e;
 
        {
             double f_multiplicator = 0.0;
             int i, e;
 

-            c = m_input->GetC();
+            c = m_input.GetC();

 
             switch (c)
            {
 
             switch (c)
            {

-                case T('-'): f_multiplicator = 0.1;  break;
-               case T('+'): f_multiplicator = 10.0; break;
+                case wxT('-'): f_multiplicator = 0.1;  break;
+               case wxT('+'): f_multiplicator = 10.0; break;

            }
 
             e = Read8();  // why only max 256 ?
            }
 
             e = Read8();  // why only max 256 ?


@@ -227,7 +213,7 @@ double wxTextInputStream::ReadDouble()
     }
     else
     {
     }
     else
     {

-        m_input->Ungetch(c);
+        m_input.Ungetch(c);

     }
 
     f *= sign;
     }
 
     f *= sign;


@@ -236,40 +222,21 @@ double wxTextInputStream::ReadDouble()
 }
 
 wxString wxTextInputStream::ReadString()
 }
 
 wxString wxTextInputStream::ReadString()

+{
+  return ReadLine();
+}
+
+wxString wxTextInputStream::ReadLine()

 {
     wxChar c;
     wxString line;
 
     for (;;)
     {
 {
     wxChar c;
     wxString line;
 
     for (;;)
     {

-        c = m_input->GetC();

         if (!m_input) break;
         if (!m_input) break;

+        c = m_input.GetC();

        
        

-        if (c == T('\n'))
-        {
-           // eat on UNIX
-           break;
-       }
-       
-        if (c == T('\r'))
-        {
-            // eat on both Mac and DOS
-       
-            wxChar c2 = m_input->GetC();
-           if (!m_input) break;
-       
-           if (c2 == T('\n'))
-            {
-               // eat on DOS
-               break;
-           }
-            else
-           {
-               // Don't eat on Mac
-                m_input->Ungetch( c2 );
-               break;
-           }
-        }
+       if (EatEOL(c)) break;

        
         line += c;
     }
        
         line += c;
     }


@@ -277,38 +244,46 @@ wxString wxTextInputStream::ReadString()
     return line;
 }
 
     return line;
 }
 

-wxTextInputStream& wxTextInputStream::operator>>(wxString& line)
+wxString wxTextInputStream::ReadWord()

 {
 {

-  line = ReadString();
+    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) break;
+        c = m_input.GetC();
+    }
+
+    return word;
+}
+
+wxTextInputStream& wxTextInputStream::operator>>(wxString& word)
+{
+  word = ReadWord();

   return *this;
 }
 
 wxTextInputStream& wxTextInputStream::operator>>(wxChar& c)
 {
   return *this;
 }
 
 wxTextInputStream& wxTextInputStream::operator>>(wxChar& c)
 {

-    wxChar c1 = m_input->GetC();

     if (!m_input)
     {
         c = (wxChar) 0;
         return *this;
     }
 
     if (!m_input)
     {
         c = (wxChar) 0;
         return *this;
     }
 

-    if (c1 == T('\r'))
-    {
-        c = T('\n');
-        wxChar c2 = m_input->GetC();
-       if (!m_input) return *this;
-       
-       if (c2 != T('\n'))
-       {
-           // we are on a Mac
-            m_input->Ungetch( c2 );
-       }
-    }
-    else
-    {
-        c = c1;
-    }
+    c = m_input.GetC();

 
 

+    if (EatEOL(c)) c=wxT('\n');

     return *this;
 }
 
     return *this;
 }
 


@@ -348,19 +323,45 @@ wxTextInputStream& wxTextInputStream::operator>>(float& f)
     return *this;
 }
 
     return *this;
 }
 

-wxTextOutputStream::wxTextOutputStream(wxOutputStream& s)
-  : m_output(&s)
+wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode)
+  : m_output(s)

 {
 {

+    m_mode = mode;
+    if (m_mode == wxEOL_NATIVE)
+    {
+#if defined(__WXMSW__) || defined(__WXPM__)
+        m_mode = wxEOL_DOS;
+#elif defined(__WXMAC__)
+        m_mode = wxEOL_MAC;
+#else
+        m_mode = wxEOL_UNIX;
+#endif
+    }

 }
 
 wxTextOutputStream::~wxTextOutputStream()
 {
 }
 
 }
 
 wxTextOutputStream::~wxTextOutputStream()
 {
 }
 

+void wxTextOutputStream::SetMode( wxEOL mode = wxEOL_NATIVE )
+{
+    m_mode = mode;
+    if (m_mode == wxEOL_NATIVE)
+    {
+#if defined(__WXMSW__) || defined(__WXPM__)
+        m_mode = wxEOL_DOS;
+#elif defined(__WXMAC__)
+        m_mode = wxEOL_MAC;
+#else
+        m_mode = wxEOL_UNIX;
+#endif
+    }
+}
+

 void wxTextOutputStream::Write32(wxUint32 i)
 {
     wxString str;
 void wxTextOutputStream::Write32(wxUint32 i)
 {
     wxString str;

-    str.Printf(T("%u"), i);
+    str.Printf(wxT("%u"), i);

 
     WriteString(str);
 }
 
     WriteString(str);
 }


@@ -368,7 +369,7 @@ void wxTextOutputStream::Write32(wxUint32 i)
 void wxTextOutputStream::Write16(wxUint16 i)
 {
     wxString str;
 void wxTextOutputStream::Write16(wxUint16 i)
 {
     wxString str;

-    str.Printf(T("%u"), i);
+    str.Printf(wxT("%u"), i);

 
     WriteString(str);
 }
 
     WriteString(str);
 }


@@ -376,7 +377,7 @@ void wxTextOutputStream::Write16(wxUint16 i)
 void wxTextOutputStream::Write8(wxUint8 i)
 {
     wxString str;
 void wxTextOutputStream::Write8(wxUint8 i)
 {
     wxString str;

-    str.Printf(T("%u"), i);
+    str.Printf(wxT("%u"), i);

 
     WriteString(str);
 }
 
     WriteString(str);
 }


@@ -385,7 +386,7 @@ void wxTextOutputStream::WriteDouble(double d)
 {
     wxString str;
 
 {
     wxString str;
 

-    str.Printf(T("%f"), d);
+    str.Printf(wxT("%f"), d);

     WriteString(str);
 }
 
     WriteString(str);
 }
 


@@ -394,31 +395,28 @@ void wxTextOutputStream::WriteString(const wxString& string)
     for (size_t i = 0; i < string.Len(); i++)
     {
         wxChar c = string[i];
     for (size_t i = 0; i < string.Len(); i++)
     {
         wxChar c = string[i];

-        if (c == T('\n'))
+        if (c == wxT('\n'))

         {
         {

-#if   defined(__WINDOWS__)
-            c = T('\r');
-            m_output->Write( (const void*)(&c), sizeof(wxChar) );
-            c = T('\n');
-            m_output->Write( (const void*)(&c), sizeof(wxChar) );
-#elif defined(__UNIX__)
-            c = T('\n');
-            m_output->Write( (const void*)(&c), sizeof(wxChar) );
-#elif defined(__WXMAC__)
-            c = T('\r');
-            m_output->Write( (const void*)(&c), sizeof(wxChar) );
-#elif   defined(__OS2__)
-            c = T('\r');
-            m_output->Write( (const void*)(&c), sizeof(wxChar) );
-            c = T('\n');
-            m_output->Write( (const void*)(&c), sizeof(wxChar) );
-#else
-            #error  "wxTextOutputStream: unsupported platform."
-#endif
+           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)
+           {
+                 c = wxT('\r');
+                 m_output.Write( (const void*)(&c), sizeof(wxChar) );
+           } else
+           {
+                 c = wxT('\n');
+                 m_output.Write( (const void*)(&c), sizeof(wxChar) );
+            }

         }
         else
         {
         }
         else
         {

-            m_output->Write( (const void*)(&c), sizeof(wxChar) );
+            m_output.Write( (const void*)(&c), sizeof(wxChar) );

         }
    }
 }
         }
    }
 }


@@ -443,25 +441,37 @@ wxTextOutputStream& wxTextOutputStream::operator<<(wxChar c)
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wxInt16 c)
 {
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wxInt16 c)
 {

-    Write16( (wxUint16)c );
+    wxString str;
+    str.Printf(wxT("%d"), (signed int)c);
+    WriteString(str);
+    

     return *this;
 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wxInt32 c)
 {
     return *this;
 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wxInt32 c)
 {

-    Write32( (wxUint32)c );
+    wxString str;
+    str.Printf(wxT("%ld"), (signed long)c);
+    WriteString(str);
+    

     return *this;
 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wxUint16 c)
 {
     return *this;
 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wxUint16 c)
 {

-    Write16(c);
+    wxString str;
+    str.Printf(wxT("%u"), (unsigned int)c);
+    WriteString(str);
+    

     return *this;
 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wxUint32 c)
 {
     return *this;
 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wxUint32 c)
 {

-    Write32(c);
+    wxString str;
+    str.Printf(wxT("%lu"), (unsigned long)c);
+    WriteString(str);
+

     return *this;
 }
 
     return *this;
 }
 


@@ -479,7 +489,7 @@ wxTextOutputStream& wxTextOutputStream::operator<<(float f)
 
 wxTextOutputStream &endl( wxTextOutputStream &stream )
 {
 
 wxTextOutputStream &endl( wxTextOutputStream &stream )
 {

-    return stream << T('\n');
+    return stream << wxT('\n');

 }
 
 #endif
 }
 
 #endif