X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/55d99c7a77789ff4904bf96eddca3715eb5af9b9..dca9410337a8397c0b815e57cd66ec82e5c85654:/src/common/txtstrm.cpp?ds=inline diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp index 032474919c..f7d6c09efd 100644 --- a/src/common/txtstrm.cpp +++ b/src/common/txtstrm.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: txtstrm.cpp +// Name: src/common/txtstrm.cpp // Purpose: Text stream classes // Author: Guilhem Lavaux // Modified by: @@ -9,10 +9,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "txtstrm.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -23,48 +19,89 @@ #if wxUSE_STREAMS #include "wx/txtstrm.h" -#include - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- +#ifndef WX_PRECOMP + #include "wx/crt.h" +#endif -// Unix: "\n" -// Dos: "\r\n" -// Mac: "\r" +#include // ---------------------------------------------------------------------------- // wxTextInputStream // ---------------------------------------------------------------------------- #if wxUSE_UNICODE -wxTextInputStream::wxTextInputStream(wxInputStream &s, const wxString &sep, wxMBConv& conv) - : m_input(s), m_separators(sep), m_conv(conv) +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 +} + +void wxTextInputStream::UngetLast() +{ + 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); +} + +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(); + + if(m_input.LastRead() <= 0) + return wxEOT; + + return m_lastBytes[0]; +#endif + } wxChar wxTextInputStream::NextNonSeparators() { - wxChar c = (wxChar) 0; for (;;) { - if (!m_input) return (wxChar) 0; - c = m_input.GetC(); + wxChar c = NextChar(); + if (c == wxEOT) return (wxChar) 0; if (c != wxT('\n') && c != wxT('\r') && - !m_separators.Contains(c)) + m_separators.Find(c) < 0) return c; } @@ -72,194 +109,88 @@ wxChar wxTextInputStream::NextNonSeparators() bool wxTextInputStream::EatEOL(const wxChar &c) { - if (c == wxT('\n')) return TRUE; // eat on UNIX + if (c == wxT('\n')) return true; // eat on UNIX if (c == wxT('\r')) // eat on both Mac and DOS { - if (!m_input) return TRUE; - wxChar c2 = m_input.GetC(); + wxChar c2 = NextChar(); + if(c2 == wxEOT) return true; // end of stream reached, had enough :-) - if (c2 != wxT('\n')) m_input.Ungetch( c2 ); // Don't eat on Mac - return TRUE; + if (c2 != wxT('\n')) UngetLast(); // Don't eat on Mac + return true; } - return FALSE; + return false; } -void wxTextInputStream::SkipIfEndOfLine( wxChar c ) +wxUint32 wxTextInputStream::Read32(int base) { - if (EatEOL(c)) return; - else m_input.Ungetch( c ); // no line terminator + 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); } -wxUint32 wxTextInputStream::Read32() +wxUint16 wxTextInputStream::Read16(int base) { - /* I only implemented a simple integer parser */ - // VZ: what about using strtol()?? (TODO) + return (wxUint16)Read32(base); +} - int sign; - wxInt32 i; +wxUint8 wxTextInputStream::Read8(int base) +{ + return (wxUint8)Read32(base); +} - if (!m_input) return 0; - int c = NextNonSeparators(); - if (c==(wxChar)0) return 0; +wxInt32 wxTextInputStream::Read32S(int base) +{ + wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") ); + if(!m_input) return 0; - i = 0; - if (! (c == wxT('-') || c == wxT('+') || isdigit(c)) ) - { - m_input.Ungetch(c); + wxString word = ReadWord(); + if(word.empty()) return 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)) - { - i = i*10 + (c - (int)wxT('0')); - c = m_input.GetC(); - } - - SkipIfEndOfLine( c ); - - i *= sign; - - return (wxUint32)i; + return wxStrtol(word.c_str(), 0, base); } -wxUint16 wxTextInputStream::Read16() +wxInt16 wxTextInputStream::Read16S(int base) { - return (wxUint16)Read32(); + 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 - * VZ: what about using strtod()?? (TODO) - */ - - double f; - int theSign; - - if (!m_input) + if(!m_input) return 0; + wxString word = ReadWord(); + if(word.empty()) 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; - } - - if (c == wxT('-')) - { - theSign = -1; - c = m_input.GetC(); - } else - if (c == wxT('+')) - { - theSign = 1; - c = m_input.GetC(); - } - else - { - theSign = 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; - } - - e = Read8(); // why only max 256 ? - - for (i=0;i= 0) break; if (EatEOL(c)) @@ -311,13 +241,8 @@ wxTextInputStream& wxTextInputStream::operator>>(wxString& word) wxTextInputStream& wxTextInputStream::operator>>(char& c) { - if (!m_input) - { - c = 0; - return *this; - } - c = m_input.GetC(); + if(m_input.LastRead() <= 0) c = 0; if (EatEOL(c)) c = '\n'; @@ -325,6 +250,17 @@ wxTextInputStream& wxTextInputStream::operator>>(char& c) 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(); @@ -364,8 +300,10 @@ wxTextInputStream& wxTextInputStream::operator>>(float& f) #if wxUSE_UNICODE -wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode, wxMBConv& conv) - : m_output(s), m_conv(conv) +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) @@ -376,8 +314,6 @@ wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode) { #if defined(__WXMSW__) || defined(__WXPM__) m_mode = wxEOL_DOS; -#elif defined(__WXMAC__) && !defined(__DARWIN__) - m_mode = wxEOL_MAC; #else m_mode = wxEOL_UNIX; #endif @@ -386,6 +322,9 @@ wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode) wxTextOutputStream::~wxTextOutputStream() { +#if wxUSE_UNICODE + delete m_conv; +#endif // wxUSE_UNICODE } void wxTextOutputStream::SetMode(wxEOL mode) @@ -395,8 +334,6 @@ void wxTextOutputStream::SetMode(wxEOL mode) { #if defined(__WXMSW__) || defined(__WXPM__) m_mode = wxEOL_DOS; -#elif defined(__WXMAC__) && !defined(__DARWIN__) - m_mode = wxEOL_MAC; #else m_mode = wxEOL_UNIX; #endif @@ -414,7 +351,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); } @@ -422,7 +359,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); } @@ -468,23 +405,40 @@ void wxTextOutputStream::WriteString(const wxString& string) } 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 ) ); + // 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(out.c_str(), out.length() ); #endif } -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; } +void wxTextOutputStream::Flush() +{ +#if wxUSE_UNICODE + const size_t len = m_conv->FromWChar(NULL, 0, L"", 1); + if ( len > m_conv->GetMBNulLen() ) + { + wxCharBuffer buf(len); + m_conv->FromWChar(buf.data(), len, L"", 1); + m_output.Write(buf, len - m_conv->GetMBNulLen()); + } +#endif // wxUSE_UNICODE +} + wxTextOutputStream& wxTextOutputStream::operator<<(const wxString& string) { WriteString( string ); @@ -494,10 +448,21 @@ wxTextOutputStream& wxTextOutputStream::operator<<(const wxString& string) 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(&wc, *m_conv, 1) ); + + return *this; +} + +#endif // wxUSE_UNICODE + wxTextOutputStream& wxTextOutputStream::operator<<(wxInt16 c) { wxString str; @@ -548,7 +513,7 @@ wxTextOutputStream& wxTextOutputStream::operator<<(float f) wxTextOutputStream &endl( wxTextOutputStream &stream ) { - return stream << wxT('\n'); + return stream.PutChar(wxT('\n')); } #endif