Updated configure (not only configure.in)

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

diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp
index e0acaeb66c9bf62235eba8c9117a5fa6d46e593b..100e6ec68984b84062b13c32e41638f04b1094e6 100644 (file)
--- a/src/common/txtstrm.cpp
+++ b/src/common/txtstrm.cpp
@@ -1,11 +1,11 @@
-/////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////

 // Name:        txtstrm.cpp
 // Purpose:     Text stream classes
 // Author:      Guilhem Lavaux
 // Modified by:
 // Created:     28/06/98
 // RCS-ID:      $Id$
 // Name:        txtstrm.cpp
 // Purpose:     Text stream classes
 // Author:      Guilhem Lavaux
 // Modified by:
 // Created:     28/06/98
 // RCS-ID:      $Id$

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

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


@@ -25,6 +25,19 @@
 #include "wx/txtstrm.h"
 #include <ctype.h>
 
 #include "wx/txtstrm.h"
 #include <ctype.h>
 

+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// Unix: "\n"
+// Dos:  "\r\n"
+// Mac:  "\r"
+
+// ----------------------------------------------------------------------------
+// wxTextInputStream
+// ----------------------------------------------------------------------------
+

 wxTextInputStream::wxTextInputStream(wxInputStream& s)
   : m_input(&s)
 {
 wxTextInputStream::wxTextInputStream(wxInputStream& s)
   : m_input(&s)
 {


@@ -34,156 +47,236 @@ wxTextInputStream::~wxTextInputStream()
 {
 }
 
 {
 }
 

+wxChar wxTextInputStream::NextNonWhiteSpace()
+{
+    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;
+       }
+    }
+
+    // this shouldn't happen
+    return (wxChar) 0;
+}
+
+void wxTextInputStream::SkipIfEndOfLine( 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
+    {
+        // no line terminator
+        m_input->Ungetch( c );
+    }
+}
+

 wxUint32 wxTextInputStream::Read32()
 {
 wxUint32 wxTextInputStream::Read32()
 {

-  /* I only implemented a simple integer parser */
-  int c; 
-  int sign;
-  wxInt32 i;
+    /* I only implemented a simple integer parser */
+    int sign;
+    wxInt32 i;

 
 

-  while (isspace( c = m_input->GetC() ) )
-     /* Do nothing */ ;
+    int c = NextNonWhiteSpace();
+    if (!m_input) return 0;

 
 

-  i = 0;
-  if (! (c == '-' || isdigit(c)) ) {
-    m_input->Ungetch(c);
-    return 0;
-  }
+    i = 0;
+    if (! (c == T('-') || c == T('+') || isdigit(c)) )
+    {
+        m_input->Ungetch(c);
+        return 0;
+    }

 
 

-  if (c == '-') {
-    sign = -1;
-    c = m_input->GetC();
-  } else if (c == '+') {
-    sign = 1;
-    c = m_input->GetC();
-  } else {
-    sign = 1;
-  }
+    if (c == T('-'))
+    {
+        sign = -1;
+        c = m_input->GetC();
+    } else
+    if (c == T('+'))
+    {
+        sign = 1;
+        c = m_input->GetC();
+    } else
+    {
+        sign = 1;
+    }

 
 

-  while (isdigit(c)) {
-    i = i*10 + (c - (int)'0');
-    c = m_input->GetC();
-  }
+    while (isdigit(c))
+    {
+        i = i*10 + (c - (int)T('0'));
+        c = m_input->GetC();
+    }

 
 

-  if (c != '\n' && c != '\r')
-    m_input->Ungetch(c);
+    SkipIfEndOfLine( c );

 
 

-  i *= sign;
+    i *= sign;

 
 

-  return (wxUint32)i;
+    return (wxUint32)i;

 }
 
 wxUint16 wxTextInputStream::Read16()
 {
 }
 
 wxUint16 wxTextInputStream::Read16()
 {

-  return (wxUint16)Read32();
+    return (wxUint16)Read32();

 }
 
 wxUint8 wxTextInputStream::Read8()
 {
 }
 
 wxUint8 wxTextInputStream::Read8()
 {

-  return (wxUint8)Read32();
+    return (wxUint8)Read32();

 }
 
 double wxTextInputStream::ReadDouble()
 {
 }
 
 double wxTextInputStream::ReadDouble()
 {

-  /* I only implemented a simple float parser */
-  double f;
-  int c, sign;
-
-  while (isspace( c = m_input->GetC() ) || c == '\n' || c == '\r')
-     /* Do nothing */ ;
-
-  f = 0.0;
-  if (! (c == '-' || isdigit(c)) ) {
-    m_input->Ungetch(c);
-    return 0.0;
-  }
-
-  if (c == '-') {
-    sign = -1;
-    c = m_input->GetC();
-  } else if (c == '+') {
-    sign = 1;
-    c = m_input->GetC();
-  } else {
-    sign = 1;
-  }
-
-  while (isdigit(c)) {
-    f = f*10 + (c - '0');
-    c = m_input->GetC();
-  }
-
-  if (c == '.') {
-    double f_multiplicator = (double) 0.1;
-
-    c = m_input->GetC();
-
-    while (isdigit(c)) {
-      f += (c-'0')*f_multiplicator;
-      f_multiplicator /= 10;
-      c = m_input->GetC();
+    /* I only implemented a simple float parser */
+    double f;
+    int sign;
+
+    int c = NextNonWhiteSpace();
+    if (!m_input) return 0.0;
+
+    f = 0.0;
+    if (! (c == T('.') || c == T('-') || c == T('+') || isdigit(c)) )
+    {
+        m_input->Ungetch(c);
+        return 0.0;
+    }
+
+    if (c == T('-'))
+    {
+        sign = -1;
+        c = m_input->GetC();
+    } else
+    if (c == T('+'))
+    {
+        sign = 1;
+        c = m_input->GetC();
+    }
+    else
+    {
+        sign = 1;
+    }
+
+    while (isdigit(c))
+    {
+        f = f*10 + (c - T('0'));
+        c = m_input->GetC();

     }
 
     }
 

-    if (c == 'e') {
-      double f_multiplicator = 0.0;
-      int i, e;
+    if (c == T('.'))
+    {
+        double f_multiplicator = (double) 0.1;

 
 

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

 
 

-      switch(c) {
-      case '-':
-        f_multiplicator = 0.1;
-        break;
-      case '+':
-        f_multiplicator = 10.0;
-        break;
-      }
+        while (isdigit(c))
+       {
+            f += (c-T('0'))*f_multiplicator;
+            f_multiplicator /= 10;
+            c = m_input->GetC();
+        }

 
 

-      e = Read8();
+        if (c == T('e'))
+       {
+            double f_multiplicator = 0.0;
+            int i, e;

 
 

-      for (i=0;i<e;i++)
-        f *= f_multiplicator;
-    } else if (c != '\n' && c != '\r')
-      m_input->Ungetch(c);
- 
-  }
+            c = m_input->GetC();

 
 

-  f *= sign;
+            switch (c)
+           {
+                case T('-'): f_multiplicator = 0.1;  break;
+               case T('+'): f_multiplicator = 10.0; break;
+           }

 
 

-  return f;
+            e = Read8();  // why only max 256 ?
+
+            for (i=0;i<e;i++)
+                f *= f_multiplicator;
+        }
+       else
+           SkipIfEndOfLine( c );
+    }
+    else
+    {
+        m_input->Ungetch(c);
+    }
+
+    f *= sign;
+
+    return f;

 }
 
 wxString wxTextInputStream::ReadString()
 {
 }
 
 wxString wxTextInputStream::ReadString()
 {

-  char c, last_endl = 0;
-  bool end_line = FALSE;
-  wxString line;
-
-  while (!end_line) {
-    c = m_input->GetC();
-    if (m_input->LastError() != wxStream_NOERROR)
-      break;
-
-    switch (c) {
-    case '\n':
-      end_line = TRUE;
-      break;
-    case '\r':
-      last_endl = '\r';
-      break;
-    default:
-      if (last_endl == '\r') {
-        end_line = TRUE;
-        m_input->Ungetch(c);
-        break;
-      }
-      line += c;
-      break;
-    } 
-  }
-  return line;
-}
-  
+    wxChar c;
+    wxString line;
+
+    for (;;)
+    {
+        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;
+           }
+        }
+       
+        line += c;
+    }
+
+    return line;
+}
+

 wxTextInputStream& wxTextInputStream::operator>>(wxString& line)
 {
   line = ReadString();
 wxTextInputStream& wxTextInputStream::operator>>(wxString& line)
 {
   line = ReadString();


@@ -192,47 +285,67 @@ wxTextInputStream& wxTextInputStream::operator>>(wxString& line)
 
 wxTextInputStream& wxTextInputStream::operator>>(wxChar& c)
 {
 
 wxTextInputStream& wxTextInputStream::operator>>(wxChar& c)
 {

-  // TODO
-/*
-  m_input->Read(&c, sizeof(wxChar));
-*/
-  return *this;
+    wxChar c1 = m_input->GetC();
+    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;
+    }
+
+    return *this;

 }
 
 wxTextInputStream& wxTextInputStream::operator>>(wxInt16& i)
 {
 }
 
 wxTextInputStream& wxTextInputStream::operator>>(wxInt16& i)
 {

-  i = (wxInt16)Read16();
-  return *this;
+    i = (wxInt16)Read16();
+    return *this;

 }
 
 wxTextInputStream& wxTextInputStream::operator>>(wxInt32& i)
 {
 }
 
 wxTextInputStream& wxTextInputStream::operator>>(wxInt32& i)
 {

-  i = (wxInt32)Read32();
-  return *this;
+    i = (wxInt32)Read32();
+    return *this;

 }
 
 wxTextInputStream& wxTextInputStream::operator>>(wxUint16& i)
 {
 }
 
 wxTextInputStream& wxTextInputStream::operator>>(wxUint16& i)
 {

-  i = Read16();
-  return *this;
+    i = Read16();
+    return *this;

 }
 
 wxTextInputStream& wxTextInputStream::operator>>(wxUint32& i)
 {
 }
 
 wxTextInputStream& wxTextInputStream::operator>>(wxUint32& i)
 {

-  i = Read32();
-  return *this;
+    i = Read32();
+    return *this;

 }
 
 wxTextInputStream& wxTextInputStream::operator>>(double& i)
 {
 }
 
 wxTextInputStream& wxTextInputStream::operator>>(double& i)
 {

-  i = ReadDouble();
-  return *this;
+    i = ReadDouble();
+    return *this;

 }
 
 wxTextInputStream& wxTextInputStream::operator>>(float& f)
 {
 }
 
 wxTextInputStream& wxTextInputStream::operator>>(float& f)
 {

-  f = (float)ReadDouble();
-  return *this;
+    f = (float)ReadDouble();
+    return *this;

 }
 
 wxTextOutputStream::wxTextOutputStream(wxOutputStream& s)
 }
 
 wxTextOutputStream::wxTextOutputStream(wxOutputStream& s)


@@ -246,100 +359,127 @@ wxTextOutputStream::~wxTextOutputStream()
 
 void wxTextOutputStream::Write32(wxUint32 i)
 {
 
 void wxTextOutputStream::Write32(wxUint32 i)
 {

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

 
 

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

 }
 
 void wxTextOutputStream::Write16(wxUint16 i)
 {
 }
 
 void wxTextOutputStream::Write16(wxUint16 i)
 {

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

 
 

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

 }
 
 void wxTextOutputStream::Write8(wxUint8 i)
 {
 }
 
 void wxTextOutputStream::Write8(wxUint8 i)
 {

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

 
 

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

 }
 
 void wxTextOutputStream::WriteDouble(double d)
 {
 }
 
 void wxTextOutputStream::WriteDouble(double d)
 {

-  wxString str;
+    wxString str;

 
 

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

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

-#if wxUSE_UNICODE
-  const wxWX2MBbuf buf = string.mb_str();
-  m_output->Write(buf, string.Len());
+    for (size_t i = 0; i < string.Len(); i++)
+    {
+        wxChar c = string[i];
+        if (c == T('\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
 #else

-  m_output->Write(string, string.Len());
+            #error  "wxTextOutputStream: unsupported platform."

 #endif
 #endif

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

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

-  WriteString(wxString(string));
-  return *this;
+    WriteString( wxString(string) );
+    return *this;

 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(const wxString& string)
 {
 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(const wxString& string)
 {

-  WriteString(string);
-  return *this;
+    WriteString( string );
+    return *this;

 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wxChar c)
 {
 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wxChar c)
 {

-  wxString tmp_str;
-  tmp_str.Printf(_T("%c"), c);
-  WriteString(tmp_str);
-  return *this;
+    WriteString( wxString(c) );
+    return *this;

 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wxInt16 c)
 {
 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wxInt16 c)
 {

-  Write16((wxUint16)c);
-  return *this;
+    Write16( (wxUint16)c );
+    return *this;

 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wxInt32 c)
 {
 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wxInt32 c)
 {

-  Write32((wxUint32)c);
-  return *this;
+    Write32( (wxUint32)c );
+    return *this;

 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wxUint16 c)
 {
 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wxUint16 c)
 {

-  Write16(c);
-  return *this;
+    Write16(c);
+    return *this;

 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wxUint32 c)
 {
 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wxUint32 c)
 {

-  Write32(c);
-  return *this;
+    Write32(c);
+    return *this;

 }
 
 wxTextOutputStream &wxTextOutputStream::operator<<(double f)
 {
 }
 
 wxTextOutputStream &wxTextOutputStream::operator<<(double f)
 {

-  WriteDouble(f);
-  return *this;
+    WriteDouble(f);
+    return *this;

 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(float f)
 {
 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(float f)
 {

-  WriteDouble((double)f);
-  return *this;
+    WriteDouble((double)f);
+    return *this;
+}
+
+wxTextOutputStream &endl( wxTextOutputStream &stream )
+{
+    return stream << T('\n');

 }
 
 #endif
 }
 
 #endif