// Created: 28/06/98
// RCS-ID: $Id$
// Copyright: (c) Guilhem Lavaux
-// Licence: wxWindows license
+// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
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 )
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;
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;
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))
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<e;i++)
f *= f_multiplicator;
}
- else
- SkipIfEndOfLine( c );
+ else
+ SkipIfEndOfLine( c );
}
else
{
m_input.Ungetch(c);
}
- f *= sign;
-
+ f *= theSign;
return f;
}
wxString wxTextInputStream::ReadString()
{
- return ReadLine();
+ return ReadLine();
}
wxString wxTextInputStream::ReadLine()
wxChar c;
wxString line;
- for (;;)
+ while ( !m_input.Eof() )
{
- if (!m_input) break;
c = m_input.GetC();
-
- if (EatEOL(c)) break;
-
+
+ if ( !m_input )
+ break;
+
+ if (EatEOL(c))
+ break;
+
line += c;
}
wxString wxTextInputStream::ReadWord()
{
- if (!m_input) return "";
-
wxString word;
- wxChar c=NextNonSeparators();
- if (c==(wxChar)0) return "";
- for (;;)
- {
- if (m_separators.Contains(c)) break;
-
- if (EatEOL(c)) break;
-
- word += c;
+ if ( !m_input )
+ return word;
+
+ wxChar c = NextNonSeparators();
+ if ( !c )
+ return word;
- if (!m_input) break;
+ word += c;
+
+ while ( !m_input.Eof() )
+ {
c = m_input.GetC();
+
+ if (!m_input)
+ break;
+
+ if (m_separators.Contains(c))
+ break;
+
+ if (EatEOL(c))
+ break;
+
+ word += c;
}
return word;
wxTextInputStream& wxTextInputStream::operator>>(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;
}
{
#if defined(__WXMSW__) || defined(__WXPM__)
m_mode = wxEOL_DOS;
-#elif defined(__WXMAC__)
+#elif defined(__WXMAC__) && !defined(__DARWIN__)
m_mode = wxEOL_MAC;
#else
m_mode = wxEOL_UNIX;
{
#if defined(__WXMSW__) || defined(__WXPM__)
m_mode = wxEOL_DOS;
-#elif defined(__WXMAC__)
+#elif defined(__WXMAC__) && !defined(__DARWIN__)
m_mode = wxEOL_MAC;
#else
m_mode = wxEOL_UNIX;
void wxTextOutputStream::WriteString(const wxString& string)
{
- for (size_t i = 0; i < string.Len(); i++)
+ size_t len = string.length();
+
+ wxString out;
+ out.reserve(len);
+
+ for ( size_t i = 0; i < len; i++ )
{
- wxChar c = string[i];
- if (c == wxT('\n'))
+ const wxChar c = string[i];
+ if ( c == wxT('\n') )
{
- 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) );
+ 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
+ ;
}
}
- else
- {
- m_output.Write( (const void*)(&c), sizeof(wxChar) );
- }
+
+ out << c;
}
+
+ // NB: we don't need to write the trailing NUL here
+ m_output.Write(out.c_str(), out.length() * sizeof(wxChar));
}
wxTextOutputStream& wxTextOutputStream::operator<<(const wxChar *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;
}
wxString str;
str.Printf(wxT("%d"), (signed int)c);
WriteString(str);
-
+
return *this;
}
wxString str;
str.Printf(wxT("%ld"), (signed long)c);
WriteString(str);
-
+
return *this;
}
wxString str;
str.Printf(wxT("%u"), (unsigned int)c);
WriteString(str);
-
+
return *this;
}
projects / wxWidgets.git / blobdiff