// Created: 28/06/98
// RCS-ID: $Id$
// Copyright: (c) Guilhem Lavaux
-// Licence: wxWindows license
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "txtstrm.h"
#endif
// wxTextInputStream
// ----------------------------------------------------------------------------
+#if wxUSE_UNICODE
+wxTextInputStream::wxTextInputStream(wxInputStream &s, const wxString &sep, wxMBConv& conv)
+ : m_input(s), m_separators(sep), m_conv(conv)
+{
+ memset((void*)m_lastBytes, 0, 10);
+}
+#else
wxTextInputStream::wxTextInputStream(wxInputStream &s, const wxString &sep)
: m_input(s), m_separators(sep)
{
+ memset((void*)m_lastBytes, 0, 10);
}
+#endif
wxTextInputStream::~wxTextInputStream()
{
}
-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;
+
+ int retlen = (int) m_conv.MB2WC(wbuf, m_lastBytes, 2); // returns -1 for failure
+ if(retlen >= 0) // res == 0 could happen for '\0' char
+ return wbuf[0];
}
-
- return FALSE;
+ // there should be no encoding which requires more than nine bytes for one character...
+ return wxEOT;
+#else
+ m_lastBytes[0] = m_input.GetC();
+
+ if(m_input.LastRead() <= 0)
+ return wxEOT;
+
+ return m_lastBytes[0];
+#endif
+
}
-void wxTextInputStream::SkipIfEndOfLine( wxChar c )
+wxChar wxTextInputStream::NextNonSeparators()
{
- if (EatEOL(c)) return;
- else m_input.Ungetch( c ); // no line terminator
+ for (;;)
+ {
+ wxChar c = NextChar();
+ if (c == wxEOT) return (wxChar) 0;
+
+ if (c != wxT('\n') &&
+ c != wxT('\r') &&
+ !m_separators.Contains(c))
+ return c;
+ }
+
}
-wxUint32 wxTextInputStream::Read32()
+bool wxTextInputStream::EatEOL(const wxChar &c)
{
- /* 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;
+ if (c == wxT('\n')) return TRUE; // eat on UNIX
- i = 0;
- if (! (c == wxT('-') || c == wxT('+') || isdigit(c)) )
+ if (c == wxT('\r')) // eat on both Mac and DOS
{
- m_input.Ungetch(c);
- return 0;
- }
+ wxChar c2 = NextChar();
+ if(c2 == wxEOT) return TRUE; // end of stream reached, had enough :-)
- 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))
- {
- i = i*10 + (c - (int)wxT('0'));
- c = m_input.GetC();
+ 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.IsEmpty())
+ 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();
-
- switch (c)
- {
- case wxT('-'): f_multiplicator = 0.1; break;
- case wxT('+'): f_multiplicator = 10.0; break;
- }
+ wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") );
+ if(!m_input) return 0;
- e = Read8(); // why only max 256 ?
+ wxString word = ReadWord();
+ if(word.IsEmpty())
+ 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.IsEmpty())
+ return 0;
+ return wxStrtod(word.c_str(), 0);
}
wxString wxTextInputStream::ReadString()
{
- return ReadLine();
+ return ReadLine();
}
wxString wxTextInputStream::ReadLine()
{
- wxChar c;
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 ( !m_input )
+ break;
+
+ if (EatEOL(c))
+ break;
+
line += c;
}
wxString wxTextInputStream::ReadWord()
{
- if (!m_input) return "";
-
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_separators.Contains(c))
+ break;
+
+ if (EatEOL(c))
+ break;
- if (!m_input) break;
- c = m_input.GetC();
+ word += c;
}
return 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();
+ 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
+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__)
+#elif defined(__WXMAC__) && !defined(__DARWIN__)
m_mode = wxEOL_MAC;
#else
m_mode = wxEOL_UNIX;
{
}
-void wxTextOutputStream::SetMode( wxEOL mode = wxEOL_NATIVE )
+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__)
+#elif defined(__WXMAC__) && !defined(__DARWIN__)
m_mode = wxEOL_MAC;
#else
m_mode = wxEOL_UNIX;
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;
}
+
+ // 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)
return *this;
}
-wxTextOutputStream& wxTextOutputStream::operator<<(wxChar c)
+wxTextOutputStream& wxTextOutputStream::operator<<(char c)
{
- WriteString( wxString(c) );
+ WriteString( wxString::FromAscii(c) );
+
return *this;
}
wxString str;
str.Printf(wxT("%d"), (signed int)c);
WriteString(str);
-
+
return *this;
}
wxString str;
str.Printf(wxT("%ld"), (signed long)c);
WriteString(str);
-
+
return *this;
}
wxString str;
str.Printf(wxT("%u"), (unsigned int)c);
WriteString(str);
-
+
return *this;
}
projects / wxWidgets.git / blobdiff