VTK wrapper of vtkRenderWindow for wxPython. Tested on MSW so far.

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

diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp
index e4d260bcf19c43cf444c16dae43f45bdd6ee4661..2c628cf3d6b81b93c9de50759f1a125378178765 100644 (file)
--- a/src/common/txtstrm.cpp
+++ b/src/common/txtstrm.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     28/06/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     28/06/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Guilhem Lavaux 
+// Copyright:   (c) Guilhem Lavaux

 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 


@@ -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,44 @@ 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;
 }
 
     // this shouldn't happen
     return (wxChar) 0;
 }
 

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

 {
 {

-    if (c == _T('\n'))
-    { 
-        // eat on UNIX
-       return;
-    }
-    
-    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('\n')) return TRUE; // eat on UNIX
+  
+  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()
 }
 
 wxUint32 wxTextInputStream::Read32()


@@ -106,35 +92,36 @@ wxUint32 wxTextInputStream::Read32()
     /* I only implemented a simple integer parser */
     int sign;
     wxInt32 i;
     /* I only implemented a simple integer parser */
     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();
-    } else 
-    if (c == _T('+')) 
+        c = m_input.GetC();
+    } else
+    if (c == wxT('+'))

     {
         sign = 1;
     {
         sign = 1;

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

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

-    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,74 +147,75 @@ 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('+') || 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();
-    } else 
-    if (c == _T('+')) 
+        c = m_input.GetC();
+    } else
+    if (c == wxT('+'))

     {
         sign = 1;
     {
         sign = 1;

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

     {
         sign = 1;
     }
 
     {
         sign = 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('.'))

     {
         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
     {
        else
            SkipIfEndOfLine( c );
     }
     else
     {

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

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


@@ -236,79 +224,68 @@ double wxTextInputStream::ReadDouble()
 }
 
 wxString wxTextInputStream::ReadString()
 }
 
 wxString wxTextInputStream::ReadString()

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

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

-    for (;;) 
+    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;
     }

-    
+

     return line;
 }
     return line;
 }

+
+wxString wxTextInputStream::ReadWord()
+{
+    if (!m_input) return "";

   
   

-wxTextInputStream& wxTextInputStream::operator>>(wxString& line)
+    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)

 {
 {

-  line = ReadString();
+  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;
 }
 


@@ -349,7 +326,7 @@ wxTextInputStream& wxTextInputStream::operator>>(float& f)
 }
 
 wxTextOutputStream::wxTextOutputStream(wxOutputStream& s)
 }
 
 wxTextOutputStream::wxTextOutputStream(wxOutputStream& s)

-  : m_output(&s)
+  : m_output(s)

 {
 }
 
 {
 }
 


@@ -360,24 +337,24 @@ wxTextOutputStream::~wxTextOutputStream()
 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);
 }
 
 void wxTextOutputStream::Write16(wxUint16 i)
 {
     wxString str;
     WriteString(str);
 }
 
 void wxTextOutputStream::Write16(wxUint16 i)
 {
     wxString str;

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

     WriteString(str);
 }
 
 void wxTextOutputStream::Write8(wxUint8 i)
 {
     wxString str;
     WriteString(str);
 }
 
 void wxTextOutputStream::Write8(wxUint8 i)
 {
     wxString str;

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

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


@@ -385,7 +362,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,26 +371,31 @@ 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__)
         {
 #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) );
+            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__)
 #elif defined(__UNIX__)

-            c = _T('\n');
-            m_output->Write( (const void*)(&c), sizeof(wxChar) );
+            c = wxT('\n');
+            m_output.Write( (const void*)(&c), sizeof(wxChar) );

 #elif defined(__WXMAC__)
 #elif defined(__WXMAC__)

-            c = _T('\r');
-            m_output->Write( (const void*)(&c), sizeof(wxChar) );
+            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
         }
         else
         {
 #else
             #error  "wxTextOutputStream: unsupported platform."
 #endif
         }
         else
         {

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

         }
    }
 }
         }
    }
 }


@@ -472,5 +454,10 @@ wxTextOutputStream& wxTextOutputStream::operator<<(float f)
     return *this;
 }
 
     return *this;
 }
 

+wxTextOutputStream &endl( wxTextOutputStream &stream )
+{
+    return stream << wxT('\n');
+}
+

 #endif
   // wxUSE_STREAMS
 #endif
   // wxUSE_STREAMS