Use some FXSYS methods instead of duplicating

xfa/fxfa/parser/xfa_localevalue.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 "xfa/fxfa/parser/xfa_localevalue.h"
 
+#include "core/fxcrt/include/fx_ext.h"
 #include "xfa/fgas/localization/fgas_localeimp.h"
 #include "xfa/fxfa/parser/xfa_doclayout.h"
 #include "xfa/fxfa/parser/xfa_document.h"
 #include "xfa/fxfa/parser/xfa_localemgr.h"
 #include "xfa/fxfa/parser/xfa_object.h"
 #include "xfa/fxfa/parser/xfa_parser.h"
 #include "xfa/fxfa/parser/xfa_script.h"
 #include "xfa/fxfa/parser/xfa_utils.h"
 
 static const FX_DOUBLE fraction_scales[] = {0.1,
@@ skipping 193 matching lines @@
 FX_FLOAT CXFA_LocaleValue::GetNum() const {
   if (m_bValid && (m_dwType == XFA_VT_BOOLEAN || m_dwType == XFA_VT_INTEGER ||
                    m_dwType == XFA_VT_DECIMAL || m_dwType == XFA_VT_FLOAT)) {
     int64_t nIntegral = 0;
     uint32_t dwFractional = 0;
     int32_t nExponent = 0;
     int cc = 0;
     FX_BOOL bNegative = FALSE, bExpSign = FALSE;
     const FX_WCHAR* str = m_wsValue.c_str();
     int len = m_wsValue.GetLength();
-    while (XFA_IsSpace(str[cc]) && cc < len) {
+    while (FXSYS_iswspace(str[cc]) && cc < len) {
       cc++;
     }
     if (cc >= len) {
       return 0;
     }
     if (str[0] == '+') {
       cc++;
     } else if (str[0] == '-') {
       bNegative = TRUE;
       cc++;
     }
     int nIntegralLen = 0;
     while (cc < len) {
-      if (str[cc] == '.' || !XFA_IsDigit(str[cc]) || nIntegralLen > 17) {
+      if (str[cc] == '.' || !FXSYS_isDecimalDigit(str[cc]) ||
+          nIntegralLen > 17) {
         break;
       }
       nIntegral = nIntegral * 10 + str[cc] - '0';
       cc++;
       nIntegralLen++;
     }
     nIntegral = bNegative ? -nIntegral : nIntegral;
     int scale = 0;
     double fraction = 0.0;
     if (cc < len && str[cc] == '.') {
       cc++;
       while (cc < len) {
         fraction += fraction_scales[scale] * (str[cc] - '0');
         scale++;
         cc++;
         if (scale == sizeof fraction_scales / sizeof(double) ||
-            !XFA_IsDigit(str[cc])) {
+            !FXSYS_isDecimalDigit(str[cc])) {
           break;
         }
       }
       dwFractional = (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 (str[cc] == '.' || !XFA_IsDigit(str[cc])) {
+        if (str[cc] == '.' || !FXSYS_isDecimalDigit(str[cc])) {
           break;
         }
         nExponent = nExponent * 10 + str[cc] - '0';
         cc++;
       }
       nExponent = bExpSign ? -nExponent : nExponent;
     }
     FX_FLOAT fValue = (FX_FLOAT)(dwFractional / 4294967296.0);
     fValue = nIntegral + (nIntegral >= 0 ? fValue : -fValue);
     if (nExponent != 0) {
       fValue *= FXSYS_pow(10, (FX_FLOAT)nExponent);
     }
     return fValue;
   }
   return 0;
 }
 FX_DOUBLE CXFA_LocaleValue::GetDoubleNum() const {
   if (m_bValid && (m_dwType == XFA_VT_BOOLEAN || m_dwType == XFA_VT_INTEGER ||
                    m_dwType == XFA_VT_DECIMAL || m_dwType == XFA_VT_FLOAT)) {
     int64_t nIntegral = 0;
     uint32_t dwFractional = 0;
     int32_t nExponent = 0;
     int32_t cc = 0;
     FX_BOOL bNegative = FALSE, bExpSign = FALSE;
     const FX_WCHAR* str = m_wsValue.c_str();
     int len = m_wsValue.GetLength();
-    while (XFA_IsSpace(str[cc]) && cc < len) {
+    while (FXSYS_iswspace(str[cc]) && cc < len) {
       cc++;
     }
     if (cc >= len) {
       return 0;
     }
     if (str[0] == '+') {
       cc++;
     } else if (str[0] == '-') {
       bNegative = TRUE;
       cc++;
     }
     int32_t nIntegralLen = 0;
     while (cc < len) {
-      if (str[cc] == '.' || !XFA_IsDigit(str[cc]) || nIntegralLen > 17) {
+      if (str[cc] == '.' || !FXSYS_isDecimalDigit(str[cc]) ||
+          nIntegralLen > 17) {
         break;
       }
       nIntegral = nIntegral * 10 + str[cc] - '0';
       cc++;
       nIntegralLen++;
     }
     nIntegral = bNegative ? -nIntegral : nIntegral;
     int32_t scale = 0;
     FX_DOUBLE fraction = 0.0;
     if (cc < len && str[cc] == '.') {
       cc++;
       while (cc < len) {
         fraction += fraction_scales[scale] * (str[cc] - '0');
         scale++;
         cc++;
         if (scale == sizeof fraction_scales / sizeof(FX_DOUBLE) ||
-            !XFA_IsDigit(str[cc])) {
+            !FXSYS_isDecimalDigit(str[cc])) {
           break;
         }
       }
       dwFractional = (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 (str[cc] == '.' || !XFA_IsDigit(str[cc])) {
+        if (str[cc] == '.' || !FXSYS_isDecimalDigit(str[cc])) {
           break;
         }
         nExponent = nExponent * 10 + str[cc] - '0';
         cc++;
       }
       nExponent = bExpSign ? -nExponent : nExponent;
     }
     FX_DOUBLE dValue = (dwFractional / 4294967296.0);
     dValue = nIntegral + (nIntegral >= 0 ? dValue : -dValue);
     if (nExponent != 0) {
@@ skipping 253 matching lines @@
   if (nLen < wCountY || nLen > wCountY + wCountM + wCountD + 2) {
     return FALSE;
   }
   const bool bSymbol = wsDate.Find(0x2D) != -1;
   uint16_t wYear = 0;
   uint16_t wMonth = 0;
   uint16_t wDay = 0;
   const FX_WCHAR* pDate = wsDate.c_str();
   int nIndex = 0, nStart = 0;
   while (pDate[nIndex] != '\0' && nIndex < wCountY) {
-    if (!XFA_IsDigit(pDate[nIndex])) {
+    if (!FXSYS_isDecimalDigit(pDate[nIndex])) {
       return FALSE;
     }
     wYear = (pDate[nIndex] - '0') + wYear * 10;
     nIndex++;
   }
   if (bSymbol) {
     if (pDate[nIndex] != 0x2D) {
       return FALSE;
     }
     nIndex++;
   }
   nStart = nIndex;
   while (pDate[nIndex] != '\0' && nIndex - nStart < wCountM && nIndex < nLen) {
-    if (!XFA_IsDigit(pDate[nIndex])) {
+    if (!FXSYS_isDecimalDigit(pDate[nIndex])) {
       return FALSE;
     }
     wMonth = (pDate[nIndex] - '0') + wMonth * 10;
     nIndex++;
   }
   if (bSymbol) {
     if (pDate[nIndex] != 0x2D) {
       return FALSE;
     }
     nIndex++;
   }
   nStart = nIndex;
   while (pDate[nIndex] != '\0' && nIndex - nStart < wCountD && nIndex < nLen) {
-    if (!XFA_IsDigit(pDate[nIndex])) {
+    if (!FXSYS_isDecimalDigit(pDate[nIndex])) {
       return FALSE;
     }
     wDay = (pDate[nIndex] - '0') + wDay * 10;
     nIndex++;
   }
   if (nIndex != nLen) {
     return FALSE;
   }
   if (wYear < 1900 || wYear > 2029) {
     return FALSE;
@@ skipping 38 matching lines @@
   const uint16_t wCountF = 3;
   const bool bSymbol = wsTime.Find(':') != -1;
   uint16_t wHour = 0;
   uint16_t wMinute = 0;
   uint16_t wSecond = 0;
   uint16_t wFraction = 0;
   const FX_WCHAR* pTime = wsTime.c_str();
   int nIndex = 0;
   int nStart = 0;
   while (nIndex - nStart < wCountH && pTime[nIndex]) {
-    if (!XFA_IsDigit(pTime[nIndex]))
+    if (!FXSYS_isDecimalDigit(pTime[nIndex]))
       return FALSE;
     wHour = pTime[nIndex] - '0' + wHour * 10;
     nIndex++;
   }
   if (bSymbol) {
     if (nIndex < nLen && pTime[nIndex] != ':')
       return FALSE;
     nIndex++;
   }
   nStart = nIndex;
   while (nIndex - nStart < wCountM && nIndex < nLen && pTime[nIndex]) {
-    if (!XFA_IsDigit(pTime[nIndex]))
+    if (!FXSYS_isDecimalDigit(pTime[nIndex]))
       return FALSE;
     wMinute = pTime[nIndex] - '0' + wMinute * 10;
     nIndex++;
   }
   if (bSymbol) {
     if (nIndex < nLen && pTime[nIndex] != ':')
       return FALSE;
     nIndex++;
   }
   nStart = nIndex;
   while (nIndex - nStart < wCountS && nIndex < nLen && pTime[nIndex]) {
-    if (!XFA_IsDigit(pTime[nIndex]))
+    if (!FXSYS_isDecimalDigit(pTime[nIndex]))
       return FALSE;
     wSecond = pTime[nIndex] - '0' + wSecond * 10;
     nIndex++;
   }
   if (wsTime.Find('.') > 0) {
     if (pTime[nIndex] != '.')
       return FALSE;
     nIndex++;
     nStart = nIndex;
     while (nIndex - nStart < wCountF && nIndex < nLen && pTime[nIndex]) {
-      if (!XFA_IsDigit(pTime[nIndex]))
+      if (!FXSYS_isDecimalDigit(pTime[nIndex]))
         return FALSE;
       wFraction = pTime[nIndex] - '0' + wFraction * 10;
       nIndex++;
     }
   }
   if (nIndex < nLen) {
     if (pTime[nIndex] == 'Z') {
       nIndex++;
     } else if (pTime[nIndex] == '-' || pTime[nIndex] == '+') {
       int16_t nOffsetH = 0;
       int16_t nOffsetM = 0;
       nIndex++;
       nStart = nIndex;
       while (nIndex - nStart < wCountH && nIndex < nLen && pTime[nIndex]) {
-        if (!XFA_IsDigit(pTime[nIndex]))
+        if (!FXSYS_isDecimalDigit(pTime[nIndex]))
           return FALSE;
         nOffsetH = pTime[nIndex] - '0' + nOffsetH * 10;
         nIndex++;
       }
       if (bSymbol) {
         if (nIndex < nLen && pTime[nIndex] != ':')
           return FALSE;
         nIndex++;
       }
       nStart = nIndex;
       while (nIndex - nStart < wCountM && nIndex < nLen && pTime[nIndex]) {
-        if (!XFA_IsDigit(pTime[nIndex]))
+        if (!FXSYS_isDecimalDigit(pTime[nIndex]))
           return FALSE;
         nOffsetM = pTime[nIndex] - '0' + nOffsetM * 10;
         nIndex++;
       }
       if (nOffsetH > 12 || nOffsetM >= 60)
         return FALSE;
     }
   }
   return nIndex == nLen && wHour < 24 && wMinute < 60 && wSecond < 60 &&
          wFraction <= 999;
@@ skipping 157 matching lines @@
   if (cf == L's') {
     if (c == L'-' || c == L'+') {
       ++n;
     }
     ++nf;
   }
   FX_BOOL bLimit = TRUE;
   int32_t nCount = wsNumeric.GetLength();
   int32_t nCountFmt = wsFormat.GetLength();
   while (n < nCount && (bLimit ? nf < nCountFmt : TRUE) &&
-         XFA_IsDigit(c = pNum[n])) {
+         FXSYS_isDecimalDigit(c = pNum[n])) {
     if (bLimit == TRUE) {
       if ((cf = pFmt[nf]) == L'*') {
         bLimit = FALSE;
       } else if (cf == L'z') {
         nf++;
       } else {
         return FALSE;
       }
     }
     n++;
@@ skipping 17 matching lines @@
   if (pFmt[nf] != L'.') {
     return FALSE;
   }
   if (wsDecimalSymbol != CFX_WideStringC(c) && c != L'.') {
     return FALSE;
   }
   ++nf;
   ++n;
   bLimit = TRUE;
   while (n < nCount && (bLimit ? nf < nCountFmt : TRUE) &&
-         XFA_IsDigit(c = pNum[n])) {
+         FXSYS_isDecimalDigit(c = pNum[n])) {
     if (bLimit == TRUE) {
       if ((cf = pFmt[nf]) == L'*') {
         bLimit = FALSE;
       } else if (cf == L'z') {
         nf++;
       } else {
         return FALSE;
       }
     }
     n++;
   }
   return n == nCount;
 }