X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/338dd992160bf20205743c092b353d96ef7604fb..124193837f27d1fb75b9607f0e005b9897d1e320:/src/common/txtstrm.cpp?ds=sidebyside diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp index 2592c03fe1..8fd6ffaaaf 100644 --- a/src/common/txtstrm.cpp +++ b/src/common/txtstrm.cpp @@ -6,7 +6,7 @@ // Created: 28/06/98 // RCS-ID: $Id$ // Copyright: (c) Guilhem Lavaux -// Licence: wxWindows license +// Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -52,31 +52,31 @@ wxChar wxTextInputStream::NextNonSeparators() wxChar c = (wxChar) 0; for (;;) { - if (!m_input) return (wxChar) 0; + if (!m_input) return (wxChar) 0; c = m_input.GetC(); - - if (c != wxT('\n') && - c != wxT('\r') && - !m_separators.Contains(c)) - return c; + + if (c != wxT('\n') && + c != wxT('\r') && + !m_separators.Contains(c)) + return c; } } -inline bool wxTextInputStream::EatEOL(const wxChar &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 + 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(); - - if (c2 != wxT('\n')) m_input.Ungetch( c2 ); // Don't eat on Mac - return TRUE; + 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; } - return FALSE; + return FALSE; } void wxTextInputStream::SkipIfEndOfLine( wxChar c ) @@ -88,11 +88,13 @@ void wxTextInputStream::SkipIfEndOfLine( wxChar c ) wxUint32 wxTextInputStream::Read32() { /* I only implemented a simple integer parser */ + // VZ: what about using strtol()?? (TODO) + int sign; wxInt32 i; if (!m_input) return 0; - int c = NextNonSeparators(); + int c = NextNonSeparators(); if (c==(wxChar)0) return 0; i = 0; @@ -141,34 +143,39 @@ wxUint8 wxTextInputStream::Read8() double wxTextInputStream::ReadDouble() { - /* I only implemented a simple float parser */ + /* I only implemented a simple float parser + * VZ: what about using strtod()?? (TODO) + */ + double f; - int sign; + int theSign; + + if (!m_input) + return 0; - if (!m_input) return 0; int c = NextNonSeparators(); if (c==(wxChar)0) return 0; f = 0.0; - if (! (c == wxT('.') || c == wxT('-') || c == wxT('+') || isdigit(c)) ) + if (! (c == wxT('.') || c == wxT(',') || c == wxT('-') || c == wxT('+') || isdigit(c)) ) { m_input.Ungetch(c); - return 0.0; + return 0; } if (c == wxT('-')) { - sign = -1; + theSign = -1; c = m_input.GetC(); } else if (c == wxT('+')) { - sign = 1; + theSign = 1; c = m_input.GetC(); } else { - sign = 1; + theSign = 1; } while (isdigit(c)) @@ -177,53 +184,52 @@ double wxTextInputStream::ReadDouble() c = m_input.GetC(); } - if (c == wxT('.')) + 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; - } + case wxT('+'): f_multiplicator = 10.0; break; + } e = Read8(); // why only max 256 ? for (i=0;i>(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; + c = 0; return *this; } c = m_input.GetC(); - if (EatEOL(c)) c=wxT('\n'); + if (EatEOL(c)) + c = '\n'; + return *this; } @@ -323,15 +343,41 @@ wxTextInputStream& wxTextInputStream::operator>>(float& f) return *this; } -wxTextOutputStream::wxTextOutputStream(wxOutputStream& s) +wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode) : m_output(s) { + m_mode = mode; + if (m_mode == wxEOL_NATIVE) + { +#if defined(__WXMSW__) || defined(__WXPM__) + m_mode = wxEOL_DOS; +#elif defined(__WXMAC__) + m_mode = wxEOL_MAC; +#else + m_mode = wxEOL_UNIX; +#endif + } } wxTextOutputStream::~wxTextOutputStream() { } +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__) + m_mode = wxEOL_MAC; +#else + m_mode = wxEOL_UNIX; +#endif + } +} + void wxTextOutputStream::Write32(wxUint32 i) { wxString str; @@ -371,25 +417,22 @@ void wxTextOutputStream::WriteString(const wxString& string) 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) ); -#else - #error "wxTextOutputStream: unsupported platform." -#endif + 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) ); + } } else { @@ -410,33 +453,50 @@ wxTextOutputStream& wxTextOutputStream::operator<<(const wxString& string) return *this; } -wxTextOutputStream& wxTextOutputStream::operator<<(wxChar c) +wxTextOutputStream& wxTextOutputStream::operator<<(char c) { - WriteString( wxString(c) ); + // these strange manipulations are needed in Unicode mode + char buf[2]; + buf[0] = c; + buf[1] = 0; + + WriteString( wxString(buf) ); return *this; } 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; }