removed some stray MSW code

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

diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp
index 100e6ec68984b84062b13c32e41638f04b1094e6..032474919c8427c224ac1885e7b469088007d56f 100644 (file)
--- 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
 // Created:     28/06/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux

-// Licence:    wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -38,94 +38,88 @@
 // wxTextInputStream
 // ----------------------------------------------------------------------------
 
 // wxTextInputStream
 // ----------------------------------------------------------------------------
 

-wxTextInputStream::wxTextInputStream(wxInputStream& s)
-  : m_input(&s)
+#if wxUSE_UNICODE
+wxTextInputStream::wxTextInputStream(wxInputStream &s, const wxString &sep, wxMBConv& conv)
+  : m_input(s), m_separators(sep), m_conv(conv)

 {
 }
 {
 }

+#else
+wxTextInputStream::wxTextInputStream(wxInputStream &s, const wxString &sep)
+  : m_input(s), m_separators(sep)
+{
+}
+#endif

 
 wxTextInputStream::~wxTextInputStream()
 {
 }
 
 
 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 (c != T('\n') &&
-           c != T('\r') &&
-           c != T('\t') &&
-           c != T(' '))
-       {
-           return c;
-       }
+        if (!m_input) return (wxChar) 0;
+        c = m_input.GetC();
+
+        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 )
+bool wxTextInputStream::EatEOL(const wxChar &c)

 {
 {

-    if (c == T('\n'))
-    {
-        // eat on UNIX
-       return;
-    }
+    if (c == wxT('\n')) return TRUE; // eat on UNIX

 
 

-    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
+    if (c == wxT('\r')) // eat on both Mac and DOS

     {
     {

-        // no line terminator
-        m_input->Ungetch( c );
+        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;
+}
+
+void wxTextInputStream::SkipIfEndOfLine( wxChar c )
+{
+    if (EatEOL(c)) return;
+    else m_input.Ungetch( c );  // no line terminator

 }
 
 wxUint32 wxTextInputStream::Read32()
 {
     /* I only implemented a simple integer parser */
 }
 
 wxUint32 wxTextInputStream::Read32()
 {
     /* I only implemented a simple integer parser */

+    // VZ: what about using strtol()?? (TODO)
+

     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 +127,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 );


@@ -156,158 +150,177 @@ wxUint8 wxTextInputStream::Read8()
 
 double wxTextInputStream::ReadDouble()
 {
 
 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;
     double f;

-    int sign;
+    int theSign;
+
+    if (!m_input)
+        return 0;

 
 

-    int c = NextNonWhiteSpace();
-    if (!m_input) return 0.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);
-        return 0.0;
+        m_input.Ungetch(c);
+        return 0;

     }
 
     }
 

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

     {
     {

-        sign = -1;
-        c = m_input->GetC();
+        theSign = -1;
+        c = m_input.GetC();

     } else
     } else

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

     {
     {

-        sign = 1;
-        c = m_input->GetC();
+        theSign = 1;
+        c = m_input.GetC();

     }
     else
     {
     }
     else
     {

-        sign = 1;
+        theSign = 1;

     }
 
     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 ?
 
             for (i=0;i<e;i++)
                 f *= f_multiplicator;
         }
 
             e = Read8();  // why only max 256 ?
 
             for (i=0;i<e;i++)
                 f *= f_multiplicator;
         }

-       else
-           SkipIfEndOfLine( c );
+        else
+            SkipIfEndOfLine( c );

     }
     else
     {
     }
     else
     {

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

     }
 
     }
 

