Committing in .

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

diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp
index 2dfa95ff8f489b3b5dacf337ef2fbdf212dda230..8fd6ffaaaf8a28f732760c206d2cb32d9c591079 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 license

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


@@ -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,85 +47,72 @@ 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 != wxT('\n') &&
-           c != wxT('\r') &&
-           c != wxT('\t') &&
-           c != wxT(' '))
-       {
-           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 == wxT('\n'))
-    {
-        // eat on UNIX
-       return;
-    }
+    if (c == wxT('\n')) return TRUE; // eat on UNIX

 
 

-    if (c == wxT('\r'))
-    {
-        // eat on both Mac and DOS
-       
-        wxChar c2 = m_input->GetC();
-        if (!m_input) return;
-       
-        if (c2 == wxT('\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;
     if (! (c == wxT('-') || c == wxT('+') || isdigit(c)) )
     {
 
     i = 0;
     if (! (c == wxT('-') || c == wxT('+') || isdigit(c)) )
     {

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

         return 0;
     }
 
     if (c == wxT('-'))
     {
         sign = -1;
         return 0;
     }
 
     if (c == wxT('-'))
     {
         sign = -1;

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

     } else
     if (c == wxT('+'))
     {
         sign = 1;
     } else
     if (c == wxT('+'))
     {
         sign = 1;

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

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


@@ -134,7 +121,7 @@ wxUint32 wxTextInputStream::Read32()
     while (isdigit(c))
     {
         i = i*10 + (c - (int)wxT('0'));
     while (isdigit(c))
     {
         i = i*10 + (c - (int)wxT('0'));

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

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


@@ -156,158 +143,166 @@ 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;

 
 

-    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 == wxT('.') || c == wxT('-') || c == wxT('+') || 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 == wxT('-'))
     {
     }
 
     if (c == wxT('-'))
     {

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

     } else
     if (c == wxT('+'))
     {
     } else
     if (c == wxT('+'))
     {

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

     }
     else
     {
     }
     else
     {

-        sign = 1;
+        theSign = 1;

     }
 
     while (isdigit(c))
     {
         f = f*10 + (c - wxT('0'));
     }
 
     while (isdigit(c))
     {
         f = f*10 + (c - wxT('0'));

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

     }
 
     }
 

-    if (c == wxT('.'))
+    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-wxT('0'))*f_multiplicator;
             f_multiplicator /= 10;
             f += (c-wxT('0'))*f_multiplicator;
             f_multiplicator /= 10;

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

         }
 
         if (c == wxT('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 wxT('-'): f_multiplicator = 0.1;  break;
                 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;
         }
 
             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()

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

 {
     wxChar c;
     wxString line;
 
 {
     wxChar c;
     wxString line;
 

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

     {
     {

-        c = m_input->GetC();
-        if (!m_input) break;
-       
-        if (c == wxT('\n'))
-        {
-           // eat on UNIX
-           break;
-       }
-       
-        if (c == wxT('\r'))
-        {
-            // eat on both Mac and DOS
-       
-            wxChar c2 = m_input->GetC();
-           if (!m_input) break;
-       
-           if (c2 == wxT('\n'))
-            {
-               // eat on DOS
-               break;
-           }
-            else
-           {
-               // Don't eat on Mac
-                m_input->Ungetch( c2 );
-               break;
-           }
-        }
-       
+        c = m_input.GetC();
+        
+        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>>(wxString& word)
+{
+    word = ReadWord();
+    return *this;

 }
 
 }
 

-wxTextInputStream& wxTextInputStream::operator>>(wxChar& c)
+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 == wxT('\r'))
-    {
-        c = wxT('\n');
-        wxChar c2 = m_input->GetC();
-       if (!m_input) return *this;
-       
-       if (c2 != wxT('\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,15 +343,41 @@ 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)
+{
+    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;


@@ -396,29 +417,26 @@ void wxTextOutputStream::WriteString(const wxString& string)
         wxChar c = string[i];
         if (c == wxT('\n'))
         {
         wxChar c = string[i];
         if (c == wxT('\n'))
         {

-#if   defined(__WINDOWS__)
-            c = wxT('\r');
-            m_output->Write( (const void*)(&c), sizeof(wxChar) );
-            c = wxT('\n');
-            m_output->Write( (const void*)(&c), sizeof(wxChar) );
-#elif defined(__UNIX__)
-            c = wxT('\n');
-            m_output->Write( (const void*)(&c), sizeof(wxChar) );
-#elif defined(__WXMAC__)
-            c = wxT('\r');
-            m_output->Write( (const void*)(&c), sizeof(wxChar) );
-#elif   defined(__OS2__)
-            c = wxT('\r');
-            m_output->Write( (const void*)(&c), sizeof(wxChar) );
-            c = wxT('\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) );

         }
    }
 }
         }
    }
 }


@@ -435,33 +453,50 @@ wxTextOutputStream& wxTextOutputStream::operator<<(const wxString& string)
     return *this;
 }
 
     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;
 }
 
 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;
 }