untested changes...

[wxWidgets.git] / src / common / textfile.cpp

diff --git a/src/common/textfile.cpp b/src/common/textfile.cpp
index 4347c0618b50c703c6df9121b223c1fd51f0bd43..c70d51d278f3e2db6683ccd23bf7b9b208311a1d 100644 (file)
--- a/src/common/textfile.cpp
+++ b/src/common/textfile.cpp
@@ -2,7 +2,7 @@
 // Name:        textfile.cpp
 // Purpose:     implementation of wxTextFile class
 // Author:      Vadim Zeitlin
 // Name:        textfile.cpp
 // Purpose:     implementation of wxTextFile class
 // Author:      Vadim Zeitlin

-// Modified by: 
+// Modified by:

 // Created:     03.04.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     03.04.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>


@@ -36,19 +36,17 @@
 // ----------------------------------------------------------------------------
 // static variables
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // static variables
 // ----------------------------------------------------------------------------

-  
+

 // default type is the native one
 // default type is the native one

-const wxTextFile::Type wxTextFile::typeDefault = wxTextFile::
-#if   defined(__WXMSW__)
-  Type_Dos;
+const wxTextFileType wxTextFile::typeDefault =
+#if   defined(__WINDOWS__)
+  wxTextFileType_Dos;

 #elif defined(__UNIX__)
 #elif defined(__UNIX__)

-  Type_Unix;
-#elif defined(__MAC__)
-  Type_Mac;
-  // if you feel brave, remove the next line
-  #error  "wxTextFile: code for Mac files is untested."
+  wxTextFileType_Unix;
+#elif defined(__WXMAC__)
+  wxTextFileType_Mac;

 #else
 #else

-  Type_None;
+  wxTextFileType_None;

   #error  "wxTextFile: unsupported platform."
 #endif
 
   #error  "wxTextFile: unsupported platform."
 #endif
 


@@ -73,6 +71,7 @@ wxTextFile::~wxTextFile()
 bool wxTextFile::Open(const wxString& strFile)
 {
   m_strFile = strFile;
 bool wxTextFile::Open(const wxString& strFile)
 {
   m_strFile = strFile;

+

   return Open();
 }
 
   return Open();
 }
 


@@ -95,29 +94,30 @@ bool wxTextFile::Open()
 
 // analyse some lines of the file trying to guess it's type.
 // if it fails, it assumes the native type for our platform.
 
 // 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 );
 
   // scan the file lines
 {
   // file should be opened and we must be in it's beginning
   wxASSERT( m_file.IsOpened() && m_file.Tell() == 0 );
 
   // scan the file lines

-  uint nUnix = 0,     // number of '\n's alone
+  size_t nUnix = 0,     // number of '\n's alone

        nDos  = 0,     // number of '\r\n'
        nMac  = 0;     // number of '\r's
 
   // we take MAX_LINES_SCAN in the beginning, middle and the end of file
   #define MAX_LINES_SCAN    (10)
        nDos  = 0,     // number of '\r\n'
        nMac  = 0;     // number of '\r's
 
   // we take MAX_LINES_SCAN in the beginning, middle and the end of file
   #define MAX_LINES_SCAN    (10)

-  uint nCount = m_aLines.Count() / 3,
+  size_t nCount = m_aLines.Count() / 3,

        nScan =  nCount > 3*MAX_LINES_SCAN ? MAX_LINES_SCAN : nCount / 3;
 
   #define   AnalyseLine(n)              \
     switch ( m_aTypes[n] ) {            \
        nScan =  nCount > 3*MAX_LINES_SCAN ? MAX_LINES_SCAN : nCount / 3;
 
   #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")); \

     }
 
     }
 

-  uint n;
+  size_t n;

   for ( n = 0; n < nScan; n++ )     // the beginning
     AnalyseLine(n);
   for ( n = (nCount - nScan)/2; n < (nCount + nScan)/2; n++ )
   for ( n = 0; n < nScan; n++ )     // the beginning
     AnalyseLine(n);
   for ( n = (nCount - nScan)/2; n < (nCount + nScan)/2; n++ )


@@ -130,21 +130,25 @@ wxTextFile::Type wxTextFile::GuessType() const
   // interpret the results (@@ far from being even 50% fool proof)
   if ( nDos + nUnix + nMac == 0 ) {
     // no newlines at all
   // interpret the results (@@ 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());
+    wxLogWarning(_("'%s' is probably a binary file."), m_strFile.c_str());

   }
   else {
     #define   GREATER_OF(t1, t2) n##t1 == n##t2 ? typeDefault               \
   }
   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__)

     if ( nDos > nUnix )
       return GREATER_OF(Dos, Mac);
     else if ( nDos < nUnix )
       return GREATER_OF(Unix, Mac);
     else {
       // nDos == nUnix
     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 // __WATCOMC__

 
     #undef    GREATER_OF
   }
 
     #undef    GREATER_OF
   }


