Merge to XFA: Reland "Cleanup some numeric code.""

fpdfsdk/src/javascript/util.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 "util.h"
 
 #include "JS_Context.h"
 #include "JS_Define.h"
 #include "JS_EventHandler.h"
 #include "JS_Object.h"
 #include "JS_Runtime.h"
 #include "JS_Value.h"
 #include "PublicMethods.h"
+#include "core/include/fxcrt/fx_ext.h"
 #include "fpdfsdk/include/javascript/IJavaScript.h"
 #include "resource.h"
 
 #if _FX_OS_ == _FX_ANDROID_
 #include <ctype.h>
 #endif
 
 BEGIN_JS_STATIC_CONST(CJS_Util)
 END_JS_STATIC_CONST()
 
@@ skipping 392 matching lines @@
   for (int iIndex = 0; iIndex < (int)cFormat.size() && itSource < iSize;
        iIndex++) {
     char letter = cFormat[iIndex];
     switch (letter) {
       case '?':
         cPurpose += cSource[itSource];
         itSource++;
         break;
       case 'X': {
         while (itSource < iSize) {
-          if ((cSource[itSource] >= '0' && cSource[itSource] <= '9') ||
+          if (std::isdigit(cSource[itSource]) ||
               (cSource[itSource] >= 'a' && cSource[itSource] <= 'z') ||
               (cSource[itSource] >= 'A' && cSource[itSource] <= 'Z')) {
             cPurpose += cSource[itSource];
             itSource++;
             break;
           }
           itSource++;
         }
         break;
       } break;
       case 'A': {
         while (itSource < iSize) {
           if ((cSource[itSource] >= 'a' && cSource[itSource] <= 'z') ||
               (cSource[itSource] >= 'A' && cSource[itSource] <= 'Z')) {
             cPurpose += cSource[itSource];
             itSource++;
             break;
           }
           itSource++;
         }
         break;
       } break;
       case '9': {
         while (itSource < iSize) {
-          if (cSource[itSource] >= '0' && cSource[itSource] <= '9') {
+          if (std::isdigit(cSource[itSource])) {
             cPurpose += cSource[itSource];
             itSource++;
             break;
           }
           itSource++;
         }
         break;
       }
       case '*': {
         cPurpose.append(cSource, itSource, iSize - itSource);
@@ skipping 60 matching lines @@
     ++nptr;
 
   c = (int)(unsigned char)*nptr++;
   sign = c; /* save sign indication */
   if (c == '-' || c == '+')
     c = (int)(unsigned char)*nptr++; /* skip sign */
 
   total = 0;
 
   while (isdigit(c)) {
-    total = 10 * total + (c - '0');  /* accumulate digit */
+    total = 10 * total + FXSYS_toDecimalDigit(c); /* accumulate digit */
     c = (int)(unsigned char)*nptr++; /* get next char */
   }
 
   return sign == '-' ? -total : total;
 }
 
 FX_BOOL util::byteToChar(IJS_Context* cc,
                          const std::vector<CJS_Value>& params,
                          CJS_Value& vRet,
                          CFX_WideString& sError) {
   int iSize = params.size();
   if (iSize == 0)
     return FALSE;
   int nByte = params[0].ToInt();
   unsigned char cByte = (unsigned char)nByte;
   CFX_WideString csValue;
   csValue.Format(L"%c", cByte);
   vRet = csValue.c_str();
   return TRUE;
 }