minor corrections to TranslateFromUnicodeFormat()

- Don't try to dereference end() iteratorm this will fail (unlike comparing
  pointer with NUL)
- Use prefix rather than postfix increment for iterator
- Use wxUniChar::GetValue() rather than cast to char for consistency with
  other switch statements in the same file

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/datetimefmt.cpp b/src/common/datetimefmt.cpp
index aa0dd5c83e55f3d77297cdbc2614138845eabfb9..8d2c62fab6779c42b0f1b1ac19efbd0f6fee2437 100644 (file)
--- a/src/common/datetimefmt.cpp
+++ b/src/common/datetimefmt.cpp
@@ -1067,26 +1067,28 @@ static wxString GetLocaleDateFormat()
 
 // under OSX locale formats are defined using
 // http://unicode.org/reports/tr35/tr35-6.html#Date_Format_Patterns
 
 // under OSX locale formats are defined using
 // http://unicode.org/reports/tr35/tr35-6.html#Date_Format_Patterns

-// 
+//

 // so we need a translation function, bluntly copied from the windows
 // version above and enhanced with the additional elements needed
 
 // so we need a translation function, bluntly copied from the windows
 // version above and enhanced with the additional elements needed
 

-static wxString TranslateFromUnicodeFormat( const wxString& fmt)
+static wxString TranslateFromUnicodeFormat(const wxString& fmt)

 {
 {

-

     wxString fmtWX;
 
     wxChar chLast = _T('\0');
     size_t lastCount = 0;
     wxString fmtWX;
 
     wxChar chLast = _T('\0');
     size_t lastCount = 0;

-    for ( wxString::const_iterator p = fmt.begin(); /* NUL handled inside */; p++ )
+    for ( wxString::const_iterator p = fmt.begin(); /* end handled inside */; ++p )

     {
     {

-        if ( *p == chLast )
+        if ( p == fmt.end() || *p == chLast )

         {
             lastCount++;
         {
             lastCount++;

+            if ( p == fmt.end() )
+                break;
+

             continue;
         }
 
             continue;
         }
 

-        switch ( (char) *p )
+        switch ( (*p).GetValue() )

         {
             // these characters come in groups, start counting them
             case _T('d'):
         {
             // these characters come in groups, start counting them
             case _T('d'):


@@ -1182,7 +1184,7 @@ static wxString TranslateFromUnicodeFormat( const wxString& fmt)
                                     wxFAIL_MSG( _T("wrong number of 'H's") );
                             }
                             break;
                                     wxFAIL_MSG( _T("wrong number of 'H's") );
                             }
                             break;

-                            
+

                        case _T('h'):
                             switch ( lastCount )
                             {
                        case _T('h'):
                             switch ( lastCount )
                             {


@@ -1208,7 +1210,7 @@ static wxString TranslateFromUnicodeFormat( const wxString& fmt)
                                     wxFAIL_MSG( _T("wrong number of 'm's") );
                             }
                             break;
                                     wxFAIL_MSG( _T("wrong number of 'm's") );
                             }
                             break;

-                            
+

                        case _T('s'):
                             switch ( lastCount )
                             {
                        case _T('s'):
                             switch ( lastCount )
                             {


@@ -1221,7 +1223,7 @@ static wxString TranslateFromUnicodeFormat( const wxString& fmt)
                                     wxFAIL_MSG( _T("wrong number of 's's") );
                             }
                             break;
                                     wxFAIL_MSG( _T("wrong number of 's's") );
                             }
                             break;

-                            
+

                         case _T('g'):
                             // strftime() doesn't have era string,
                             // ignore this format
                         case _T('g'):
                             // strftime() doesn't have era string,
                             // ignore this format


@@ -1239,20 +1241,14 @@ static wxString TranslateFromUnicodeFormat( const wxString& fmt)
 
                 // not a special character so must be just a separator,
                 // treat as is
 
                 // not a special character so must be just a separator,
                 // treat as is

-                if ( *p != _T('\0') )
+                if ( *p == _T('%') )

                 {
                 {

-                    if ( *p == _T('%') )
-                    {
-                        // this one needs to be escaped
-                        fmtWX += _T('%');
-                    }
-
-                    fmtWX += *p;
+                    // this one needs to be escaped
+                    fmtWX += _T('%');

                 }
                 }

-        }

 
 

-        if ( *p == _T('\0') )
-            break;
+                fmtWX += *p;
+        }

     }
 
     return fmtWX;
     }
 
     return fmtWX;


