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
This commit is contained in:
Sylvain Bougnoux
1999-10-29 11:18:46 +00:00
parent 5612a51858
commit 191549ed17
2 changed files with 71 additions and 146 deletions

View File

@@ -30,7 +30,7 @@ WXDLLEXPORT wxTextOutputStream &endl( wxTextOutputStream &stream );
class WXDLLEXPORT wxTextInputStream { class WXDLLEXPORT wxTextInputStream {
public: public:
wxTextInputStream(wxInputStream& s, const wxChar &sep=wxT(' ')); wxTextInputStream(wxInputStream& s, const wxString &sep=wxT(" \t"));
~wxTextInputStream(); ~wxTextInputStream();
wxUint32 Read32(); wxUint32 Read32();
@@ -41,8 +41,8 @@ public:
wxString ReadLine(); wxString ReadLine();
wxString ReadWord(); wxString ReadWord();
wxChar GetStringSeparator() const { return m_string_separator;} wxString GetStringSeparators() const { return m_separators;}
void SetStringSeparator(const wxChar &c) { m_string_separator=c;} void SetStringSeparators(const wxString &c) { m_separators=c;}
// Operators // Operators
wxTextInputStream& operator>>(wxString& word); wxTextInputStream& operator>>(wxString& word);
@@ -57,11 +57,12 @@ public:
wxTextInputStream& operator>>( __wxTextInputManip func) { return func(*this); } wxTextInputStream& operator>>( __wxTextInputManip func) { return func(*this); }
protected: protected:
wxInputStream *m_input; wxInputStream &m_input;
wxChar m_string_separator; wxString m_separators;
wxChar NextNonWhiteSpace(); bool EatEOL(const wxChar &c);
void SkipIfEndOfLine( wxChar c ); wxChar NextNonSeparators();
void SkipIfEndOfLine( wxChar c );
}; };
class WXDLLEXPORT wxTextOutputStream { class WXDLLEXPORT wxTextOutputStream {
@@ -88,7 +89,7 @@ class WXDLLEXPORT wxTextOutputStream {
wxTextOutputStream& operator<<( __wxTextOutputManip func) { return func(*this); } wxTextOutputStream& operator<<( __wxTextOutputManip func) { return func(*this); }
protected: protected:
wxOutputStream *m_output; wxOutputStream &m_output;
}; };
#endif #endif

View File

@@ -38,8 +38,8 @@
// wxTextInputStream // wxTextInputStream
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
wxTextInputStream::wxTextInputStream(wxInputStream& s, const wxChar &sep) wxTextInputStream::wxTextInputStream(wxInputStream &s, const wxString &sep)
: m_input(&s), m_string_separator(sep) : m_input(s), m_separators(sep)
{ {
} }
@@ -47,58 +47,44 @@ wxTextInputStream::~wxTextInputStream()
{ {
} }
wxChar wxTextInputStream::NextNonWhiteSpace() wxChar wxTextInputStream::NextNonSeparators()
{ {
wxChar c = (wxChar) 0; wxChar c = (wxChar) 0;
for (;;) for (;;)
{ {
c = m_input->GetC();
if (!m_input) return (wxChar) 0; if (!m_input) return (wxChar) 0;
c = m_input.GetC();
if (c != wxT('\n') && if (c != wxT('\n') &&
c != wxT('\r') && c != wxT('\r') &&
c != wxT('\t') && !m_separators.Contains(c))
c != wxT(' ')) return c;
{
return c;
}
} }
// this shouldn't happen // this shouldn't happen
return (wxChar) 0; 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 if (!m_input) return TRUE;
return; wxChar c2 = m_input.GetC();
if (c2 != wxT('\n')) m_input.Ungetch( c2 ); // Don't eat on Mac
return TRUE;
} }
if (c == wxT('\r')) return FALSE;
{ }
// eat on both Mac and DOS
void wxTextInputStream::SkipIfEndOfLine( wxChar c )
wxChar c2 = m_input->GetC(); {
if (!m_input) return; if (EatEOL(c)) return;
else m_input.Ungetch( c ); // no line terminator
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 );
}
} }
wxUint32 wxTextInputStream::Read32() wxUint32 wxTextInputStream::Read32()
@@ -107,25 +93,26 @@ wxUint32 wxTextInputStream::Read32()
int sign; int sign;
wxInt32 i; wxInt32 i;
int c = NextNonWhiteSpace();
if (!m_input) return 0; if (!m_input) return 0;
int c = NextNonSeparators();
if (c==(wxChar)0) return 0;
i = 0; i = 0;
if (! (c == wxT('-') || c == wxT('+') || isdigit(c)) ) if (! (c == wxT('-') || c == wxT('+') || isdigit(c)) )
{ {
m_input->Ungetch(c); m_input.Ungetch(c);
return 0; return 0;
} }
if (c == wxT('-')) if (c == wxT('-'))
{ {
sign = -1; sign = -1;
c = m_input->GetC(); c = m_input.GetC();
} else } else
if (c == wxT('+')) if (c == wxT('+'))
{ {
sign = 1; sign = 1;
c = m_input->GetC(); c = m_input.GetC();
} else } else
{ {
sign = 1; sign = 1;
@@ -134,7 +121,7 @@ wxUint32 wxTextInputStream::Read32()
while (isdigit(c)) while (isdigit(c))
{ {
i = i*10 + (c - (int)wxT('0')); i = i*10 + (c - (int)wxT('0'));
c = m_input->GetC(); c = m_input.GetC();
} }
SkipIfEndOfLine( c ); SkipIfEndOfLine( c );
@@ -160,25 +147,26 @@ double wxTextInputStream::ReadDouble()
double f; double f;
int sign; int sign;
int c = NextNonWhiteSpace(); if (!m_input) return 0;
if (!m_input) return 0.0; int c = NextNonSeparators();
if (c==(wxChar)0) return 0;
f = 0.0; f = 0.0;
if (! (c == wxT('.') || c == wxT('-') || c == wxT('+') || isdigit(c)) ) if (! (c == wxT('.') || c == wxT('-') || c == wxT('+') || isdigit(c)) )
{ {
m_input->Ungetch(c); m_input.Ungetch(c);
return 0.0; return 0.0;
} }
if (c == wxT('-')) if (c == wxT('-'))
{ {
sign = -1; sign = -1;
c = m_input->GetC(); c = m_input.GetC();
} else } else
if (c == wxT('+')) if (c == wxT('+'))
{ {
sign = 1; sign = 1;
c = m_input->GetC(); c = m_input.GetC();
} }
else else
{ {
@@ -188,20 +176,20 @@ double wxTextInputStream::ReadDouble()
while (isdigit(c)) while (isdigit(c))
{ {
f = f*10 + (c - wxT('0')); f = f*10 + (c - wxT('0'));
c = m_input->GetC(); c = m_input.GetC();
} }
if (c == wxT('.')) if (c == wxT('.'))
{ {
double f_multiplicator = (double) 0.1; double f_multiplicator = (double) 0.1;
c = m_input->GetC(); c = m_input.GetC();
while (isdigit(c)) while (isdigit(c))
{ {
f += (c-wxT('0'))*f_multiplicator; f += (c-wxT('0'))*f_multiplicator;
f_multiplicator /= 10; f_multiplicator /= 10;
c = m_input->GetC(); c = m_input.GetC();
} }
if (c == wxT('e')) if (c == wxT('e'))
@@ -209,7 +197,7 @@ double wxTextInputStream::ReadDouble()
double f_multiplicator = 0.0; double f_multiplicator = 0.0;
int i, e; int i, e;
c = m_input->GetC(); c = m_input.GetC();
switch (c) switch (c)
{ {
@@ -227,7 +215,7 @@ double wxTextInputStream::ReadDouble()
} }
else else
{ {
m_input->Ungetch(c); m_input.Ungetch(c);
} }
f *= sign; f *= sign;
@@ -247,34 +235,10 @@ wxString wxTextInputStream::ReadLine()
for (;;) for (;;)
{ {
c = m_input->GetC();
if (!m_input) break; if (!m_input) break;
c = m_input.GetC();
if (c == wxT('\n')) if (EatEOL(c)) break;
{
// 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;
}
}
line += c; line += c;
} }
@@ -284,47 +248,22 @@ wxString wxTextInputStream::ReadLine()
wxString wxTextInputStream::ReadWord() wxString wxTextInputStream::ReadWord()
{ {
wxChar c; if (!m_input) return "";
wxString word; wxString word;
wxChar c=NextNonSeparators();
if (m_string_separator==wxT(' ')) c=NextNonWhiteSpace(); if (c==(wxChar)0) return "";
else c = m_input->GetC();
for (;;) for (;;)
{ {
if (!m_input) break; if (m_separators.Contains(c)) break;
if (c == m_string_separator) if (EatEOL(c)) break;
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;
}
}
word += c; word += c;
c = m_input->GetC();
if (!m_input) break;
c = m_input.GetC();
} }
return word; return word;
@@ -338,30 +277,15 @@ wxTextInputStream& wxTextInputStream::operator>>(wxString& word)
wxTextInputStream& wxTextInputStream::operator>>(wxChar& c) wxTextInputStream& wxTextInputStream::operator>>(wxChar& c)
{ {
wxChar c1 = m_input->GetC();
if (!m_input) if (!m_input)
{ {
c = (wxChar) 0; c = (wxChar) 0;
return *this; return *this;
} }
if (c1 == wxT('\r')) c = m_input.GetC();
{
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=wxT('\n');
return *this; return *this;
} }
@@ -402,7 +326,7 @@ wxTextInputStream& wxTextInputStream::operator>>(float& f)
} }
wxTextOutputStream::wxTextOutputStream(wxOutputStream& s) wxTextOutputStream::wxTextOutputStream(wxOutputStream& s)
: m_output(&s) : m_output(s)
{ {
} }
@@ -451,27 +375,27 @@ void wxTextOutputStream::WriteString(const wxString& string)
{ {
#if defined(__WINDOWS__) #if defined(__WINDOWS__)
c = wxT('\r'); c = wxT('\r');
m_output->Write( (const void*)(&c), sizeof(wxChar) ); m_output.Write( (const void*)(&c), sizeof(wxChar) );
c = wxT('\n'); c = wxT('\n');
m_output->Write( (const void*)(&c), sizeof(wxChar) ); m_output.Write( (const void*)(&c), sizeof(wxChar) );
#elif defined(__UNIX__) #elif defined(__UNIX__)
c = wxT('\n'); c = wxT('\n');
m_output->Write( (const void*)(&c), sizeof(wxChar) ); m_output.Write( (const void*)(&c), sizeof(wxChar) );
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
c = wxT('\r'); c = wxT('\r');
m_output->Write( (const void*)(&c), sizeof(wxChar) ); m_output.Write( (const void*)(&c), sizeof(wxChar) );
#elif defined(__OS2__) #elif defined(__OS2__)
c = wxT('\r'); c = wxT('\r');
m_output->Write( (const void*)(&c), sizeof(wxChar) ); m_output.Write( (const void*)(&c), sizeof(wxChar) );
c = wxT('\n'); c = wxT('\n');
m_output->Write( (const void*)(&c), sizeof(wxChar) ); m_output.Write( (const void*)(&c), sizeof(wxChar) );
#else #else
#error "wxTextOutputStream: unsupported platform." #error "wxTextOutputStream: unsupported platform."
#endif #endif
} }
else else
{ {
m_output->Write( (const void*)(&c), sizeof(wxChar) ); m_output.Write( (const void*)(&c), sizeof(wxChar) );
} }
} }
} }