X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c980c992630e94e71139660631a77ffbca8ed958..3e6858cdcb9278b36446466c346d984e7e306553:/src/common/txtstrm.cpp?ds=sidebyside diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp index e0acaeb66c..e516fb4130 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 +// Copyright: (c) Guilhem Lavaux +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "txtstrm.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -23,323 +19,488 @@ #if wxUSE_STREAMS #include "wx/txtstrm.h" + +#ifndef WX_PRECOMP + #include "wx/crt.h" +#endif + #include -wxTextInputStream::wxTextInputStream(wxInputStream& s) - : m_input(&s) +// ---------------------------------------------------------------------------- +// 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) +{ + memset((void*)m_lastBytes, 0, 10); +} +#endif wxTextInputStream::~wxTextInputStream() { +#if wxUSE_UNICODE + delete m_conv; +#endif // wxUSE_UNICODE } -wxUint32 wxTextInputStream::Read32() +void wxTextInputStream::UngetLast() { - /* I only implemented a simple integer parser */ - int c; - int sign; - wxInt32 i; + 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); +} - while (isspace( c = m_input->GetC() ) ) - /* Do nothing */ ; +wxChar wxTextInputStream::NextChar() +{ +#if wxUSE_UNICODE + wxChar wbuf[2]; + memset((void*)m_lastBytes, 0, 10); + for(size_t inlen = 0; inlen < 9; inlen++) + { + // 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(); - i = 0; - if (! (c == '-' || isdigit(c)) ) { - m_input->Ungetch(c); - return 0; - } + if(m_input.LastRead() <= 0) + return wxEOT; - if (c == '-') { - sign = -1; - c = m_input->GetC(); - } else if (c == '+') { - sign = 1; - c = m_input->GetC(); - } else { - sign = 1; - } + return m_lastBytes[0]; +#endif - while (isdigit(c)) { - i = i*10 + (c - (int)'0'); - c = m_input->GetC(); - } +} - if (c != '\n' && c != '\r') - m_input->Ungetch(c); +wxChar wxTextInputStream::NextNonSeparators() +{ + for (;;) + { + wxChar c = NextChar(); + if (c == wxEOT) return (wxChar) 0; + + if (c != wxT('\n') && + c != wxT('\r') && + m_separators.Find(c) < 0) + return c; + } - i *= sign; +} + +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 + { + 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; + } - return (wxUint32)i; + return false; } -wxUint16 wxTextInputStream::Read16() +wxUint32 wxTextInputStream::Read32(int base) { - return (wxUint16)Read32(); + wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") ); + if(!m_input) return 0; + + wxString word = ReadWord(); + if(word.empty()) + return 0; + return wxStrtoul(word.c_str(), 0, base); +} + +wxUint16 wxTextInputStream::Read16(int base) +{ + return (wxUint16)Read32(base); +} + +wxUint8 wxTextInputStream::Read8(int base) +{ + return (wxUint8)Read32(base); +} + +wxInt32 wxTextInputStream::Read32S(int base) +{ + wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") ); + if(!m_input) return 0; + + wxString word = ReadWord(); + if(word.empty()) + return 0; + return wxStrtol(word.c_str(), 0, base); +} + +wxInt16 wxTextInputStream::Read16S(int base) +{ + return (wxInt16)Read32S(base); } -wxUint8 wxTextInputStream::Read8() +wxInt8 wxTextInputStream::Read8S(int base) { - return (wxUint8)Read32(); + return (wxInt8)Read32S(base); } 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(); + 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(); +} + +#endif // WXWIN_COMPATIBILITY_2_6 + +wxString wxTextInputStream::ReadLine() +{ + wxString line; + + while ( !m_input.Eof() ) + { + wxChar c = NextChar(); + if(c == wxEOT) + break; + + if (EatEOL(c)) + break; + + line += c; } - if (c == 'e') { - double f_multiplicator = 0.0; - int i, e; + return line; +} + +wxString wxTextInputStream::ReadWord() +{ + wxString word; + + if ( !m_input ) + return word; - c = m_input->GetC(); + wxChar c = NextNonSeparators(); + if ( !c ) + return word; - switch(c) { - case '-': - f_multiplicator = 0.1; - break; - case '+': - f_multiplicator = 10.0; - break; - } + word += c; - e = Read8(); + while ( !m_input.Eof() ) + { + c = NextChar(); + if(c == wxEOT) + break; - for (i=0;iUngetch(c); - - } + if (m_separators.Find(c) >= 0) + break; - f *= sign; + if (EatEOL(c)) + break; - return f; + word += c; + } + + return word; } -wxString wxTextInputStream::ReadString() +wxTextInputStream& wxTextInputStream::operator>>(wxString& word) +{ + word = ReadWord(); + return *this; +} + +wxTextInputStream& wxTextInputStream::operator>>(char& c) +{ + c = m_input.GetC(); + if(m_input.LastRead() <= 0) c = 0; + + if (EatEOL(c)) + c = '\n'; + + return *this; +} + +#if wxUSE_UNICODE && wxWCHAR_T_IS_REAL_TYPE + +wxTextInputStream& wxTextInputStream::operator>>(wchar_t& wc) { - 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; -} - -wxTextInputStream& wxTextInputStream::operator>>(wxString& line) -{ - line = ReadString(); - return *this; -} - -wxTextInputStream& wxTextInputStream::operator>>(wxChar& c) -{ - // TODO -/* - m_input->Read(&c, sizeof(wxChar)); -*/ - return *this; + wc = GetChar(); + + return *this; } +#endif // wxUSE_UNICODE + wxTextInputStream& wxTextInputStream::operator>>(wxInt16& i) { - i = (wxInt16)Read16(); - return *this; + i = (wxInt16)Read16(); + return *this; } wxTextInputStream& wxTextInputStream::operator>>(wxInt32& i) { - i = (wxInt32)Read32(); - return *this; + i = (wxInt32)Read32(); + return *this; } wxTextInputStream& wxTextInputStream::operator>>(wxUint16& i) { - i = Read16(); - return *this; + i = Read16(); + return *this; } wxTextInputStream& wxTextInputStream::operator>>(wxUint32& i) { - i = Read32(); - return *this; + i = Read32(); + return *this; } wxTextInputStream& wxTextInputStream::operator>>(double& i) { - i = ReadDouble(); - return *this; + i = ReadDouble(); + return *this; } wxTextInputStream& wxTextInputStream::operator>>(float& f) { - f = (float)ReadDouble(); - return *this; + f = (float)ReadDouble(); + 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; +#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; +#else + m_mode = wxEOL_UNIX; +#endif + } } void wxTextOutputStream::Write32(wxUint32 i) { - wxString str; + wxString str; + str.Printf(wxT("%u"), i); - str.Printf(_T("%u"), i); - WriteString(str); + WriteString(str); } void wxTextOutputStream::Write16(wxUint16 i) { - wxString str; + wxString str; + str.Printf(wxT("%u"), (unsigned)i); - str.Printf(_T("%u"), i); - WriteString(str); + WriteString(str); } void wxTextOutputStream::Write8(wxUint8 i) { - wxString str; + wxString str; + str.Printf(wxT("%u"), (unsigned)i); - str.Printf(_T("%u"), i); - WriteString(str); + WriteString(str); } void wxTextOutputStream::WriteDouble(double d) { - wxString str; + wxString str; - str.Printf(_T("%f"), d); - WriteString(str); + str.Printf(wxT("%f"), d); + WriteString(str); } void wxTextOutputStream::WriteString(const wxString& string) { + size_t len = string.length(); + + wxString out; + out.reserve(len); + + for ( size_t i = 0; i < len; i++ ) + { + const wxChar c = string[i]; + if ( c == wxT('\n') ) + { + 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 - const wxWX2MBbuf buf = string.mb_str(); - m_output->Write(buf, string.Len()); + // 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 - m_output->Write(string, string.Len()); + m_output.Write(out.c_str(), out.length() ); #endif } -wxTextOutputStream& wxTextOutputStream::operator<<(const wxChar *string) +wxTextOutputStream& wxTextOutputStream::PutChar(wxChar c) { - WriteString(wxString(string)); - return *this; +#if wxUSE_UNICODE + WriteString( wxString(&c, *m_conv, 1) ); +#else + WriteString( wxString(&c, wxConvLocal, 1) ); +#endif + return *this; } wxTextOutputStream& wxTextOutputStream::operator<<(const wxString& string) { - WriteString(string); - return *this; + WriteString( string ); + return *this; +} + +wxTextOutputStream& wxTextOutputStream::operator<<(char c) +{ + WriteString( wxString::FromAscii(c) ); + + return *this; } -wxTextOutputStream& wxTextOutputStream::operator<<(wxChar c) +#if wxUSE_UNICODE && wxWCHAR_T_IS_REAL_TYPE + +wxTextOutputStream& wxTextOutputStream::operator<<(wchar_t wc) { - wxString tmp_str; - tmp_str.Printf(_T("%c"), c); - WriteString(tmp_str); - return *this; + WriteString( wxString(&wc, *m_conv, 1) ); + + return *this; } +#endif // wxUSE_UNICODE + wxTextOutputStream& wxTextOutputStream::operator<<(wxInt16 c) { - Write16((wxUint16)c); - return *this; + wxString str; + str.Printf(wxT("%d"), (signed int)c); + WriteString(str); + + return *this; } wxTextOutputStream& wxTextOutputStream::operator<<(wxInt32 c) { - Write32((wxUint32)c); - return *this; + wxString str; + str.Printf(wxT("%ld"), (signed long)c); + WriteString(str); + + return *this; } wxTextOutputStream& wxTextOutputStream::operator<<(wxUint16 c) { - Write16(c); - return *this; + wxString str; + str.Printf(wxT("%u"), (unsigned int)c); + WriteString(str); + + return *this; } wxTextOutputStream& wxTextOutputStream::operator<<(wxUint32 c) { - Write32(c); - return *this; + wxString str; + str.Printf(wxT("%lu"), (unsigned long)c); + WriteString(str); + + return *this; } wxTextOutputStream &wxTextOutputStream::operator<<(double f) { - WriteDouble(f); - return *this; + WriteDouble(f); + return *this; } wxTextOutputStream& wxTextOutputStream::operator<<(float f) { - WriteDouble((double)f); - return *this; + WriteDouble((double)f); + return *this; +} + +wxTextOutputStream &endl( wxTextOutputStream &stream ) +{ + return stream.PutChar(wxT('\n')); } #endif