mac methodname fixed, so all use the same now

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

diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp
index cd0300b42df8532acd16b8fba338a9cd309ee2f1..d2e08f5c8ffbe5f53cb707397a82af18739c7059 100644 (file)
--- a/src/common/txtstrm.cpp
+++ b/src/common/txtstrm.cpp
@@ -1,18 +1,14 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        txtstrm.cpp
+// Name:        src/common/txtstrm.cpp

 // Purpose:     Text stream classes
 // Author:      Guilhem Lavaux
 // Modified by:
 // Created:     28/06/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
 // Purpose:     Text stream classes
 // Author:      Guilhem Lavaux
 // Modified by:
 // Created:     28/06/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux

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

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "txtstrm.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -38,206 +34,172 @@
 // wxTextInputStream
 // ----------------------------------------------------------------------------
 
 // wxTextInputStream
 // ----------------------------------------------------------------------------
 

+#if wxUSE_UNICODE
+wxTextInputStream::wxTextInputStream(wxInputStream &s,
+                                     const wxString &sep,
+                                     const wxMBConv& conv)
+  : m_input(s), m_separators(sep), m_conv(conv.Clone())
+{
+    memset((void*)m_lastBytes, 0, 10);
+}
+#else

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

+    memset((void*)m_lastBytes, 0, 10);

 }
 }

+#endif

 
 wxTextInputStream::~wxTextInputStream()
 {
 
 wxTextInputStream::~wxTextInputStream()
 {

+#if wxUSE_UNICODE
+    delete m_conv;
+#endif // wxUSE_UNICODE

 }
 
 }
 

-wxChar wxTextInputStream::NextNonSeparators()
+void wxTextInputStream::UngetLast()

 {
 {

-    wxChar c = (wxChar) 0;
-    for (;;)
-    {
-       if (!m_input) return (wxChar) 0;
-        c = m_input.GetC();
-       
-       if (c != wxT('\n') && 
-           c != wxT('\r') &&
-           !m_separators.Contains(c)) 
-         return c;
-    }
-
+    size_t byteCount = 0;
+    while(m_lastBytes[byteCount]) // pseudo ANSI strlen (even for Unicode!)
+        byteCount++;
+    m_input.Ungetch(m_lastBytes, byteCount);
+    memset((void*)m_lastBytes, 0, 10);

 }
 
 }
 

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

 {
 {

-  if (c == wxT('\n')) return TRUE; // eat on UNIX
-  
-  if (c == wxT('\r')) // eat on both Mac and DOS
+#if wxUSE_UNICODE
+    wxChar wbuf[2];
+    memset((void*)m_lastBytes, 0, 10);
+    for(size_t inlen = 0; inlen < 9; inlen++)

     {
     {

-      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;
+        // actually read the next character
+        m_lastBytes[inlen] = m_input.GetC();
+
+        if(m_input.LastRead() <= 0)
+            return wxEOT;
+
+        if ( m_conv->ToWChar(wbuf, WXSIZEOF(wbuf), m_lastBytes, inlen + 1)
+                != wxCONV_FAILED )
+            return wbuf[0];

     }
     }

+    // there should be no encoding which requires more than nine bytes for one character...
+    return wxEOT;
+#else
+    m_lastBytes[0] = m_input.GetC();

 
 

-  return FALSE;
-}
+    if(m_input.LastRead() <= 0)
+        return wxEOT;
+
+    return m_lastBytes[0];
+#endif

 
 

-void wxTextInputStream::SkipIfEndOfLine( wxChar c )
-{
-    if (EatEOL(c)) return;
-    else m_input.Ungetch( c );  // no line terminator

 }
 
 }
 