@@ -1261,7 +1257,7 @@ static wxString TranslateFromUnicodeFormat( const wxString& fmt)
 static wxString GetLocaleDateFormat()
 {
     wxCFRef<CFLocaleRef> currentLocale( CFLocaleCopyCurrent() );
 static wxString GetLocaleDateFormat()
 {
     wxCFRef<CFLocaleRef> currentLocale( CFLocaleCopyCurrent() );

- 
+

     wxCFRef<CFDateFormatterRef> dateFormatter( CFDateFormatterCreate
         (NULL, currentLocale, kCFDateFormatterShortStyle, kCFDateFormatterNoStyle));
     wxCFStringRef cfs = wxCFRetain( CFDateFormatterGetFormat(dateFormatter ));
     wxCFRef<CFDateFormatterRef> dateFormatter( CFDateFormatterCreate
         (NULL, currentLocale, kCFDateFormatterShortStyle, kCFDateFormatterNoStyle));
     wxCFStringRef cfs = wxCFRetain( CFDateFormatterGetFormat(dateFormatter ));


@@ -1271,7 +1267,7 @@ static wxString GetLocaleDateFormat()
 static wxString GetLocaleFullDateFormat()
 {
     wxCFRef<CFLocaleRef> currentLocale( CFLocaleCopyCurrent() );
 static wxString GetLocaleFullDateFormat()
 {
     wxCFRef<CFLocaleRef> currentLocale( CFLocaleCopyCurrent() );

- 
+

     wxCFRef<CFDateFormatterRef> dateFormatter( CFDateFormatterCreate
         (NULL, currentLocale, kCFDateFormatterLongStyle, kCFDateFormatterMediumStyle));
     wxCFStringRef cfs = wxCFRetain( CFDateFormatterGetFormat(dateFormatter ));
     wxCFRef<CFDateFormatterRef> dateFormatter( CFDateFormatterCreate
         (NULL, currentLocale, kCFDateFormatterLongStyle, kCFDateFormatterMediumStyle));
     wxCFStringRef cfs = wxCFRetain( CFDateFormatterGetFormat(dateFormatter ));


@@ -1461,7 +1457,7 @@ wxDateTime::ParseFormat(const wxString& date,
                                 hasValidDate = true;
                             }
                         }
                                 hasValidDate = true;
                             }
                         }

-                        
+

                         if ( !hasValidDate )
 #endif // __WXOSX__
                         {
                         if ( !hasValidDate )
 #endif // __WXOSX__
                         {


@@ -1726,12 +1722,12 @@ wxDateTime::ParseFormat(const wxString& date,
                         dt = ParseFormatAt(input, end,
                                            fmtDate, fmtDateAlt);
                     Tm tm;
                         dt = ParseFormatAt(input, end,
                                            fmtDate, fmtDateAlt);
                     Tm tm;

-                    
+

                     if ( !dt.IsValid() )
                     {
                         wxString fmtDateLong = fmtDate;
                         wxString fmtDateLongAlt = fmtDateAlt;
                     if ( !dt.IsValid() )
                     {
                         wxString fmtDateLong = fmtDate;
                         wxString fmtDateLongAlt = fmtDateAlt;

-                        
+

 
                         if ( !fmtDateLong.empty() )
                         {
 
                         if ( !fmtDateLong.empty() )
                         {


@@ -1741,7 +1737,7 @@ wxDateTime::ParseFormat(const wxString& date,
                                            fmtDateLong, fmtDateLongAlt);
                             if ( !dtLong.IsValid() )
                                 return false;
                                            fmtDateLong, fmtDateLongAlt);
                             if ( !dtLong.IsValid() )
                                 return false;

-                                
+

                             tm = dtLong.GetTm();
                         }
                         else
                             tm = dtLong.GetTm();
                         }
                         else