X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9853d97739ac40bed4a9690f39e1c51bf9b5733f..8b51786f6e56a7d8517107c8b497f0ddb07696ad:/src/common/txtstrm.cpp diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp index 3cb2c5bb5f..43deb545d3 100644 --- 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 -// 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" @@ -22,6 +18,10 @@ #if wxUSE_STREAMS +#ifndef WX_PRECOMP + #include "wx/crt.h" +#endif + #include "wx/txtstrm.h" #include @@ -38,244 +38,172 @@ // wxTextInputStream // ---------------------------------------------------------------------------- -wxTextInputStream::wxTextInputStream(wxInputStream& s, const wxChar &sep) - : m_input(&s), m_string_separator(sep) +#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); } - -wxTextInputStream::~wxTextInputStream() +#else +wxTextInputStream::wxTextInputStream(wxInputStream &s, const wxString &sep) + : m_input(s), m_separators(sep) { + memset((void*)m_lastBytes, 0, 10); } +#endif -wxChar wxTextInputStream::NextNonWhiteSpace() +wxTextInputStream::~wxTextInputStream() { - 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; - } - } - - // this shouldn't happen - return (wxChar) 0; +#if wxUSE_UNICODE + delete m_conv; +#endif // wxUSE_UNICODE } -void wxTextInputStream::SkipIfEndOfLine( wxChar c ) +void wxTextInputStream::UngetLast() { - if (c == wxT('\n')) - { - // eat on UNIX - return; - } - - 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 - { - // no line terminator - m_input->Ungetch( 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); } -wxUint32 wxTextInputStream::Read32() +wxChar wxTextInputStream::NextChar() { - /* I only implemented a simple integer parser */ - int sign; - wxInt32 i; - - int c = NextNonWhiteSpace(); - if (!m_input) return 0; - - i = 0; - if (! (c == wxT('-') || c == wxT('+') || isdigit(c)) ) +#if wxUSE_UNICODE + wxChar wbuf[2]; + memset((void*)m_lastBytes, 0, 10); + for(size_t inlen = 0; inlen < 9; inlen++) { - m_input->Ungetch(c); - return 0; - } + // actually read the next character + m_lastBytes[inlen] = m_input.GetC(); - if (c == wxT('-')) - { - sign = -1; - c = m_input->GetC(); - } else - if (c == wxT('+')) - { - sign = 1; - c = m_input->GetC(); - } else - { - sign = 1; - } + if(m_input.LastRead() <= 0) + return wxEOT; - while (isdigit(c)) - { - i = i*10 + (c - (int)wxT('0')); - c = m_input->GetC(); + 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(); - SkipIfEndOfLine( c ); + if(m_input.LastRead() <= 0) + return wxEOT; - i *= sign; + return m_lastBytes[0]; +#endif - return (wxUint32)i; } -wxUint16 wxTextInputStream::Read16() +wxChar wxTextInputStream::NextNonSeparators() { - return (wxUint16)Read32(); -} + for (;;) + { + wxChar c = NextChar(); + if (c == wxEOT) return (wxChar) 0; + + if (c != wxT('\n') && + c != wxT('\r') && + !m_separators.Contains(c)) + return c; + } -wxUint8 wxTextInputStream::Read8() -{ - return (wxUint8)Read32(); } -double wxTextInputStream::ReadDouble() +bool wxTextInputStream::EatEOL(const wxChar &c) { - /* I only implemented a simple float parser */ - double f; - int sign; + if (c == wxT('\n')) return true; // eat on UNIX - int c = NextNonWhiteSpace(); - if (!m_input) return 0.0; - - f = 0.0; - if (! (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('+')) + if (c == wxT('\r')) // eat on both Mac and DOS { - sign = 1; - c = m_input->GetC(); - } - else - { - sign = 1; - } + wxChar c2 = NextChar(); + if(c2 == wxEOT) return true; // end of stream reached, had enough :-) - while (isdigit(c)) - { - f = f*10 + (c - wxT('0')); - c = m_input->GetC(); + if (c2 != wxT('\n')) UngetLast(); // Don't eat on Mac + return true; } - if (c == wxT('.')) - { - double f_multiplicator = (double) 0.1; + return false; +} - c = m_input->GetC(); +wxUint32 wxTextInputStream::Read32(int base) +{ + wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") ); + if(!m_input) return 0; - while (isdigit(c)) - { - f += (c-wxT('0'))*f_multiplicator; - f_multiplicator /= 10; - c = m_input->GetC(); - } + wxString word = ReadWord(); + if(word.empty()) + return 0; + return wxStrtoul(word.c_str(), 0, base); +} - if (c == wxT('e')) - { - double f_multiplicator = 0.0; - int i, e; +wxUint16 wxTextInputStream::Read16(int base) +{ + return (wxUint16)Read32(base); +} - c = m_input->GetC(); +wxUint8 wxTextInputStream::Read8(int base) +{ + return (wxUint8)Read32(base); +} - switch (c) - { - case wxT('-'): f_multiplicator = 0.1; break; - case wxT('+'): f_multiplicator = 10.0; break; - } +wxInt32 wxTextInputStream::Read32S(int base) +{ + 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.empty()) + return 0; + return wxStrtol(word.c_str(), 0, base); +} - for (i=0;iUngetch(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() { - return ReadLine(); + return ReadLine(); } +#endif // WXWIN_COMPATIBILITY_2_6 + wxString wxTextInputStream::ReadLine() { - 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; - } - } - + wxChar c = NextChar(); + if(c == wxEOT) + break; + + if (EatEOL(c)) + break; + line += c; } @@ -284,47 +212,30 @@ wxString wxTextInputStream::ReadLine() wxString wxTextInputStream::ReadWord() { - wxChar c; wxString word; - if (m_string_separator==wxT(' ')) c=NextNonWhiteSpace(); - else c = m_input->GetC(); + if ( !m_input ) + return word; - for (;;) + wxChar c = NextNonSeparators(); + if ( !c ) + return word; + + word += c; + + while ( !m_input.Eof() ) { - if (!m_input) break; - - if (c == m_string_separator) - 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 = NextChar(); + if(c == wxEOT) + break; + + if (m_separators.Contains(c)) + break; + + if (EatEOL(c)) + break; + word += c; - c = m_input->GetC(); } return word; @@ -332,39 +243,32 @@ wxString wxTextInputStream::ReadWord() wxTextInputStream& wxTextInputStream::operator>>(wxString& word) { - word = ReadWord(); - return *this; + word = ReadWord(); + return *this; } -wxTextInputStream& wxTextInputStream::operator>>(wxChar& c) +wxTextInputStream& wxTextInputStream::operator>>(char& c) { - wxChar c1 = m_input->GetC(); - if (!m_input) - { - c = (wxChar) 0; - return *this; - } + c = m_input.GetC(); + if(m_input.LastRead() <= 0) c = 0; - 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; - } + if (EatEOL(c)) + c = '\n'; + + 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(); @@ -401,13 +305,51 @@ wxTextInputStream& wxTextInputStream::operator>>(float& f) return *this; } -wxTextOutputStream::wxTextOutputStream(wxOutputStream& s) - : m_output(&s) + + +#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) +#endif { + m_mode = mode; + if (m_mode == wxEOL_NATIVE) + { +#if defined(__WXMSW__) || defined(__WXPM__) + m_mode = wxEOL_DOS; +#elif defined(__WXMAC__) && !defined(__DARWIN__) + m_mode = wxEOL_MAC; +#else + m_mode = wxEOL_UNIX; +#endif + } } wxTextOutputStream::~wxTextOutputStream() { +#if wxUSE_UNICODE + delete m_conv; +#endif // wxUSE_UNICODE +} + +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__) && !defined(__DARWIN__) + m_mode = wxEOL_MAC; +#else + m_mode = wxEOL_UNIX; +#endif + } } void wxTextOutputStream::Write32(wxUint32 i) @@ -421,7 +363,7 @@ void wxTextOutputStream::Write32(wxUint32 i) void wxTextOutputStream::Write16(wxUint16 i) { wxString str; - str.Printf(wxT("%u"), i); + str.Printf(wxT("%u"), (unsigned)i); WriteString(str); } @@ -429,7 +371,7 @@ void wxTextOutputStream::Write16(wxUint16 i) void wxTextOutputStream::Write8(wxUint8 i) { wxString str; - str.Printf(wxT("%u"), i); + str.Printf(wxT("%u"), (unsigned)i); WriteString(str); } @@ -444,41 +386,55 @@ void wxTextOutputStream::WriteDouble(double d) 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 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) ); + 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 + ; + } + } + + out << c; + } + +#if wxUSE_UNICODE + // FIXME-UTF8: use wxCharBufferWithLength if/when we have it + wxCharBuffer buffer = m_conv->cWC2MB(out.wc_str(), out.length(), &len); + m_output.Write(buffer, len); #else - #error "wxTextOutputStream: unsupported platform." + m_output.Write(out.c_str(), out.length() ); #endif - } - else - { - m_output->Write( (const void*)(&c), sizeof(wxChar) ); - } - } } -wxTextOutputStream& wxTextOutputStream::operator<<(const wxChar *string) +wxTextOutputStream& wxTextOutputStream::PutChar(wxChar c) { - WriteString( wxString(string) ); +#if wxUSE_UNICODE + WriteString( wxString(&c, *m_conv, 1) ); +#else + WriteString( wxString(&c, wxConvLocal, 1) ); +#endif return *this; } @@ -488,33 +444,57 @@ wxTextOutputStream& wxTextOutputStream::operator<<(const wxString& string) return *this; } -wxTextOutputStream& wxTextOutputStream::operator<<(wxChar c) +wxTextOutputStream& wxTextOutputStream::operator<<(char c) +{ + WriteString( wxString::FromAscii(c) ); + + return *this; +} + +#if wxUSE_UNICODE && wxWCHAR_T_IS_REAL_TYPE + +wxTextOutputStream& wxTextOutputStream::operator<<(wchar_t wc) { - WriteString( wxString(c) ); + WriteString( wxString(&wc, *m_conv, 1) ); + return *this; } +#endif // wxUSE_UNICODE + 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) { - Write32( (wxUint32)c ); + wxString str; + str.Printf(wxT("%ld"), (signed long)c); + WriteString(str); + 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) { - Write32(c); + wxString str; + str.Printf(wxT("%lu"), (unsigned long)c); + WriteString(str); + return *this; } @@ -532,7 +512,7 @@ wxTextOutputStream& wxTextOutputStream::operator<<(float f) wxTextOutputStream &endl( wxTextOutputStream &stream ) { - return stream << wxT('\n'); + return stream.PutChar(wxT('\n')); } #endif