///////////////////////////////////////////////////////////////////////////////
-// Name: txtstrm.cpp
+// Name: src/common/txtstrm.cpp
// Purpose: Text stream classes
// Author: Guilhem Lavaux
// Modified by:
// Created: 28/06/98
// RCS-ID: $Id$
// Copyright: (c) Guilhem Lavaux
-// Licence: wxWindows license
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "txtstrm.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#if wxUSE_STREAMS
#include "wx/txtstrm.h"
-#include <ctype.h>
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
+#ifndef WX_PRECOMP
+ #include "wx/crt.h"
+#endif
-// Unix: "\n"
-// Dos: "\r\n"
-// Mac: "\r"
+#include <ctype.h>
// ----------------------------------------------------------------------------
// 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;
+
+ switch ( m_conv->ToWChar(wbuf, WXSIZEOF(wbuf), m_lastBytes, inlen + 1) )
+ {
+ case 0:
+ // this is a bug in converter object as it should either fail
+ // or decode non-empty string to something non-empty
+ wxFAIL_MSG("ToWChar() can't return 0 for non-empty input");
+ break;
+
+ case wxCONV_FAILED:
+ // the buffer probably doesn't contain enough bytes to decode
+ // as a complete character, try with more bytes
+ break;
+
+ default:
+ // if we couldn't decode a single character during the last
+ // loop iteration we shouldn't be able to decode 2 or more of
+ // them with an extra single byte, something fishy is going on
+ wxFAIL_MSG("unexpected decoding result");
+ // fall through nevertheless and return at least something
+
+ case 1:
+ // we finally decoded a character
+ return wbuf[0];
+ }
+ }
+
+ // there should be no encoding which requires more than nine bytes for one
+ // character so something must be wrong with our conversion but we have no
+ // way to signal it from here
+ 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;
}
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), wxT("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), wxT("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)
- 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);
+ if(!m_input) return 0;
+ wxString word = ReadWord();
+ if(word.empty())
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<e;i++)
- f *= f_multiplicator;
- }
- else
- SkipIfEndOfLine( c );
- }
- else
- {
- m_input.Ungetch(c);
- }
-
- f *= theSign;
- return f;
+ return wxStrtod(word.c_str(), 0);
}
+#if WXWIN_COMPATIBILITY_2_6
+
wxString wxTextInputStream::ReadString()
{
return ReadLine();
}
+#endif // WXWIN_COMPATIBILITY_2_6
+
wxString wxTextInputStream::ReadLine()
{
wxString line;
while ( !m_input.Eof() )
{
-#if wxUSE_UNICODE
- // FIXME: this is only works for single byte encodings
- // How-to read a single char in an unkown encoding???
- char buf[10];
- buf[0] = m_input.GetC();
- buf[1] = 0;
-
- wxChar wbuf[2];
- m_conv.MB2WC( wbuf, buf, 2 );
- wxChar c = wbuf[0];
-#else
- char c = m_input.GetC();
-#endif
-
- if ( !m_input )
+ wxChar c = NextChar();
+ if(c == wxEOT)
break;
if (EatEOL(c))
return word;
word += c;
-
+
while ( !m_input.Eof() )
{
- c = m_input.GetC();
-
- if (!m_input)
+ c = NextChar();
+ if(c == wxEOT)
break;
-
- if (m_separators.Contains(c))
+
+ if (m_separators.Find(c) >= 0)
break;
if (EatEOL(c))
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';
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();
#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)
m_mode = mode;
if (m_mode == wxEOL_NATIVE)
{
-#if defined(__WXMSW__) || defined(__WXPM__)
+#if defined(__WINDOWS__) || defined(__WXPM__)
m_mode = wxEOL_DOS;
-#elif defined(__WXMAC__) && !defined(__DARWIN__)
- m_mode = wxEOL_MAC;
#else
m_mode = wxEOL_UNIX;
#endif
wxTextOutputStream::~wxTextOutputStream()
{
+#if wxUSE_UNICODE
+ delete m_conv;
+#endif // wxUSE_UNICODE
}
void wxTextOutputStream::SetMode(wxEOL mode)
m_mode = mode;
if (m_mode == wxEOL_NATIVE)
{
-#if defined(__WXMSW__) || defined(__WXPM__)
+#if defined(__WINDOWS__) || defined(__WXPM__)
m_mode = wxEOL_DOS;
-#elif defined(__WXMAC__) && !defined(__DARWIN__)
- m_mode = wxEOL_MAC;
#else
m_mode = wxEOL_UNIX;
#endif
void wxTextOutputStream::Write16(wxUint16 i)
{
wxString str;
- str.Printf(wxT("%u"), i);
+ str.Printf(wxT("%u"), (unsigned)i);
WriteString(str);
}
void wxTextOutputStream::Write8(wxUint8 i)
{
wxString str;
- str.Printf(wxT("%u"), i);
+ str.Printf(wxT("%u"), (unsigned)i);
WriteString(str);
}
switch ( m_mode )
{
case wxEOL_DOS:
- out << _T("\r\n");
+ out << wxT("\r\n");
continue;
case wxEOL_MAC:
- out << _T('\r');
+ out << wxT('\r');
continue;
default:
- wxFAIL_MSG( _T("unknown EOL mode in wxTextOutputStream") );
+ wxFAIL_MSG( wxT("unknown EOL mode in wxTextOutputStream") );
// fall through
case wxEOL_UNIX:
}
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 );
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;
wxTextOutputStream &endl( wxTextOutputStream &stream )
{
- return stream << wxT('\n');
+ return stream.PutChar(wxT('\n'));
}
#endif
projects / wxWidgets.git / blobdiff