-wxUint32 wxTextInputStream::Read32()
+wxChar wxTextInputStream::NextNonSeparators()

 {
 {

-    /* I only implemented a simple integer parser */
-    int sign;
-    wxInt32 i;
-
-    if (!m_input) return 0;
-    int c = NextNonSeparators(); 
-    if (c==(wxChar)0) return 0;
-
-    i = 0;
-    if (! (c == wxT('-') || c == wxT('+') || isdigit(c)) )
+    for (;;)

     {
     {

-        m_input.Ungetch(c);
-        return 0;
-    }
+        wxChar c = NextChar();
+        if (c == wxEOT) return (wxChar) 0;

 
 

-    if (c == wxT('-'))
-    {
-        sign = -1;
-        c = m_input.GetC();
-    } else
-    if (c == wxT('+'))
-    {
-        sign = 1;
-        c = m_input.GetC();
-    } else
-    {
-        sign = 1;
+        if (c != wxT('\n') &&
+            c != wxT('\r') &&
+            !m_separators.Contains(c))
+          return c;

     }
 
     }
 

-    while (isdigit(c))
+}
+
+bool wxTextInputStream::EatEOL(const wxChar &c)
+{
+    if (c == wxT('\n')) return true; // eat on UNIX
+
+    if (c == wxT('\r')) // eat on both Mac and DOS

     {
     {

-        i = i*10 + (c - (int)wxT('0'));
-        c = m_input.GetC();
+        wxChar c2 = NextChar();
+        if(c2 == wxEOT) return true; // end of stream reached, had enough :-)
+
+        if (c2 != wxT('\n')) UngetLast(); // Don't eat on Mac
+        return true;

     }
 
     }
 

-    SkipIfEndOfLine( c );
+    return false;
+}

 
 

-    i *= sign;
+wxUint32 wxTextInputStream::Read32(int base)
+{
+    wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") );
+    if(!m_input) return 0;

 
 

-    return (wxUint32)i;
+    wxString word = ReadWord();
+    if(word.empty())
+        return 0;
+    return wxStrtoul(word.c_str(), 0, base);

 }
 
 }
 

-wxUint16 wxTextInputStream::Read16()
+wxUint16 wxTextInputStream::Read16(int base)

 {
 {

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

 }
 
 }
 

-wxUint8 wxTextInputStream::Read8()
+wxUint8 wxTextInputStream::Read8(int base)

 {
 {

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

 }
 
 }
 

-double wxTextInputStream::ReadDouble()
+wxInt32 wxTextInputStream::Read32S(int base)

 {
 {

-    /* I only implemented a simple float parser */
-    double f;
-    int sign;
-
-    if (!m_input) return 0;
-    int c = NextNonSeparators();
-    if (c==(wxChar)0) return 0;
-
-    f = 0.0;
-    if (! (c == wxT('.') || c == wxT(',') || c == wxT('-') || c == wxT('+') || isdigit(c)) )
-    {
-        m_input.Ungetch(c);
-        return 0.0;
-    }
-
-    if (c == wxT('-'))
-    {
-        sign = -1;
-        c = m_input.GetC();
-    } else
-    if (c == wxT('+'))
-    {
-        sign = 1;
-        c = m_input.GetC();
-    }
-    else
-    {
-        sign = 1;
-    }
-
-    while (isdigit(c))
-    {
-        f = f*10 + (c - wxT('0'));
-        c = m_input.GetC();
-    }
-
-    if (c == wxT('.') || c == wxT(','))
-    {
-        double f_multiplicator = (double) 0.1;
-
-        c = m_input.GetC();
-
-        while (isdigit(c))
-       {
-            f += (c-wxT('0'))*f_multiplicator;
-            f_multiplicator /= 10;
-            c = m_input.GetC();
-        }
-
-        if (c == wxT('e'))
-       {
-            double f_multiplicator = 0.0;
-            int i, e;
-
-            c = m_input.GetC();
+    wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") );
+    if(!m_input) return 0;

 
 

-            switch (c)
-           {
-                case wxT('-'): f_multiplicator = 0.1;  break;
-               case wxT('+'): f_multiplicator = 10.0; break;
-           }
-
-            e = Read8();  // why only max 256 ?
+    wxString word = ReadWord();
+    if(word.empty())
+        return 0;
+    return wxStrtol(word.c_str(), 0, base);
+}

 
 

-            for (i=0;i<e;i++)
-                f *= f_multiplicator;
-        }
-       else
-           SkipIfEndOfLine( c );
-    }
-    else
-    {
-        m_input.Ungetch(c);
-    }
+wxInt16 wxTextInputStream::Read16S(int base)
+{
+    return (wxInt16)Read32S(base);
+}

 
 

-    f *= sign;
+wxInt8 wxTextInputStream::Read8S(int base)
+{
+    return (wxInt8)Read32S(base);
+}

 
 

-    return f;
+double wxTextInputStream::ReadDouble()
+{
+    if(!m_input) return 0;
+    wxString word = ReadWord();
+    if(word.empty())
+        return 0;
+    return wxStrtod(word.c_str(), 0);

 }
 
 }
 