@@ -159,75 +163,103 @@ bool wxTextFile::Read()
 
   wxString str;
   char ch, chLast = '\0';
 
   wxString str;
   char ch, chLast = '\0';

+  char buf[1024];
+  int n, nRead;

   while ( !m_file.Eof() ) {
   while ( !m_file.Eof() ) {

-    // @@ should really use a buffer for efficiency
-    if ( m_file.Read(&ch, sizeof(ch)) == ofsInvalid ) {
-      // read error
+    nRead = m_file.Read(buf, WXSIZEOF(buf));
+    if ( nRead == wxInvalidOffset ) {
+      // read error (error message already given in wxFile::Read)

       m_file.Close();
       return FALSE;
     }
 
       m_file.Close();
       return FALSE;
     }
 

-    #ifdef  __MAC__
-      #pragma message("wxTextFile::Read() hasn't been tested with Mac files.")
-    #endif
-
-    switch ( ch ) {
-      case '\n':
-        // Dos/Unix line termination
-        m_aLines.Add(str);
-        m_aTypes.Add(chLast == '\r' ? Type_Dos : Type_Unix);
-        str.Empty();
-        chLast = '\n';
-        break;
-
-      case '\r':
-        if ( chLast == '\r' ) {
-          // Mac empty line
-          m_aLines.Add("");
-          m_aTypes.Add(Type_Mac);
-        }
-        else
-          chLast = '\r';
-        break;
-
-      default:
-        if ( chLast == '\r' ) {
-          // Mac line termination
+    for ( n = 0; n < nRead; n++ ) {
+      ch = buf[n];
+      switch ( ch ) {
+        case '\n':
+          // Dos/Unix line termination

           m_aLines.Add(str);
           m_aLines.Add(str);

-          m_aTypes.Add(Type_Mac);
-          str = ch;
-        }
-        else {
-          // add to the current line
-          str += ch;
-        }
+          m_aTypes.Add(chLast == '\r' ? wxTextFileType_Dos
+                                      : wxTextFileType_Unix);
+          str.Empty();
+          chLast = '\n';
+          break;
+
+        case '\r':
+          if ( chLast == '\r' ) {
+            // Mac empty line
+            m_aLines.Add("");
+            m_aTypes.Add(wxTextFileType_Mac);
+          }
+          else
+            chLast = '\r';
+          break;
+
+        default:
+          if ( chLast == '\r' ) {
+            // Mac line termination
+            m_aLines.Add(str);
+            m_aTypes.Add(wxTextFileType_Mac);
+            chLast = ch;
+            str = ch;
+          }
+          else {
+            // add to the current line
+            str += ch;
+          }
+      }

     }
   }
 
   // anything in the last line?
   if ( !str.IsEmpty() ) {
     }
   }
 
   // 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;
 }
 
     m_aLines.Add(str);
   }
 
   return TRUE;
 }
 

-bool wxTextFile::Write(Type typeNew)
+bool wxTextFile::Close()
+{
+    m_aTypes.Clear();
+    m_aLines.Clear();
+    m_nCurLine = 0;
+
+    return TRUE;
+}
+
+bool wxTextFile::Write(wxTextFileType typeNew)

 {
   wxTempFile fileTmp(m_strFile);
 
   if ( !fileTmp.IsOpened() ) {
 {
   wxTempFile fileTmp(m_strFile);
 
   if ( !fileTmp.IsOpened() ) {

-    wxLogError("can't write file '%s' to disk.", m_strFile.c_str());
+    wxLogError(_("can't write file '%s' to disk."), m_strFile.c_str());

     return FALSE;
   }
 
     return FALSE;
   }
 

-  uint nCount = m_aLines.Count();
-  for ( uint n = 0; n < nCount; n++ ) {
-    fileTmp.Write(m_aLines[n] + 
-                  GetEOL(typeNew == Type_None ? m_aTypes[n] : typeNew));
+  size_t nCount = m_aLines.Count();
+  for ( size_t n = 0; n < nCount; n++ ) {
+    fileTmp.Write(m_aLines[n] +
+                  GetEOL(typeNew == wxTextFileType_None ? m_aTypes[n]
+                                                        : typeNew));

   }
 
   // replace the old file with this one
   return fileTmp.Commit();
   }
 
   // replace the old file with this one
   return fileTmp.Commit();

-}
\ No newline at end of file
+}
+
+const wxChar *wxTextFile::GetEOL(wxTextFileType type)
+  {
+    switch ( type ) {
+      case wxTextFileType_None: return _T("");
+      case wxTextFileType_Unix: return _T("\n");
+      case wxTextFileType_Dos:  return _T("\r\n");
+      case wxTextFileType_Mac:  return _T("\r");
+
+      default:
+        wxFAIL_MSG(_T("bad file type in wxTextFile::GetEOL."));
+        return (const wxChar *) NULL;
+    }
+  }
+