-    f *= sign;
-
+    f *= theSign;

     return f;
 }
 
 wxString wxTextInputStream::ReadString()
 {
     return f;
 }
 
 wxString wxTextInputStream::ReadString()
 {

-    wxChar c;
+    return ReadLine();
+}
+
+wxString wxTextInputStream::ReadLine()
+{

     wxString line;
 
     wxString line;
 

-    for (;;)
+    while ( !m_input.Eof() )

     {
     {

-        c = m_input->GetC();
-        if (!m_input) break;
-       
-        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 wxUSE_UNICODE
+        // FIXME: this is only works for single byte encodings
+        // How-to read a single char in an unkown encoding???
+        char buf[10];
+        buf[0] = m_input.GetC();
+        buf[1] = 0;
+        
+        wxChar wbuf[2];
+        m_conv.MB2WC( wbuf, buf, 2 );
+        wxChar c = wbuf[0];
+#else
+        char c = m_input.GetC();
+#endif
+        
+        if ( !m_input )
+            break;
+
+        if (EatEOL(c))
+            break;
+

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

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

 {
 {

-  line = ReadString();
-  return *this;
+    wxString word;
+
+    if ( !m_input )
+        return word;
+
+    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;

 }
 
 }
 

-wxTextInputStream& wxTextInputStream::operator>>(wxChar& c)
+wxTextInputStream& wxTextInputStream::operator>>(wxString& word)
+{
+    word = ReadWord();
+    return *this;
+}
+
+wxTextInputStream& wxTextInputStream::operator>>(char& c)

 {
 {

-    wxChar c1 = m_input->GetC();

     if (!m_input)
     {
     if (!m_input)
     {

-        c = (wxChar) 0;
+        c = 0;

         return *this;
     }
 
         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 = '\n';

 
     return *this;
 }
 
     return *this;
 }


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

-wxTextOutputStream::wxTextOutputStream(wxOutputStream& s)
-  : m_output(&s)
+
+
+#if wxUSE_UNICODE
+wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode, wxMBConv& conv)
+  : m_output(s), m_conv(conv)
+#else
+wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode)
+  : m_output(s)
+#endif

 {
 {

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

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

+void wxTextOutputStream::SetMode(wxEOL mode)
+{
+    m_mode = mode;
+    if (m_mode == wxEOL_NATIVE)
+    {
+#if defined(__WXMSW__) || defined(__WXPM__)
+        m_mode = wxEOL_DOS;
+#elif defined(__WXMAC__) && !defined(__DARWIN__)
+        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 +414,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 +422,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,42 +431,52 @@ void wxTextOutputStream::WriteDouble(double d)
 {
     wxString str;
 
 {
     wxString str;
 

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

     WriteString(str);
 }
 
 void wxTextOutputStream::WriteString(const wxString& string)
 {
     WriteString(str);
 }
 
 void wxTextOutputStream::WriteString(const wxString& string)
 {

-    for (size_t i = 0; i < string.Len(); i++)
+    size_t len = string.length();
+
+    wxString out;
+    out.reserve(len);
+
+    for ( size_t i = 0; i < len; i++ )

     {
     {

-        wxChar c = string[i];
-        if (c == T('\n'))
+        const wxChar c = string[i];
+        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
-        }
-        else
-        {
-            m_output->Write( (const void*)(&c), sizeof(wxChar) );
+            switch ( m_mode )
+            {
+                case wxEOL_DOS:
+                    out << _T("\r\n");
+                    continue;
+
+                case wxEOL_MAC:
+                    out << _T('\r');
+                    continue;
+
+                default:
+                    wxFAIL_MSG( _T("unknown EOL mode in wxTextOutputStream") );
+                    // fall through
+
+                case wxEOL_UNIX:
+                    // don't treat '\n' specially
+                    ;
+            }

         }
         }

+
+        out << c;

    }
    }

+
+    // We must not write the trailing NULL here
+#if wxUSE_UNICODE
+    wxCharBuffer buffer = m_conv.cWC2MB( out );
+    m_output.Write( (const char*) buffer, strlen( (const char*) buffer ) );
+#else
+    m_output.Write(out.c_str(), out.length() );
+#endif

 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(const wxChar *string)
 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(const wxChar *string)


@@ -435,33 +491,46 @@ wxTextOutputStream& wxTextOutputStream::operator<<(const wxString& string)
     return *this;
 }
 
     return *this;
 }
 

-wxTextOutputStream& wxTextOutputStream::operator<<(wxChar c)
+wxTextOutputStream& wxTextOutputStream::operator<<(char c)

 {
 {

-    WriteString( wxString(c) );
+    WriteString( wxString::FromAscii(c) );
+    

     return *this;
 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wxInt16 c)
 {
     return *this;
 }
 
 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 +548,7 @@ wxTextOutputStream& wxTextOutputStream::operator<<(float f)
 
 wxTextOutputStream &endl( wxTextOutputStream &stream )
 {
 
 wxTextOutputStream &endl( wxTextOutputStream &stream )
 {

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

 }
 
 #endif
 }
 
 #endif