+#if WXWIN_COMPATIBILITY_2_6
+

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

-  return ReadLine();
+    return ReadLine();

 }
 
 }
 

+#endif // WXWIN_COMPATIBILITY_2_6
+

 wxString wxTextInputStream::ReadLine()
 {
 wxString wxTextInputStream::ReadLine()
 {

-    wxChar c;

     wxString line;
 
     wxString line;
 

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

     {
     {

-        if (!m_input) break;
-        c = m_input.GetC();
-       
-       if (EatEOL(c)) break;
-       
+        wxChar c = NextChar();
+        if(c == wxEOT)
+            break;
+
+        if (EatEOL(c))
+            break;
+

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


@@ -246,22 +208,30 @@ wxString wxTextInputStream::ReadLine()
 
 wxString wxTextInputStream::ReadWord()
 {
 
 wxString wxTextInputStream::ReadWord()
 {

-    if (!m_input) return "";
-  

     wxString word;
     wxString word;

-    wxChar c=NextNonSeparators();
-    if (c==(wxChar)0) return "";

 
 

-    for (;;)
+    if ( !m_input )
+        return word;
+
+    wxChar c = NextNonSeparators();
+    if ( !c )
+        return word;
+
+    word += c;
+
+    while ( !m_input.Eof() )

     {
     {

-       if (m_separators.Contains(c)) break;
-       
-       if (EatEOL(c)) break;
-       
-        word += c;
+        c = NextChar();
+        if(c == wxEOT)
+            break;

 
 

-       if (!m_input) break;
-        c = m_input.GetC();
+        if (m_separators.Contains(c))
+            break;
+
+        if (EatEOL(c))
+            break;
+
+        word += c;

     }
 
     return word;
     }
 
     return word;


@@ -269,24 +239,32 @@ wxString wxTextInputStream::ReadWord()
 
 wxTextInputStream& wxTextInputStream::operator>>(wxString& word)
 {
 
 wxTextInputStream& wxTextInputStream::operator>>(wxString& word)
 {

-  word = ReadWord();
-  return *this;
+    word = ReadWord();
+    return *this;

 }
 
 }
 

-wxTextInputStream& wxTextInputStream::operator>>(wxChar& c)
+wxTextInputStream& wxTextInputStream::operator>>(char& c)

 {
 {

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

     c = m_input.GetC();
     c = m_input.GetC();

+    if(m_input.LastRead() <= 0) c = 0;
+
+    if (EatEOL(c))
+        c = '\n';

 
 

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

     return *this;
 }
 
     return *this;
 }
 

+#if wxUSE_UNICODE && wxWCHAR_T_IS_REAL_TYPE
+
+wxTextInputStream& wxTextInputStream::operator>>(wchar_t& wc)
+{
+    wc = GetChar();
+
+    return *this;
+}
+
+#endif // wxUSE_UNICODE
+

 wxTextInputStream& wxTextInputStream::operator>>(wxInt16& i)
 {
     i = (wxInt16)Read16();
 wxTextInputStream& wxTextInputStream::operator>>(wxInt16& i)
 {
     i = (wxInt16)Read16();


@@ -323,15 +301,24 @@ wxTextInputStream& wxTextInputStream::operator>>(float& f)
     return *this;
 }
 
     return *this;
 }
 

+
+
+#if wxUSE_UNICODE
+wxTextOutputStream::wxTextOutputStream(wxOutputStream& s,
+                                       wxEOL mode,
+                                       const wxMBConv& conv)
+  : m_output(s), m_conv(conv.Clone())
+#else

 wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode)
   : m_output(s)
 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;
 {
     m_mode = mode;
     if (m_mode == wxEOL_NATIVE)
     {
 #if defined(__WXMSW__) || defined(__WXPM__)
         m_mode = wxEOL_DOS;

-#elif defined(__WXMAC__)
+#elif defined(__WXMAC__) && !defined(__DARWIN__)

         m_mode = wxEOL_MAC;
 #else
         m_mode = wxEOL_UNIX;
         m_mode = wxEOL_MAC;
 #else
         m_mode = wxEOL_UNIX;


@@ -341,6 +328,9 @@ wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode)
 
 wxTextOutputStream::~wxTextOutputStream()
 {
 
 wxTextOutputStream::~wxTextOutputStream()
 {

+#if wxUSE_UNICODE
+    delete m_conv;
+#endif // wxUSE_UNICODE

 }
 
 void wxTextOutputStream::SetMode(wxEOL mode)
 }
 
 void wxTextOutputStream::SetMode(wxEOL mode)


@@ -350,7 +340,7 @@ void wxTextOutputStream::SetMode(wxEOL mode)
     {
 #if defined(__WXMSW__) || defined(__WXPM__)
         m_mode = wxEOL_DOS;
     {
 #if defined(__WXMSW__) || defined(__WXPM__)
         m_mode = wxEOL_DOS;

-#elif defined(__WXMAC__)
+#elif defined(__WXMAC__) && !defined(__DARWIN__)

         m_mode = wxEOL_MAC;
 #else
         m_mode = wxEOL_UNIX;
         m_mode = wxEOL_MAC;
 #else
         m_mode = wxEOL_UNIX;


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

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

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


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

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

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


@@ -392,33 +382,55 @@ void wxTextOutputStream::WriteDouble(double d)
 
 void wxTextOutputStream::WriteString(const wxString& string)
 {
 
 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 == wxT('\n'))
+        const wxChar c = string[i];
+        if ( c == wxT('\n') )

         {
         {

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

             }
         }
             }
         }

-        else
-        {
-            m_output.Write( (const void*)(&c), sizeof(wxChar) );
-        }
-   }
+
+        out << c;
+    }
+
+#if wxUSE_UNICODE
+    wxCharBuffer buffer = m_conv->cWC2MB(out, out.length(), &len);
+    m_output.Write(buffer, len);
+#else
+    m_output.Write(out.c_str(), out.length() );
+#endif
+}
+
+wxTextOutputStream& wxTextOutputStream::PutChar(wxChar c)
+{
+#if wxUSE_UNICODE
+    WriteString( wxString(&c, *m_conv, 1) );
+#else
+    WriteString( wxString(&c, wxConvLocal, 1) );
+#endif
+    return *this;

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


@@ -433,18 +445,30 @@ 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;
 }
 
     return *this;
 }
 

+#if wxUSE_UNICODE && wxWCHAR_T_IS_REAL_TYPE
+
+wxTextOutputStream& wxTextOutputStream::operator<<(wchar_t wc)
+{
+    WriteString( wxString(&wc, *m_conv, 1) );
+
+    return *this;
+}
+
+#endif // wxUSE_UNICODE
+

 wxTextOutputStream& wxTextOutputStream::operator<<(wxInt16 c)
 {
     wxString str;
     str.Printf(wxT("%d"), (signed int)c);
     WriteString(str);
 wxTextOutputStream& wxTextOutputStream::operator<<(wxInt16 c)
 {
     wxString str;
     str.Printf(wxT("%d"), (signed int)c);
     WriteString(str);

-    
+

     return *this;
 }
 
     return *this;
 }
 


@@ -453,7 +477,7 @@ wxTextOutputStream& wxTextOutputStream::operator<<(wxInt32 c)
     wxString str;
     str.Printf(wxT("%ld"), (signed long)c);
     WriteString(str);
     wxString str;
     str.Printf(wxT("%ld"), (signed long)c);
     WriteString(str);

-    
+

     return *this;
 }
 
     return *this;
 }
 


@@ -462,7 +486,7 @@ wxTextOutputStream& wxTextOutputStream::operator<<(wxUint16 c)
     wxString str;
     str.Printf(wxT("%u"), (unsigned int)c);
     WriteString(str);
     wxString str;
     str.Printf(wxT("%u"), (unsigned int)c);
     WriteString(str);

-    
+

     return *this;
 }
 
     return *this;
 }
 


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

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

 }
 
 #endif
 }
 
 #endif