Use some FXSYS methods instead of duplicating

xfa/fgas/localization/fgas_locale.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include <algorithm>
 
 #include "core/fxcrt/include/fx_ext.h"
 #include "core/fxcrt/include/fx_xml.h"
@@ skipping 68 matching lines @@
   iEnd = iStart + 2;
   while (iStart < iLen && iStart < iEnd) {
     tz.tzMinute = tz.tzMinute * 10 + pStr[iStart++] - '0';
   }
   if (pStr[0] == '-') {
     tz.tzHour = -tz.tzHour;
   }
   return iStart;
 }
 
-static FX_BOOL FX_IsDigit(FX_WCHAR c) {
-  return c >= '0' && c <= '9';
-}
-static FX_BOOL FX_IsAlpha(FX_WCHAR c) {
-  return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
-}
-static FX_BOOL FX_IsSpace(FX_WCHAR c) {
-  return (c == 0x20) || (c == 0x0d) || (c == 0x0a) || (c == 0x09);
-}
-static const FX_FLOAT gs_fraction_scales[] = {
-    0.1f,         0.01f,         0.001f,        0.0001f,
-    0.00001f,     0.000001f,     0.0000001f,    0.00000001f,
-    0.000000001f, 0.0000000001f, 0.00000000001f};
-static const int32_t gs_fraction_count =
-    sizeof(gs_fraction_scales) / sizeof(FX_FLOAT);
-
 class CFX_LCNumeric {
  public:
   CFX_LCNumeric();
   CFX_LCNumeric(int64_t integral,
                 uint32_t fractional = 0,
                 int32_t exponent = 0);
   CFX_LCNumeric(FX_FLOAT dbRetValue);
   CFX_LCNumeric(double dbvalue);
   CFX_LCNumeric(CFX_WideString& wsNumeric);
 
@@ skipping 15 matching lines @@
 
   if (wsValue.IsEmpty())
     return FALSE;
 
   const int32_t nIntegralMaxLen = 17;
   int32_t cc = 0;
   bool bNegative = false;
   bool bExpSign = false;
   const FX_WCHAR* str = wsValue.c_str();
   int32_t len = wsValue.GetLength();
-  while (cc < len && FX_IsSpace(str[cc]))
+  while (cc < len && FXSYS_iswspace(str[cc]))
     cc++;
 
   if (cc >= len)
     return FALSE;
 
   if (str[cc] == '+') {
     cc++;
   } else if (str[cc] == '-') {
     bNegative = true;
     cc++;
   }
   int32_t nIntegralLen = 0;
   while (cc < len) {
     if (str[cc] == '.')
       break;
 
-    if (!FX_IsDigit(str[cc])) {
+    if (!FXSYS_isDecimalDigit(str[cc])) {
       if ((str[cc] == 'E' || str[cc] == 'e'))
         break;
       else

[Lei Zhang, 2016/06/23 20:42:08]

no need, ditto for line 170

[dsinclair, 2016/06/23 20:45:48]

Done.

         return FALSE;
     }
     if (nIntegralLen < nIntegralMaxLen) {
       lcnum.m_Integral = lcnum.m_Integral * 10 + str[cc] - '0';
       nIntegralLen++;
     }
     cc++;
   }
 
   lcnum.m_Integral = bNegative ? -lcnum.m_Integral : lcnum.m_Integral;
   if (cc < len && str[cc] == '.') {
     int scale = 0;
     double fraction = 0.0;
     cc++;
     while (cc < len) {
-      if (scale >= gs_fraction_count) {
+      if (scale >= FXSYS_FractionalScaleCount()) {
         while (cc < len) {
-          if (!FX_IsDigit(str[cc]))
+          if (!FXSYS_isDecimalDigit(str[cc]))
             break;
           cc++;
         }
       }
-      if (!FX_IsDigit(str[cc])) {
+      if (!FXSYS_isDecimalDigit(str[cc])) {
         if ((str[cc] == 'E' || str[cc] == 'e'))
           break;
         else
           return FALSE;
       }
-      fraction += gs_fraction_scales[scale] * (str[cc] - '0');
+      fraction += FXSYS_FractionalScale(scale, FXSYS_toDecimalDigit(str[cc]));
       scale++;
       cc++;
     }
     lcnum.m_Fractional = (uint32_t)(fraction * 4294967296.0);
   }
   if (cc < len && (str[cc] == 'E' || str[cc] == 'e')) {
     cc++;
     if (cc < len) {
       if (str[cc] == '+') {
         cc++;
       } else if (str[cc] == '-') {
         bExpSign = true;
         cc++;
       }
     }
     while (cc < len) {
-      if (FX_IsDigit(str[cc]))
+      if (FXSYS_isDecimalDigit(str[cc]))
         return FALSE;
       lcnum.m_Exponent = lcnum.m_Exponent * 10 + str[cc] - '0';
       cc++;
     }
     lcnum.m_Exponent = bExpSign ? -lcnum.m_Exponent : lcnum.m_Exponent;
   }
   return TRUE;
 }
 
 CFX_LCNumeric::CFX_LCNumeric() {
@@ skipping 466 matching lines @@
         if (iText + iLiteralLen > iLenText ||
             FXSYS_wcsncmp(pStrText + iText, wsLiteral.c_str(), iLiteralLen)) {
           wsValue = wsSrcText;
           return FALSE;
         }
         iText += iLiteralLen;
         iPattern++;
         break;
       }
       case 'A':
-        if (FX_IsAlpha(pStrText[iText])) {
+        if (FXSYS_iswalpha(pStrText[iText])) {
           wsValue += pStrText[iText];
           iText++;
         }
         iPattern++;
         break;
       case 'X':
         wsValue += pStrText[iText];
         iText++;
         iPattern++;
         break;
       case 'O':
       case '0':
-        if (FX_IsDigit(pStrText[iText]) || FX_IsAlpha(pStrText[iText])) {
+        if (FXSYS_isDecimalDigit(pStrText[iText]) ||
+            FXSYS_iswalpha(pStrText[iText])) {
           wsValue += pStrText[iText];
           iText++;
         }
         iPattern++;
         break;
       case '9':
-        if (FX_IsDigit(pStrText[iText])) {
+        if (FXSYS_isDecimalDigit(pStrText[iText])) {
           wsValue += pStrText[iText];
           iText++;
         }
         iPattern++;
         break;
       default:
         if (pStrPattern[iPattern] != pStrText[iText]) {
           wsValue = wsSrcText;
           return FALSE;
         }
@@ skipping 55 matching lines @@
           cc -= iLiteralLen - 1;
           if (cc < 0 ||
               FXSYS_wcsncmp(str + cc, wsLiteral.c_str(), iLiteralLen)) {
             return FALSE;
           }
           cc--;
           ccf--;
           break;
         }
         case '9':
-          if (!FX_IsDigit(str[cc])) {
+          if (!FXSYS_isDecimalDigit(str[cc])) {
             return FALSE;
           }
           dbRetValue = dbRetValue * coeff + (str[cc] - '0') * 0.1;
           coeff *= 0.1;
           cc--;
           ccf--;
           break;
         case 'z':
           if (cc >= 0) {
             dbRetValue = dbRetValue * coeff + (str[cc] - '0') * 0.1;
@@ skipping 38 matching lines @@
           break;
         case 'E': {
           if (cc >= dot_index) {
             return FALSE;
           }
           FX_BOOL bExpSign = FALSE;
           while (cc >= 0) {
             if (str[cc] == 'E' || str[cc] == 'e') {
               break;
             }
-            if (FX_IsDigit(str[cc])) {
+            if (FXSYS_isDecimalDigit(str[cc])) {
               iExponent = iExponent + (str[cc] - '0') * 10;
               cc--;
               continue;
             } else if (str[cc] == '+') {
               cc--;
               continue;
             } else if (cc - iMinusLen + 1 > 0 &&
                        !FXSYS_wcsncmp(str + (cc - iMinusLen + 1),
                                       wsMinus.c_str(), iMinusLen)) {
               bExpSign = TRUE;
@@ skipping 80 matching lines @@
             return FALSE;
           }
           cc--;
           ccf--;
           bHavePercentSymbol = TRUE;
         } break;
         case '8':
           while (ccf < lenf && strf[ccf] == '8') {
             ccf++;
           }
-          while (cc < len && FX_IsDigit(str[cc])) {
+          while (cc < len && FXSYS_isDecimalDigit(str[cc])) {
             dbRetValue = (str[cc] - '0') * coeff + dbRetValue;
             coeff *= 0.1;
             cc++;
           }
           break;
         case ',': {
           if (cc >= 0) {
             cc -= iGroupLen - 1;
             if (cc >= 0 &&
                 FXSYS_wcsncmp(str + cc, wsGroupSymbol.c_str(), iGroupLen) ==
@@ skipping 43 matching lines @@
         int32_t iLiteralLen = wsLiteral.GetLength();
         cc -= iLiteralLen - 1;
         if (cc < 0 || FXSYS_wcsncmp(str + cc, wsLiteral.c_str(), iLiteralLen)) {
           return FALSE;
         }
         cc--;
         ccf--;
         break;
       }
       case '9':
-        if (!FX_IsDigit(str[cc])) {
+        if (!FXSYS_isDecimalDigit(str[cc])) {
           return FALSE;
         }
         dbRetValue = dbRetValue + (str[cc] - '0') * coeff;
         coeff *= 10;
         cc--;
         ccf--;
         break;
       case 'z':
-        if (FX_IsDigit(str[cc])) {
+        if (FXSYS_isDecimalDigit(str[cc])) {
           dbRetValue = dbRetValue + (str[cc] - '0') * coeff;
           coeff *= 10;
           cc--;
         }
         ccf--;
         break;
       case 'Z':
         if (str[cc] != ' ') {
-          if (FX_IsDigit(str[cc])) {
+          if (FXSYS_isDecimalDigit(str[cc])) {
             dbRetValue = dbRetValue + (str[cc] - '0') * coeff;
             coeff *= 10;
             cc--;
           }
         } else {
           cc--;
         }
         ccf--;
         break;
       case 'S':
@@ skipping 24 matching lines @@
         break;
       case 'E': {
         if (cc >= dot_index) {
           return FALSE;
         }
         FX_BOOL bExpSign = FALSE;
         while (cc >= 0) {
           if (str[cc] == 'E' || str[cc] == 'e') {
             break;
           }
-          if (FX_IsDigit(str[cc])) {
+          if (FXSYS_isDecimalDigit(str[cc])) {
             iExponent = iExponent + (str[cc] - '0') * 10;
             cc--;
             continue;
           } else if (str[cc] == '+') {
             cc--;
             continue;
           } else if (cc - iMinusLen + 1 > 0 &&
                      !FXSYS_wcsncmp(str + (cc - iMinusLen + 1), wsMinus.c_str(),
                                     iMinusLen)) {
             bExpSign = TRUE;
@@ skipping 135 matching lines @@
           int32_t iLiteralLen = wsLiteral.GetLength();
           if (cc + iLiteralLen > len ||
               FXSYS_wcsncmp(str + cc, wsLiteral.c_str(), iLiteralLen)) {
             return FALSE;
           }
           cc += iLiteralLen;
           ccf++;
           break;
         }
         case '9':
-          if (!FX_IsDigit(str[cc])) {
+          if (!FXSYS_isDecimalDigit(str[cc])) {
             return FALSE;
           }
           {
             dbRetValue = dbRetValue + (str[cc] - '0') * coeff;
             coeff *= 0.1;
           }
           cc++;
           ccf++;
           break;
         case 'z':
-          if (FX_IsDigit(str[cc])) {
+          if (FXSYS_isDecimalDigit(str[cc])) {
             dbRetValue = dbRetValue + (str[cc] - '0') * coeff;
             coeff *= 0.1;
             cc++;
           }
           ccf++;
           break;
         case 'Z':
           if (str[cc] != ' ') {
-            if (FX_IsDigit(str[cc])) {
+            if (FXSYS_isDecimalDigit(str[cc])) {
               dbRetValue = dbRetValue + (str[cc] - '0') * coeff;
               coeff *= 0.1;
               cc++;
             }
           } else {
             cc++;
           }
           ccf++;
           break;
         case 'S':
@@ skipping 30 matching lines @@
           cc++;
           if (cc < len) {
             if (str[cc] == '+') {
               cc++;
             } else if (str[cc] == '-') {
               bExpSign = TRUE;
               cc++;
             }
           }
           while (cc < len) {
-            if (!FX_IsDigit(str[cc])) {
+            if (!FXSYS_isDecimalDigit(str[cc])) {
               break;
             }
             iExponent = iExponent * 10 + str[cc] - '0';
             cc++;
           }
           iExponent = bExpSign ? -iExponent : iExponent;
           ccf++;
         } break;
         case '$': {
           CFX_WideString wsSymbol;
@@ skipping 59 matching lines @@
               !FXSYS_wcsncmp(str + cc, wsSymbol.c_str(), iSysmbolLen)) {
             cc += iSysmbolLen;
           }
           ccf++;
           bHavePercentSymbol = TRUE;
         } break;
         case '8': {
           while (ccf < lenf && strf[ccf] == '8') {
             ccf++;
           }
-          while (cc < len && FX_IsDigit(str[cc])) {
+          while (cc < len && FXSYS_isDecimalDigit(str[cc])) {
             dbRetValue = (str[cc] - '0') * coeff + dbRetValue;
             coeff *= 0.1;
             cc++;
           }
         } break;
         case ',': {
           if (cc + iGroupLen <= len &&
               FXSYS_wcsncmp(str + cc, wsGroupSymbol.c_str(), iGroupLen) == 0) {
             cc += iGroupLen;
           }
@@ skipping 89 matching lines @@
         int32_t iLiteralLen = wsLiteral.GetLength();
         cc -= iLiteralLen - 1;
         if (cc < 0 || FXSYS_wcsncmp(str + cc, wsLiteral.c_str(), iLiteralLen)) {
           return FALSE;
         }
         cc--;
         ccf--;
         break;
       }
       case '9':
-        if (!FX_IsDigit(str[cc])) {
+        if (!FXSYS_isDecimalDigit(str[cc])) {
           return FALSE;
         }
         wsValue = str[cc] + wsValue;
         cc--;
         ccf--;
         break;
       case 'z':
-        if (FX_IsDigit(str[cc])) {
+        if (FXSYS_isDecimalDigit(str[cc])) {
           wsValue = str[cc] + wsValue;
           cc--;
         }
         ccf--;
         break;
       case 'Z':
         if (str[cc] != ' ') {
-          if (FX_IsDigit(str[cc])) {
+          if (FXSYS_isDecimalDigit(str[cc])) {
             wsValue = str[cc] + wsValue;
             cc--;
           }
         } else {
           cc--;
         }
         ccf--;
         break;
       case 'S':
         if (str[cc] == '+' || str[cc] == ' ') {
@@ skipping 23 matching lines @@
         break;
       case 'E': {
         if (cc >= dot_index) {
           return FALSE;
         }
         FX_BOOL bExpSign = FALSE;
         while (cc >= 0) {
           if (str[cc] == 'E' || str[cc] == 'e') {
             break;
           }
-          if (FX_IsDigit(str[cc])) {
+          if (FXSYS_isDecimalDigit(str[cc])) {
             iExponent = iExponent + (str[cc] - '0') * 10;
             cc--;
             continue;
           } else if (str[cc] == '+') {
             cc--;
             continue;
           } else if (cc - iMinusLen + 1 > 0 &&
                      !FXSYS_wcsncmp(str + (cc - iMinusLen + 1), wsMinus.c_str(),
                                     iMinusLen)) {
             bExpSign = TRUE;
@@ skipping 143 matching lines @@
           int32_t iLiteralLen = wsLiteral.GetLength();
           if (cc + iLiteralLen > len ||
               FXSYS_wcsncmp(str + cc, wsLiteral.c_str(), iLiteralLen)) {
             return FALSE;
           }
           cc += iLiteralLen;
           ccf++;
           break;
         }
         case '9':
-          if (!FX_IsDigit(str[cc])) {
+          if (!FXSYS_isDecimalDigit(str[cc])) {
             return FALSE;
           }
           { wsValue += str[cc]; }
           cc++;
           ccf++;
           break;
         case 'z':
-          if (FX_IsDigit(str[cc])) {
+          if (FXSYS_isDecimalDigit(str[cc])) {
             wsValue += str[cc];
             cc++;
           }
           ccf++;
           break;
         case 'Z':
           if (str[cc] != ' ') {
-            if (FX_IsDigit(str[cc])) {
+            if (FXSYS_isDecimalDigit(str[cc])) {
               wsValue += str[cc];
               cc++;
             }
           } else {
             cc++;
           }
           ccf++;
           break;
         case 'S':
           if (str[cc] == '+' || str[cc] == ' ') {
@@ skipping 29 matching lines @@
           cc++;
           if (cc < len) {
             if (str[cc] == '+') {
               cc++;
             } else if (str[cc] == '-') {
               bExpSign = TRUE;
               cc++;
             }
           }
           while (cc < len) {
-            if (!FX_IsDigit(str[cc])) {
+            if (!FXSYS_isDecimalDigit(str[cc])) {
               break;
             }
             iExponent = iExponent * 10 + str[cc] - '0';
             cc++;
           }
           iExponent = bExpSign ? -iExponent : iExponent;
           ccf++;
         } break;
         case '$': {
           CFX_WideString wsSymbol;
@@ skipping 59 matching lines @@
               !FXSYS_wcsncmp(str + cc, wsSymbol.c_str(), iSysmbolLen)) {
             cc += iSysmbolLen;
           }
           ccf++;
           bHavePercentSymbol = TRUE;
         } break;
         case '8': {
           while (ccf < lenf && strf[ccf] == '8') {
             ccf++;
           }
-          while (cc < len && FX_IsDigit(str[cc])) {
+          while (cc < len && FXSYS_isDecimalDigit(str[cc])) {
             wsValue += str[cc];
             cc++;
           }
         } break;
         case ',': {
           if (cc + iGroupLen <= len &&
               FXSYS_wcsncmp(str + cc, wsGroupSymbol.c_str(), iGroupLen) == 0) {
             cc += iGroupLen;
           }
           ccf++;
@@ skipping 214 matching lines @@
       continue;
     }
     uint32_t dwSymbolNum = 1;
     FX_WCHAR dwCharSymbol = strf[ccf++];
     while (ccf < lenf && strf[ccf] == dwCharSymbol) {
       ccf++;
       dwSymbolNum++;
     }
     uint32_t dwSymbol = (dwCharSymbol << 8) | (dwSymbolNum + '0');
     if (dwSymbol == FXBSTR_ID(0, 0, 'D', '1')) {
-      if (!FX_IsDigit(str[cc])) {
+      if (!FXSYS_isDecimalDigit(str[cc])) {
         return FALSE;
       }
       day = str[cc++] - '0';
-      if (cc < len && FX_IsDigit(str[cc])) {
+      if (cc < len && FXSYS_isDecimalDigit(str[cc])) {
         day = day * 10 + str[cc++] - '0';
       }
     } else if (dwSymbol == FXBSTR_ID(0, 0, 'D', '2')) {
-      if (!FX_IsDigit(str[cc])) {
+      if (!FXSYS_isDecimalDigit(str[cc])) {
         return FALSE;
       }
       day = str[cc++] - '0';
       if (cc < len) {
         day = day * 10 + str[cc++] - '0';
       }
     } else if (dwSymbol == FXBSTR_ID(0, 0, 'J', '1')) {
       int i = 0;
-      while (cc < len && i < 3 && FX_IsDigit(str[cc])) {
+      while (cc < len && i < 3 && FXSYS_isDecimalDigit(str[cc])) {
         cc++;
         i++;
       }
     } else if (dwSymbol == FXBSTR_ID(0, 0, 'J', '3')) {
       cc += 3;
     } else if (dwSymbol == FXBSTR_ID(0, 0, 'M', '1')) {
-      if (!FX_IsDigit(str[cc])) {
+      if (!FXSYS_isDecimalDigit(str[cc])) {
         return FALSE;
       }
       month = str[cc++] - '0';
-      if (cc < len && FX_IsDigit(str[cc])) {
+      if (cc < len && FXSYS_isDecimalDigit(str[cc])) {
         month = month * 10 + str[cc++] - '0';
       }
     } else if (dwSymbol == FXBSTR_ID(0, 0, 'M', '2')) {
-      if (!FX_IsDigit(str[cc])) {
+      if (!FXSYS_isDecimalDigit(str[cc])) {
         return FALSE;
       }
       month = str[cc++] - '0';
       if (cc < len) {
         month = month * 10 + str[cc++] - '0';
       }
     } else if (dwSymbol == FXBSTR_ID(0, 0, 'M', '3')) {
       CFX_WideString wsMonthNameAbbr;
       uint16_t i = 0;
       for (; i < 12; i++) {
@@ skipping 62 matching lines @@
         cc += wsDayName.GetLength();
       }
     } else if (dwSymbol == FXBSTR_ID(0, 0, 'e', '1')) {
       cc += 1;
     } else if (dwSymbol == FXBSTR_ID(0, 0, 'G', '1')) {
       cc += 2;
     } else if (dwSymbol == FXBSTR_ID(0, 0, 'Y', '2')) {
       if (cc + 2 > len) {
         return FALSE;
       }
-      if (!FX_IsDigit(str[cc])) {
+      if (!FXSYS_isDecimalDigit(str[cc])) {
         return FALSE;
       }
       year = str[cc++] - '0';
-      if (cc >= len || !FX_IsDigit(str[cc])) {
+      if (cc >= len || !FXSYS_isDecimalDigit(str[cc])) {
         return FALSE;
       }
       year = year * 10 + str[cc++] - '0';
       if (year <= 29) {
         year += 2000;
       } else {
         year += 1900;
       }
     } else if (dwSymbol == FXBSTR_ID(0, 0, 'Y', '4')) {
       int i = 0;
       year = 0;
       if (cc + 4 > len) {
         return FALSE;
       }
       while (i < 4) {
-        if (!FX_IsDigit(str[cc])) {
+        if (!FXSYS_isDecimalDigit(str[cc])) {
           return FALSE;
         }
         year = year * 10 + str[cc] - '0';
         cc++;
         i++;
       }
     } else if (dwSymbol == FXBSTR_ID(0, 0, 'w', '1')) {
       cc += 1;
     } else if (dwSymbol == FXBSTR_ID(0, 0, 'W', '2')) {
       cc += 2;
@@ skipping 66 matching lines @@
     FX_WCHAR dwCharSymbol = strf[ccf++];
     while (ccf < lenf && strf[ccf] == dwCharSymbol) {
       ccf++;
       dwSymbolNum++;
     }
     uint32_t dwSymbol = (dwCharSymbol << 8) | (dwSymbolNum + '0');
     if (dwSymbol == FXBSTR_ID(0, 0, 'k', '1') ||
         dwSymbol == FXBSTR_ID(0, 0, 'H', '1') ||
         dwSymbol == FXBSTR_ID(0, 0, 'h', '1') ||
         dwSymbol == FXBSTR_ID(0, 0, 'K', '1')) {
-      if (!FX_IsDigit(str[cc])) {
+      if (!FXSYS_isDecimalDigit(str[cc])) {
         return FALSE;
       }
       hour = str[cc++] - '0';
-      if (cc < len && FX_IsDigit(str[cc])) {
+      if (cc < len && FXSYS_isDecimalDigit(str[cc])) {
         hour = hour * 10 + str[cc++] - '0';
       }
       if (dwSymbol == FXBSTR_ID(0, 0, 'K', '1') && hour == 24) {
         hour = 0;
       }
     } else if (dwSymbol == FXBSTR_ID(0, 0, 'k', '2') ||
                dwSymbol == FXBSTR_ID(0, 0, 'H', '2') ||
                dwSymbol == FXBSTR_ID(0, 0, 'h', '2') ||
                dwSymbol == FXBSTR_ID(0, 0, 'K', '2')) {
-      if (!FX_IsDigit(str[cc])) {
+      if (!FXSYS_isDecimalDigit(str[cc])) {
         return FALSE;
       }
       hour = str[cc++] - '0';
       if (cc >= len) {
         return FALSE;
       }
-      if (!FX_IsDigit(str[cc])) {
+      if (!FXSYS_isDecimalDigit(str[cc])) {
         return FALSE;
       }
       hour = hour * 10 + str[cc++] - '0';
       if (dwSymbol == FXBSTR_ID(0, 0, 'K', '2') && hour == 24) {
         hour = 0;
       }
     } else if (dwSymbol == FXBSTR_ID(0, 0, 'M', '1')) {
-      if (!FX_IsDigit(str[cc])) {
+      if (!FXSYS_isDecimalDigit(str[cc])) {
         return FALSE;
       }
       minute = str[cc++] - '0';
-      if (cc < len && FX_IsDigit(str[cc])) {
+      if (cc < len && FXSYS_isDecimalDigit(str[cc])) {
         minute = minute * 10 + str[cc++] - '0';
       }
     } else if (dwSymbol == FXBSTR_ID(0, 0, 'M', '2')) {
-      if (!FX_IsDigit(str[cc])) {
+      if (!FXSYS_isDecimalDigit(str[cc])) {
         return FALSE;
       }
       minute = str[cc++] - '0';
       if (cc >= len) {
         return FALSE;
       }
-      if (!FX_IsDigit(str[cc])) {
+      if (!FXSYS_isDecimalDigit(str[cc])) {
         return FALSE;
       }
       minute = minute * 10 + str[cc++] - '0';
     } else if (dwSymbol == FXBSTR_ID(0, 0, 'S', '1')) {
-      if (!FX_IsDigit(str[cc])) {
+      if (!FXSYS_isDecimalDigit(str[cc])) {
         return FALSE;
       }
       second = str[cc++] - '0';
-      if (cc < len && FX_IsDigit(str[cc])) {
+      if (cc < len && FXSYS_isDecimalDigit(str[cc])) {
         second = second * 10 + str[cc++] - '0';
       }
     } else if (dwSymbol == FXBSTR_ID(0, 0, 'S', '2')) {
-      if (!FX_IsDigit(str[cc])) {
+      if (!FXSYS_isDecimalDigit(str[cc])) {
         return FALSE;
       }
       second = str[cc++] - '0';
       if (cc >= len) {
         return FALSE;
       }
-      if (!FX_IsDigit(str[cc])) {
+      if (!FXSYS_isDecimalDigit(str[cc])) {
         return FALSE;
       }
       second = second * 10 + str[cc++] - '0';
     } else if (dwSymbol == FXBSTR_ID(0, 0, 'F', '3')) {
       if (cc + 3 >= len) {
         return FALSE;
       }
       int i = 0;
       while (i < 3) {
-        if (!FX_IsDigit(str[cc])) {
+        if (!FXSYS_isDecimalDigit(str[cc])) {
           return FALSE;
         }
         millisecond = millisecond * 10 + str[cc++] - '0';
         i++;
       }
     } else if (dwSymbol == FXBSTR_ID(0, 0, 'A', '1')) {
       CFX_WideString wsAM;
       pLocale->GetMeridiemName(wsAM, TRUE);
       CFX_WideString wsPM;
       pLocale->GetMeridiemName(wsPM, FALSE);
@@ skipping 185 matching lines @@
   const FX_WCHAR* pStrPattern = wsTextFormat.c_str();
   int32_t iLenPattern = wsTextFormat.GetLength();
   while (iPattern < iLenPattern) {
     switch (pStrPattern[iPattern]) {
       case '\'': {
         wsOutput += FX_GetLiteralText(pStrPattern, iPattern, iLenPattern);
         iPattern++;
         break;
       }
       case 'A':
-        if (iText >= iLenText || !FX_IsAlpha(pStrText[iText])) {
+        if (iText >= iLenText || !FXSYS_iswalpha(pStrText[iText])) {
           return FALSE;
         }
         wsOutput += pStrText[iText++];
         iPattern++;
         break;
       case 'X':
         if (iText >= iLenText) {
           return FALSE;
         }
         wsOutput += pStrText[iText++];
         iPattern++;
         break;
       case 'O':
       case '0':
-        if (iText >= iLenText ||
-            (!FX_IsDigit(pStrText[iText]) && !FX_IsAlpha(pStrText[iText]))) {
+        if (iText >= iLenText || (!FXSYS_isDecimalDigit(pStrText[iText]) &&
+                                  !FXSYS_iswalpha(pStrText[iText]))) {
           return FALSE;
         }
         wsOutput += pStrText[iText++];
         iPattern++;
         break;
       case '9':
-        if (iText >= iLenText || !FX_IsDigit(pStrText[iText])) {
+        if (iText >= iLenText || !FXSYS_isDecimalDigit(pStrText[iText])) {
           return FALSE;
         }
         wsOutput += pStrText[iText++];
         iPattern++;
         break;
       default:
         wsOutput += pStrPattern[iPattern++];
         break;
     }
   }
@@ skipping 106 matching lines @@
   int dot_index = wsSrcNum.Find('.');
   if (dot_index == -1) {
     dot_index = len;
   }
   ccf = dot_index_f - 1;
   cc = dot_index - 1;
   while (ccf >= 0) {
     switch (strf[ccf]) {
       case '9':
         if (cc >= 0) {
-          if (!FX_IsDigit(str[cc])) {
+          if (!FXSYS_isDecimalDigit(str[cc])) {
             return FALSE;
           }
           wsOutput = str[cc] + wsOutput;
           cc--;
         } else {
           wsOutput = L'0' + wsOutput;
         }
         ccf--;
         break;
       case 'z':
         if (cc >= 0) {
-          if (!FX_IsDigit(str[cc])) {
+          if (!FXSYS_isDecimalDigit(str[cc])) {
             return FALSE;
           }
           if (str[0] != '0') {
             wsOutput = str[cc] + wsOutput;
           }
           cc--;
         }
         ccf--;
         break;
       case 'Z':
         if (cc >= 0) {
-          if (!FX_IsDigit(str[cc])) {
+          if (!FXSYS_isDecimalDigit(str[cc])) {
             return FALSE;
           }
           if (str[0] == '0') {
             wsOutput = L' ' + wsOutput;
           } else {
             wsOutput = str[cc] + wsOutput;
           }
           cc--;
         } else {
           wsOutput = L' ' + wsOutput;
@@ skipping 159 matching lines @@
   ccf = dot_index_f + 1;
   cc = dot_index + 1;
   while (ccf < lenf) {
     switch (strf[ccf]) {
       case '\'':
         wsOutput += FX_GetLiteralText(strf, ccf, lenf);
         ccf++;
         break;
       case '9':
         if (cc < len) {
-          if (!FX_IsDigit(str[cc])) {
+          if (!FXSYS_isDecimalDigit(str[cc])) {
             return FALSE;
           }
           wsOutput += str[cc];
           cc++;
         } else {
           wsOutput += L'0';
         }
         ccf++;
         break;
       case 'z':
         if (cc < len) {
-          if (!FX_IsDigit(str[cc])) {
+          if (!FXSYS_isDecimalDigit(str[cc])) {
             return FALSE;
           }
           wsOutput += str[cc];
           cc++;
         }
         ccf++;
         break;
       case 'Z':
         if (cc < len) {
-          if (!FX_IsDigit(str[cc])) {
+          if (!FXSYS_isDecimalDigit(str[cc])) {
             return FALSE;
           }
           wsOutput += str[cc];
           cc++;
         } else {
           wsOutput += L'0';
         }
         ccf++;
         break;
       case 'E': {
@@ skipping 54 matching lines @@
         CFX_WideString wsSymbol;
         pLocale->GetNumbericSymbol(FX_LOCALENUMSYMBOL_Percent, wsSymbol);
         wsOutput += wsSymbol;
       }
         ccf++;
         break;
       case '8': {
         while (ccf < lenf && strf[ccf] == '8') {
           ccf++;
         }
-        while (cc < len && FX_IsDigit(str[cc])) {
+        while (cc < len && FXSYS_isDecimalDigit(str[cc])) {
           wsOutput += str[cc];
           cc++;
         }
       } break;
       case ',':
         wsOutput += wsGroupSymbol;
         ccf++;
         break;
       case '(':
         if (bNeg) {
@@ skipping 387 matching lines @@
         CFX_WideString wsSymbol;
         pLocale->GetNumbericSymbol(FX_LOCALENUMSYMBOL_Percent, wsSymbol);
         wsOutput += wsSymbol;
       }
         ccf++;
         break;
       case '8': {
         while (ccf < lenf && strf[ccf] == '8') {
           ccf++;
         }
-        while (cc < len && FX_IsDigit(str[cc])) {
+        while (cc < len && FXSYS_isDecimalDigit(str[cc])) {
           wsOutput += str[cc];
           cc++;
         }
       } break;
       case ',':
         wsOutput += wsGroupSymbol;
         ccf++;
         break;
       case '(':
         if (bNeg) {
@@ skipping 47 matching lines @@
   int32_t month = 1;
   int32_t day = 1;
   uint16_t wYear = 0;
   int cc_start = 0, cc = 0;
   const FX_WCHAR* str = wsDate.c_str();
   int len = wsDate.GetLength();
   if (len > 10) {
     return FALSE;
   }
   while (cc < len && cc < 4) {
-    if (!FX_IsDigit(str[cc])) {
+    if (!FXSYS_isDecimalDigit(str[cc])) {
       return FALSE;
     }
     wYear = wYear * 10 + str[cc++] - '0';
   }
   year = wYear;
   if (cc < 4 || wYear < 1900) {
     return FALSE;
   }
   if (cc < len) {
     if (str[cc] == '-') {
       cc++;
     }
     cc_start = cc;
     uint8_t tmpM = 0;
     while (cc < len && cc < cc_start + 2) {
-      if (!FX_IsDigit(str[cc])) {
+      if (!FXSYS_isDecimalDigit(str[cc])) {
         return FALSE;
       }
       tmpM = tmpM * 10 + str[cc++] - '0';
     }
     month = tmpM;
     if (cc == cc_start + 1 || tmpM > 12 || tmpM < 1) {
       return FALSE;
     }
     if (cc < len) {
       if (str[cc] == '-') {
         cc++;
       }
       uint8_t tmpD = 0;
       cc_start = cc;
       while (cc < len && cc < cc_start + 2) {
-        if (!FX_IsDigit(str[cc])) {
+        if (!FXSYS_isDecimalDigit(str[cc])) {
           return FALSE;
         }
         tmpD = tmpD * 10 + str[cc++] - '0';
       }
       day = tmpD;
       if (tmpD < 1) {
         return FALSE;
       }
       if ((tmpM == 1 || tmpM == 3 || tmpM == 5 || tmpM == 7 || tmpM == 8 ||
            tmpM == 10 || tmpM == 12) &&
@@ skipping 27 matching lines @@
     return FALSE;
   }
   uint8_t hour = 0;
   uint8_t minute = 0;
   uint8_t second = 0;
   uint16_t millisecond = 0;
   int cc_start = 0, cc = cc_start;
   const FX_WCHAR* str = wsTime.c_str();
   int len = wsTime.GetLength();
   while (cc < len && cc < 2) {
-    if (!FX_IsDigit(str[cc])) {
+    if (!FXSYS_isDecimalDigit(str[cc])) {
       return FALSE;
     }
     hour = hour * 10 + str[cc++] - '0';
   }
   if (cc < 2 || hour >= 24) {
     return FALSE;
   }
   if (cc < len) {
     if (str[cc] == ':') {
       cc++;
     }
     cc_start = cc;
     while (cc < len && cc < cc_start + 2) {
-      if (!FX_IsDigit(str[cc])) {
+      if (!FXSYS_isDecimalDigit(str[cc])) {
         return FALSE;
       }
       minute = minute * 10 + str[cc++] - '0';
     }
     if (cc == cc_start + 1 || minute >= 60) {
       return FALSE;
     }
     if (cc < len) {
       if (str[cc] == ':') {
         cc++;
       }
       cc_start = cc;
       while (cc < len && cc < cc_start + 2) {
-        if (!FX_IsDigit(str[cc])) {
+        if (!FXSYS_isDecimalDigit(str[cc])) {
           return FALSE;
         }
         second = second * 10 + str[cc++] - '0';
       }
       if (cc == cc_start + 1 || second >= 60) {
         return FALSE;
       }
       if (cc < len) {
         if (str[cc] == '.') {
           cc++;
           cc_start = cc;
           while (cc < len && cc < cc_start + 3) {
-            if (!FX_IsDigit(str[cc])) {
+            if (!FXSYS_isDecimalDigit(str[cc])) {
               return FALSE;
             }
             millisecond = millisecond * 10 + str[cc++] - '0';
           }
           if (cc < cc_start + 3)
             return FALSE;
         }
         if (cc < len) {
           FX_TIMEZONE tzDiff;
           tzDiff.tzHour = 0;
@@ skipping 1109 matching lines @@
 }
 CFX_Decimal CFX_Decimal::operator*(const CFX_Decimal& val) const {
   return Multiply(val);
 }
 CFX_Decimal CFX_Decimal::operator/(const CFX_Decimal& val) const {
   return Divide(val);
 }
 CFX_Decimal CFX_Decimal::operator%(const CFX_Decimal& val) const {
   return Modulus(val);
 }