X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7be1f0d91a912a73b110157170124830446e15e1..270a909e20a2c652fd816ad14407113ad0319c9d:/src/common/textfile.cpp diff --git a/src/common/textfile.cpp b/src/common/textfile.cpp index 0a01a6e70e..9b35dfd8de 100644 --- a/src/common/textfile.cpp +++ b/src/common/textfile.cpp @@ -14,42 +14,117 @@ // ============================================================================ #ifdef __GNUG__ -#pragma implementation "textfile.h" + #pragma implementation "textfile.h" #endif #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop + #pragma hdrstop #endif //__BORLANDC__ -#include -#include -#include -#include -#include +#if !wxUSE_FILE + #undef wxUSE_TEXTFILE + #define wxUSE_TEXTFILE 0 +#endif // wxUSE_FILE + +#ifndef WX_PRECOMP + #include "wx/string.h" + #include "wx/intl.h" + #include "wx/file.h" + #include "wx/log.h" +#endif + +#include "wx/textfile.h" // ============================================================================ // wxTextFile class implementation // ============================================================================ // ---------------------------------------------------------------------------- -// static variables +// static methods (always compiled in) // ---------------------------------------------------------------------------- // default type is the native one -const wxTextFile::Type wxTextFile::typeDefault = wxTextFile:: +const wxTextFileType wxTextFile::typeDefault = #if defined(__WINDOWS__) - Type_Dos; + wxTextFileType_Dos; #elif defined(__UNIX__) - Type_Unix; + wxTextFileType_Unix; #elif defined(__WXMAC__) - Type_Mac; + wxTextFileType_Mac; +#elif defined(__WXPM__) + wxTextFileType_Os2; #else - Type_None; + wxTextFileType_None; #error "wxTextFile: unsupported platform." #endif +const wxChar *wxTextFile::GetEOL(wxTextFileType type) +{ + switch ( type ) { + default: + wxFAIL_MSG(wxT("bad file type in wxTextFile::GetEOL.")); + // fall through nevertheless - we must return something... + + case wxTextFileType_None: return wxT(""); + case wxTextFileType_Unix: return wxT("\n"); + case wxTextFileType_Dos: return wxT("\r\n"); + case wxTextFileType_Mac: return wxT("\r"); + } +} + + +wxString wxTextFile::Translate(const wxString& text, wxTextFileType type) +{ + // don't do anything if there is nothing to do + if ( type == wxTextFileType_None ) + return text; + + wxString eol = GetEOL(type), result; + + // optimization: we know that the length of the new string will be about + // the same as the length of the old one, so prealloc memory to aviod + // unnecessary relocations + result.Alloc(text.Len()); + + wxChar chLast = 0; + for ( const wxChar *pc = text.c_str(); *pc; pc++ ) + { + wxChar ch = *pc; + switch ( ch ) { + case '\n': + // Dos/Unix line termination + result += eol; + chLast = '\n'; + break; + + case '\r': + if ( chLast == '\r' ) { + // Mac empty line + result += eol; + } + else + chLast = '\r'; + break; + + default: + if ( chLast == '\r' ) { + // Mac line termination + result += eol; + chLast = ch; + } + else { + // add to the current line + result += ch; + } + } + } + + return result; +} + +#if wxUSE_TEXTFILE // ---------------------------------------------------------------------------- // ctors & dtor @@ -57,6 +132,8 @@ const wxTextFile::Type wxTextFile::typeDefault = wxTextFile:: wxTextFile::wxTextFile(const wxString& strFile) : m_strFile(strFile) { + m_nCurLine = 0; + m_isOpened = FALSE; } wxTextFile::~wxTextFile() @@ -71,6 +148,7 @@ wxTextFile::~wxTextFile() bool wxTextFile::Open(const wxString& strFile) { m_strFile = strFile; + return Open(); } @@ -84,16 +162,16 @@ bool wxTextFile::Open() return FALSE; // read file into memory - bool bRet = Read(); + m_isOpened = Read(); m_file.Close(); - return bRet; + return m_isOpened; } // analyse some lines of the file trying to guess it's type. // if it fails, it assumes the native type for our platform. -wxTextFile::Type wxTextFile::GuessType() const +wxTextFileType wxTextFile::GuessType() const { // file should be opened and we must be in it's beginning wxASSERT( m_file.IsOpened() && m_file.Tell() == 0 ); @@ -110,9 +188,9 @@ wxTextFile::Type wxTextFile::GuessType() const #define AnalyseLine(n) \ switch ( m_aTypes[n] ) { \ - case Type_Unix: nUnix++; break; \ - case Type_Dos: nDos++; break; \ - case Type_Mac: nMac++; break; \ + case wxTextFileType_Unix: nUnix++; break; \ + case wxTextFileType_Dos: nDos++; break; \ + case wxTextFileType_Mac: nMac++; break; \ default: wxFAIL_MSG(_("unknown line terminator")); \ } @@ -126,29 +204,28 @@ wxTextFile::Type wxTextFile::GuessType() const #undef AnalyseLine - // interpret the results (@@ far from being even 50% fool proof) + // interpret the results (FIXME far from being even 50% fool proof) if ( nDos + nUnix + nMac == 0 ) { // no newlines at all wxLogWarning(_("'%s' is probably a binary file."), m_strFile.c_str()); } else { #define GREATER_OF(t1, t2) n##t1 == n##t2 ? typeDefault \ - : n##t1 > n##t2 ? Type_##t1 \ - : Type_##t2 + : n##t1 > n##t2 \ + ? wxTextFileType_##t1 \ + : wxTextFileType_##t2 -// Watcom C++ doesn't seem to be able to handle the macro -#if defined(__WATCOMC__) - return typeDefault; -#else + // Watcom C++ doesn't seem to be able to handle the macro +#if !defined(__WATCOMC__) if ( nDos > nUnix ) return GREATER_OF(Dos, Mac); else if ( nDos < nUnix ) return GREATER_OF(Unix, Mac); else { // nDos == nUnix - return nMac > nDos ? Type_Mac : typeDefault; + return nMac > nDos ? wxTextFileType_Mac : typeDefault; } -#endif +#endif // __WATCOMC__ #undef GREATER_OF } @@ -169,7 +246,6 @@ bool wxTextFile::Read() nRead = m_file.Read(buf, WXSIZEOF(buf)); if ( nRead == wxInvalidOffset ) { // read error (error message already given in wxFile::Read) - m_file.Close(); return FALSE; } @@ -179,7 +255,8 @@ bool wxTextFile::Read() case '\n': // Dos/Unix line termination m_aLines.Add(str); - m_aTypes.Add(chLast == '\r' ? Type_Dos : Type_Unix); + m_aTypes.Add(chLast == '\r' ? wxTextFileType_Dos + : wxTextFileType_Unix); str.Empty(); chLast = '\n'; break; @@ -188,7 +265,7 @@ bool wxTextFile::Read() if ( chLast == '\r' ) { // Mac empty line m_aLines.Add(""); - m_aTypes.Add(Type_Mac); + m_aTypes.Add(wxTextFileType_Mac); } else chLast = '\r'; @@ -198,7 +275,7 @@ bool wxTextFile::Read() if ( chLast == '\r' ) { // Mac line termination m_aLines.Add(str); - m_aTypes.Add(Type_Mac); + m_aTypes.Add(wxTextFileType_Mac); chLast = ch; str = ch; } @@ -212,14 +289,24 @@ bool wxTextFile::Read() // anything in the last line? if ( !str.IsEmpty() ) { - m_aTypes.Add(Type_None); // no line terminator + m_aTypes.Add(wxTextFileType_None); // no line terminator m_aLines.Add(str); } return TRUE; } -bool wxTextFile::Write(Type typeNew) +bool wxTextFile::Close() +{ + m_aTypes.Clear(); + m_aLines.Clear(); + m_nCurLine = 0; + m_isOpened = FALSE; + + return TRUE; +} + +bool wxTextFile::Write(wxTextFileType typeNew) { wxTempFile fileTmp(m_strFile); @@ -231,24 +318,13 @@ bool wxTextFile::Write(Type typeNew) size_t nCount = m_aLines.Count(); for ( size_t n = 0; n < nCount; n++ ) { fileTmp.Write(m_aLines[n] + - GetEOL(typeNew == Type_None ? m_aTypes[n] : typeNew)); + GetEOL(typeNew == wxTextFileType_None ? m_aTypes[n] + : typeNew)); } // replace the old file with this one return fileTmp.Commit(); } -const char *wxTextFile::GetEOL(Type type) - { - switch ( type ) { - case Type_None: return ""; - case Type_Unix: return "\n"; - case Type_Dos: return "\r\n"; - case Type_Mac: return "\r"; - - default: - wxFAIL_MSG("bad file type in wxTextFile::GetEOL."); - return (const char *) NULL; - } - } +#endif // wxUSE_TEXTFILE