From 191549ed17cc522034a85bc6f313d47335302e7e Mon Sep 17 00:00:00 2001 From: Sylvain Bougnoux Date: Fri, 29 Oct 1999 11:18:46 +0000 Subject: [PATCH] Accept list of separators as a wxString instead of wxChar\nTurn NextNonWhiteSpace to NextNonSeparators\nIntroduce EatEOL (major factorization)\nFix GetC() call on last char introduce a bug git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/txtstrm.h | 19 ++-- src/common/txtstrm.cpp | 198 +++++++++++++---------------------------- 2 files changed, 71 insertions(+), 146 deletions(-) diff --git a/include/wx/txtstrm.h b/include/wx/txtstrm.h index 2b3b897f20..45b3b42030 100644 --- a/include/wx/txtstrm.h +++ b/include/wx/txtstrm.h @@ -30,7 +30,7 @@ WXDLLEXPORT wxTextOutputStream &endl( wxTextOutputStream &stream ); class WXDLLEXPORT wxTextInputStream { public: - wxTextInputStream(wxInputStream& s, const wxChar &sep=wxT(' ')); + wxTextInputStream(wxInputStream& s, const wxString &sep=wxT(" \t")); ~wxTextInputStream(); wxUint32 Read32(); @@ -41,8 +41,8 @@ public: wxString ReadLine(); wxString ReadWord(); - wxChar GetStringSeparator() const { return m_string_separator;} - void SetStringSeparator(const wxChar &c) { m_string_separator=c;} + wxString GetStringSeparators() const { return m_separators;} + void SetStringSeparators(const wxString &c) { m_separators=c;} // Operators wxTextInputStream& operator>>(wxString& word); @@ -57,11 +57,12 @@ public: wxTextInputStream& operator>>( __wxTextInputManip func) { return func(*this); } protected: - wxInputStream *m_input; - wxChar m_string_separator; - - wxChar NextNonWhiteSpace(); - void SkipIfEndOfLine( wxChar c ); + wxInputStream &m_input; + wxString m_separators; + + bool EatEOL(const wxChar &c); + wxChar NextNonSeparators(); + void SkipIfEndOfLine( wxChar c ); }; class WXDLLEXPORT wxTextOutputStream { @@ -88,7 +89,7 @@ class WXDLLEXPORT wxTextOutputStream { wxTextOutputStream& operator<<( __wxTextOutputManip func) { return func(*this); } protected: - wxOutputStream *m_output; + wxOutputStream &m_output; }; #endif diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp index 3cb2c5bb5f..2c628cf3d6 100644 --- a/src/common/txtstrm.cpp +++ b/src/common/txtstrm.cpp @@ -38,8 +38,8 @@ // wxTextInputStream // ---------------------------------------------------------------------------- -wxTextInputStream::wxTextInputStream(wxInputStream& s, const wxChar &sep) - : m_input(&s), m_string_separator(sep) +wxTextInputStream::wxTextInputStream(wxInputStream &s, const wxString &sep) + : m_input(s), m_separators(sep) { } @@ -47,58 +47,44 @@ wxTextInputStream::~wxTextInputStream() { } -wxChar wxTextInputStream::NextNonWhiteSpace() +wxChar wxTextInputStream::NextNonSeparators() { wxChar c = (wxChar) 0; for (;;) { - c = m_input->GetC(); if (!m_input) return (wxChar) 0; + c = m_input.GetC(); - if (c != wxT('\n') && + if (c != wxT('\n') && c != wxT('\r') && - c != wxT('\t') && - c != wxT(' ')) - { - return c; - } + !m_separators.Contains(c)) + return c; } // this shouldn't happen return (wxChar) 0; } -void wxTextInputStream::SkipIfEndOfLine( wxChar c ) +inline bool wxTextInputStream::EatEOL(const wxChar &c) { - if (c == wxT('\n')) + if (c == wxT('\n')) return TRUE; // eat on UNIX + + if (c == wxT('\r')) // eat on both Mac and DOS { - // eat on UNIX - return; + 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 (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 ); - } + return FALSE; +} + +void wxTextInputStream::SkipIfEndOfLine( wxChar c ) +{ + if (EatEOL(c)) return; + else m_input.Ungetch( c ); // no line terminator } wxUint32 wxTextInputStream::Read32() @@ -107,25 +93,26 @@ wxUint32 wxTextInputStream::Read32() int sign; wxInt32 i; - int c = NextNonWhiteSpace(); if (!m_input) return 0; + int c = NextNonSeparators(); + if (c==(wxChar)0) return 0; i = 0; if (! (c == wxT('-') || c == wxT('+') || isdigit(c)) ) { - m_input->Ungetch(c); + m_input.Ungetch(c); return 0; } if (c == wxT('-')) { sign = -1; - c = m_input->GetC(); + c = m_input.GetC(); } else if (c == wxT('+')) { sign = 1; - c = m_input->GetC(); + c = m_input.GetC(); } else { sign = 1; @@ -134,7 +121,7 @@ wxUint32 wxTextInputStream::Read32() while (isdigit(c)) { i = i*10 + (c - (int)wxT('0')); - c = m_input->GetC(); + c = m_input.GetC(); } SkipIfEndOfLine( c ); @@ -160,25 +147,26 @@ double wxTextInputStream::ReadDouble() double f; int sign; - int c = NextNonWhiteSpace(); - if (!m_input) return 0.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)) ) { - m_input->Ungetch(c); + m_input.Ungetch(c); return 0.0; } if (c == wxT('-')) { sign = -1; - c = m_input->GetC(); + c = m_input.GetC(); } else if (c == wxT('+')) { sign = 1; - c = m_input->GetC(); + c = m_input.GetC(); } else { @@ -188,20 +176,20 @@ double wxTextInputStream::ReadDouble() while (isdigit(c)) { f = f*10 + (c - wxT('0')); - c = m_input->GetC(); + c = m_input.GetC(); } if (c == wxT('.')) { double f_multiplicator = (double) 0.1; - c = m_input->GetC(); + c = m_input.GetC(); while (isdigit(c)) { f += (c-wxT('0'))*f_multiplicator; f_multiplicator /= 10; - c = m_input->GetC(); + c = m_input.GetC(); } if (c == wxT('e')) @@ -209,7 +197,7 @@ double wxTextInputStream::ReadDouble() double f_multiplicator = 0.0; int i, e; - c = m_input->GetC(); + c = m_input.GetC(); switch (c) { @@ -227,7 +215,7 @@ double wxTextInputStream::ReadDouble() } else { - m_input->Ungetch(c); + m_input.Ungetch(c); } f *= sign; @@ -247,34 +235,10 @@ wxString wxTextInputStream::ReadLine() for (;;) { - c = m_input->GetC(); if (!m_input) break; + c = m_input.GetC(); - 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; - } - } + if (EatEOL(c)) break; line += c; } @@ -284,47 +248,22 @@ wxString wxTextInputStream::ReadLine() wxString wxTextInputStream::ReadWord() { - wxChar c; + if (!m_input) return ""; + wxString word; - - if (m_string_separator==wxT(' ')) c=NextNonWhiteSpace(); - else c = m_input->GetC(); + wxChar c=NextNonSeparators(); + if (c==(wxChar)0) return ""; for (;;) { - 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 (m_separators.Contains(c)) break; - if (c2 == wxT('\n')) - { - // eat on DOS - break; - } - else - { - // Don't eat on Mac - m_input->Ungetch( c2 ); - break; - } - } + if (EatEOL(c)) break; word += c; - c = m_input->GetC(); + + if (!m_input) break; + c = m_input.GetC(); } return word; @@ -338,30 +277,15 @@ wxTextInputStream& wxTextInputStream::operator>>(wxString& word) wxTextInputStream& wxTextInputStream::operator>>(wxChar& c) { - wxChar c1 = m_input->GetC(); if (!m_input) { c = (wxChar) 0; return *this; } - 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; - } + c = m_input.GetC(); + if (EatEOL(c)) c=wxT('\n'); return *this; } @@ -402,7 +326,7 @@ wxTextInputStream& wxTextInputStream::operator>>(float& f) } wxTextOutputStream::wxTextOutputStream(wxOutputStream& s) - : m_output(&s) + : m_output(s) { } @@ -451,27 +375,27 @@ void wxTextOutputStream::WriteString(const wxString& string) { #if defined(__WINDOWS__) c = wxT('\r'); - m_output->Write( (const void*)(&c), sizeof(wxChar) ); + m_output.Write( (const void*)(&c), sizeof(wxChar) ); c = wxT('\n'); - m_output->Write( (const void*)(&c), sizeof(wxChar) ); + m_output.Write( (const void*)(&c), sizeof(wxChar) ); #elif defined(__UNIX__) c = wxT('\n'); - m_output->Write( (const void*)(&c), sizeof(wxChar) ); + m_output.Write( (const void*)(&c), sizeof(wxChar) ); #elif defined(__WXMAC__) c = wxT('\r'); - m_output->Write( (const void*)(&c), sizeof(wxChar) ); + m_output.Write( (const void*)(&c), sizeof(wxChar) ); #elif defined(__OS2__) c = wxT('\r'); - m_output->Write( (const void*)(&c), sizeof(wxChar) ); + m_output.Write( (const void*)(&c), sizeof(wxChar) ); c = wxT('\n'); - m_output->Write( (const void*)(&c), sizeof(wxChar) ); + m_output.Write( (const void*)(&c), sizeof(wxChar) ); #else #error "wxTextOutputStream: unsupported platform." #endif } else { - m_output->Write( (const void*)(&c), sizeof(wxChar) ); + m_output.Write( (const void*)(&c), sizeof(wxChar) ); } } } -- 2.45.2