Cleanup CJS_PublicMethods

fpdfsdk/src/javascript/PublicMethods.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 "PublicMethods.h"
 
 #include "Field.h"
 #include "JS_Context.h"
@@ skipping 85 matching lines @@
       if (bKXJS)
         return FALSE;
 
       p++;
       c = *p;
       if (c == '+' || c == '-') {
         bKXJS = TRUE;
       } else {
         return FALSE;
       }
-    } else if (!IsDigit(c)) {
+    } else if (!FXSYS_iswdigit(c)) {
       return FALSE;
     }
     p++;
   }
 
   return TRUE;
 }
 
-FX_BOOL CJS_PublicMethods::IsDigit(wchar_t ch) {
-  return (ch >= L'0' && ch <= L'9');
-}
-
-FX_BOOL CJS_PublicMethods::IsDigit(char ch) {
-  return std::isdigit(ch);
-}
-
-FX_BOOL CJS_PublicMethods::IsAlphabetic(wchar_t ch) {
-  return ((ch >= L'a' && ch <= L'z') || (ch >= L'A' && ch <= L'Z'));
-}
-
-FX_BOOL CJS_PublicMethods::IsAlphaNumeric(wchar_t ch) {
-  return (IsDigit(ch) || IsAlphabetic(ch));
-}
-
 FX_BOOL CJS_PublicMethods::maskSatisfied(wchar_t c_Change, wchar_t c_Mask) {
   switch (c_Mask) {
     case L'9':
-      return IsDigit(c_Change);
+      return FXSYS_iswdigit(c_Change);
     case L'A':
-      return IsAlphabetic(c_Change);
+      return FXSYS_iswalpha(c_Change);
     case L'O':
-      return IsAlphaNumeric(c_Change);
+      return FXSYS_iswalnum(c_Change);
     case L'X':
       return TRUE;
     default:
       return (c_Change == c_Mask);
   }
 }
 
 FX_BOOL CJS_PublicMethods::isReservedMaskChar(wchar_t ch) {
   return ch == L'9' || ch == L'A' || ch == L'O' || ch == L'X';
 }
@@ skipping 98 matching lines @@
   }
 
   double dRet = 0;
   p = pStart;
   bAllDigits = TRUE;
   CFX_WideString swDigits;
 
   while (p <= pEnd) {
     c = *p;
 
-    if (IsDigit(c)) {
+    if (FXSYS_iswdigit(c)) {
       swDigits += c;
       bDigitExist = TRUE;
     } else {
       switch (c) {
         case L' ':
           bAllDigits = FALSE;
           break;
         case L'.':
         case L',':
           if (!bDot) {
@@ skipping 121 matching lines @@
                                           int nStart,
                                           int& nSkip,
                                           int nMaxStep) {
   int nRet = 0;
   nSkip = 0;
   for (int i = nStart, sz = string.GetLength(); i < sz; i++) {
     if (i - nStart > 10)
       break;
 
     FX_WCHAR c = string.GetAt(i);
-    if (IsDigit((wchar_t)c)) {
-      nRet = nRet * 10 + FXSYS_toDecimalDigitWide(c);
-      nSkip = i - nStart + 1;
-      if (nSkip >= nMaxStep)
-        break;
-    } else
+    if (!FXSYS_iswdigit(c))
+      break;
+
+    nRet = nRet * 10 + FXSYS_toDecimalDigitWide(c);
+    nSkip = i - nStart + 1;
+    if (nSkip >= nMaxStep)
       break;
   }
 
   return nRet;
 }
 
 CFX_WideString CJS_PublicMethods::ParseStringString(
     const CFX_WideString& string,
     int nStart,
     int& nSkip) {
   CFX_WideString swRet;
   nSkip = 0;
   for (int i = nStart, sz = string.GetLength(); i < sz; i++) {
     FX_WCHAR c = string.GetAt(i);
-    if ((c >= L'a' && c <= L'z') || (c >= L'A' && c <= L'Z')) {
-      swRet += c;
-      nSkip = i - nStart + 1;
-    } else
+    if (!FXSYS_iswdigit(c))
       break;
+
+    swRet += c;
+    nSkip = i - nStart + 1;
   }
 
   return swRet;
 }
 
 double CJS_PublicMethods::ParseNormalDate(const CFX_WideString& value,
-                                          FX_BOOL& bWrongFormat) {
+                                          bool* bWrongFormat) {
   double dt = JS_GetDateTime();
 
   int nYear = JS_GetYearFromTime(dt);
   int nMonth = JS_GetMonthFromTime(dt) + 1;
   int nDay = JS_GetDayFromTime(dt);
   int nHour = JS_GetHourFromTime(dt);
   int nMin = JS_GetMinFromTime(dt);
   int nSec = JS_GetSecFromTime(dt);
 
   int number[3];
 
   int nSkip = 0;
   int nLen = value.GetLength();
   int nIndex = 0;
   int i = 0;
   while (i < nLen) {
     if (nIndex > 2)
       break;
 
     FX_WCHAR c = value.GetAt(i);
-    if (IsDigit((wchar_t)c)) {
+    if (FXSYS_iswdigit(c)) {
       number[nIndex++] = ParseStringInteger(value, i, nSkip, 4);
       i += nSkip;
     } else {
       i++;
     }
   }
 
   if (nIndex == 2) {
     // case2: month/day
     // case3: day/month
     if ((number[0] >= 1 && number[0] <= 12) &&
         (number[1] >= 1 && number[1] <= 31)) {
       nMonth = number[0];
       nDay = number[1];
     } else if ((number[0] >= 1 && number[0] <= 31) &&
                (number[1] >= 1 && number[1] <= 12)) {
       nDay = number[0];
       nMonth = number[1];
     }
 
-    bWrongFormat = FALSE;
+    if (bWrongFormat)
+      *bWrongFormat = false;
   } else if (nIndex == 3) {
     // case1: year/month/day
     // case2: month/day/year
     // case3: day/month/year
 
     if (number[0] > 12 && (number[1] >= 1 && number[1] <= 12) &&
         (number[2] >= 1 && number[2] <= 31)) {
       nYear = number[0];
       nMonth = number[1];
       nDay = number[2];
     } else if ((number[0] >= 1 && number[0] <= 12) &&
                (number[1] >= 1 && number[1] <= 31) && number[2] > 31) {
       nMonth = number[0];
       nDay = number[1];
       nYear = number[2];
     } else if ((number[0] >= 1 && number[0] <= 31) &&
                (number[1] >= 1 && number[1] <= 12) && number[2] > 31) {
       nDay = number[0];
       nMonth = number[1];
       nYear = number[2];
     }
 
-    bWrongFormat = FALSE;
+    if (bWrongFormat)
+      *bWrongFormat = false;
   } else {
-    bWrongFormat = TRUE;
+    if (bWrongFormat)
+      *bWrongFormat = true;
     return dt;
   }
 
   CFX_WideString swTemp;
   swTemp.Format(L"%d/%d/%d %d:%d:%d", nMonth, nDay, nYear, nHour, nMin, nSec);
   return JS_DateParse(swTemp.c_str());
 }
 
 double CJS_PublicMethods::MakeRegularDate(const CFX_WideString& value,
                                           const CFX_WideString& format,
-                                          FX_BOOL& bWrongFormat) {
+                                          bool* bWrongFormat) {
   double dt = JS_GetDateTime();
 
   if (format.IsEmpty() || value.IsEmpty())
     return dt;
 
   int nYear = JS_GetYearFromTime(dt);
   int nMonth = JS_GetMonthFromTime(dt) + 1;
   int nDay = JS_GetDayFromTime(dt);
   int nHour = JS_GetHourFromTime(dt);
   int nMin = JS_GetMinFromTime(dt);
   int nSec = JS_GetSecFromTime(dt);
 
   int nYearSub = 99;  // nYear - 2000;
 
   FX_BOOL bPm = FALSE;
   FX_BOOL bExit = FALSE;
-  bWrongFormat = FALSE;
+  bool bBadFormat = false;
 
   int i = 0;
   int j = 0;
 
   while (i < format.GetLength()) {
     if (bExit)
       break;
 
     FX_WCHAR c = format.GetAt(i);
     switch (c) {
@@ skipping 164 matching lines @@
                 j += nSkip;
               }
             } break;
             default:
               i += 4;
               j += 4;
               break;
           }
         } else {
           if (j >= value.GetLength() || format.GetAt(i) != value.GetAt(j)) {
-            bWrongFormat = TRUE;
+            bBadFormat = true;
             bExit = TRUE;
           }
           i++;
           j++;
         }
 
         if (oldj == j) {
-          bWrongFormat = TRUE;
+          bBadFormat = true;
           bExit = TRUE;
         }
       }
 
       break;
       default:
         if (value.GetLength() <= j) {
           bExit = TRUE;
         } else if (format.GetAt(i) != value.GetAt(j)) {
-          bWrongFormat = TRUE;
+          bBadFormat = true;
           bExit = TRUE;
         }
 
         i++;
         j++;
         break;
     }
   }
 
   if (bPm)
     nHour += 12;
 
   if (nYear >= 0 && nYear <= nYearSub)
     nYear += 2000;
 
   if (nMonth < 1 || nMonth > 12)
-    bWrongFormat = TRUE;
+    bBadFormat = true;
 
   if (nDay < 1 || nDay > 31)
-    bWrongFormat = TRUE;
+    bBadFormat = true;
 
   if (nHour < 0 || nHour > 24)
-    bWrongFormat = TRUE;
+    bBadFormat = true;
 
   if (nMin < 0 || nMin > 60)
-    bWrongFormat = TRUE;
+    bBadFormat = true;
 
   if (nSec < 0 || nSec > 60)
-    bWrongFormat = TRUE;
+    bBadFormat = true;
 
   double dRet = 0;
 
-  if (bWrongFormat) {
-    dRet = ParseNormalDate(value, bWrongFormat);
+  if (bBadFormat) {
+    dRet = ParseNormalDate(value, &bBadFormat);
   } else {
     dRet = JS_MakeDate(JS_MakeDay(nYear, nMonth - 1, nDay),
                        JS_MakeTime(nHour, nMin, nSec, 0));
 
     if (JS_PortIsNan(dRet)) {
       dRet = JS_DateParse(value.c_str());
     }
   }
 
   if (JS_PortIsNan(dRet)) {
-    dRet = ParseNormalDate(value, bWrongFormat);
+    dRet = ParseNormalDate(value, &bBadFormat);
   }
 
+  if (bWrongFormat)
+    *bWrongFormat = bBadFormat;
   return dRet;
 }
 
 CFX_WideString CJS_PublicMethods::MakeFormatDate(double dDate,
                                                  const CFX_WideString& format) {
   CFX_WideString sRet = L"", sPart = L"";
 
   int nYear = JS_GetYearFromTime(dDate);
   int nMonth = JS_GetMonthFromTime(dDate) + 1;
   int nDay = JS_GetDayFromTime(dDate);
@@ skipping 382 matching lines @@
       }
       bHasSep = TRUE;
       continue;
     }
     if (*it == L'-') {
       if (bHasSign) {
         FX_BOOL& bRc = pEvent->Rc();
         bRc = FALSE;
         return TRUE;
       }
-      if (it != w_strChange2.begin())  // sign's position is not correct
-      {
+      // sign's position is not correct
+      if (it != w_strChange2.begin()) {
         FX_BOOL& bRc = pEvent->Rc();
         bRc = FALSE;
         return TRUE;
       }
       if (pEvent->SelStart() != 0) {
         FX_BOOL& bRc = pEvent->Rc();
         bRc = FALSE;
         return TRUE;
       }
       bHasSign = TRUE;
       continue;
     }
 
-    if (!IsDigit(*it)) {
+    if (!FXSYS_iswdigit(*it)) {
       FX_BOOL& bRc = pEvent->Rc();
       bRc = FALSE;
       return TRUE;
     }
   }
 
   std::wstring w_prefix = w_strValue2.substr(0, pEvent->SelStart());
   std::wstring w_postfix;
   if (pEvent->SelEnd() < (int)w_strValue2.length())
     w_postfix = w_strValue2.substr(pEvent->SelEnd());
@@ skipping 31 matching lines @@
 
   int iSepStyle = params[1].ToInt();
   if (iSepStyle < 0 || iSepStyle > 3)
     iSepStyle = 0;
 
   //////////////////////////////////////////////////////
   // for processing decimal places
   double dValue = atof(strValue);
   dValue *= 100;
   if (iDec > 0)
-    dValue += DOUBLE_CORRECT;  //УÕý
+    dValue += DOUBLE_CORRECT;
 
   int iDec2;
   int iNegative = 0;
   strValue = fcvt(dValue, iDec, &iDec2, &iNegative);
   if (strValue.IsEmpty()) {
     dValue = 0;
     strValue = fcvt(dValue, iDec, &iDec2, &iNegative);
   }
 
   if (iDec2 < 0) {
@@ skipping 67 matching lines @@
   }
   if (!pEvent->m_pValue)
     return FALSE;
 
   CFX_WideString& val = pEvent->Value();
   CFX_WideString strValue = val;
   if (strValue.IsEmpty())
     return TRUE;
 
   CFX_WideString sFormat = params[0].ToCFXWideString();
-  FX_BOOL bWrongFormat = FALSE;
   double dDate = 0.0f;
 
   if (strValue.Find(L"GMT") != -1) {
     // for GMT format time
     // such as "Tue Aug 11 14:24:16 GMT+08002009"
     dDate = MakeInterDate(strValue);
   } else {
-    dDate = MakeRegularDate(strValue, sFormat, bWrongFormat);
+    dDate = MakeRegularDate(strValue, sFormat, nullptr);
   }
 
   if (JS_PortIsNan(dDate)) {
     CFX_WideString swMsg;
     swMsg.Format(JSGetStringFromID(pContext, IDS_STRING_JSPARSEDATE).c_str(),
                  sFormat.c_str());
     Alert(pContext, swMsg.c_str());
     return FALSE;
   }
 
@@ skipping 86 matching lines @@
   }
 
   if (pEvent->WillCommit()) {
     if (!pEvent->m_pValue)
       return FALSE;
     CFX_WideString strValue = pEvent->Value();
     if (strValue.IsEmpty())
       return TRUE;
 
     CFX_WideString sFormat = params[0].ToCFXWideString();
-    FX_BOOL bWrongFormat = FALSE;
-    double dRet = MakeRegularDate(strValue, sFormat, bWrongFormat);
+    bool bWrongFormat = FALSE;
+    double dRet = MakeRegularDate(strValue, sFormat, &bWrongFormat);
     if (bWrongFormat || JS_PortIsNan(dRet)) {
       CFX_WideString swMsg;
       swMsg.Format(JSGetStringFromID(pContext, IDS_STRING_JSPARSEDATE).c_str(),
                    sFormat.c_str());
       Alert(pContext, swMsg.c_str());
       pEvent->Rc() = FALSE;
       return TRUE;
     }
   }
   return TRUE;
@@ skipping 374 matching lines @@
   ASSERT(pContext);
 
   if (params.size() != 2) {
     sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
     return FALSE;
   }
 
   CFX_WideString sValue = params[0].ToCFXWideString();
   CFX_WideString sFormat = params[1].ToCFXWideString();
 
-  FX_BOOL bWrongFormat = FALSE;
-  double dDate = MakeRegularDate(sValue, sFormat, bWrongFormat);
+  double dDate = MakeRegularDate(sValue, sFormat, nullptr);
 
   if (JS_PortIsNan(dDate)) {
     CFX_WideString swMsg;
     swMsg.Format(JSGetStringFromID(pContext, IDS_STRING_JSPARSEDATE).c_str(),
                  sFormat.c_str());
     Alert((CJS_Context*)cc, swMsg.c_str());
     return FALSE;
   }
 
   vRet = dDate;
@@ skipping 81 matching lines @@
           }
           case FIELDTYPE_CHECKBOX:
           case FIELDTYPE_RADIOBUTTON: {
             dTemp = 0.0;
             for (int c = 0, csz = pFormField->CountControls(); c < csz; c++) {
               if (CPDF_FormControl* pFormCtrl = pFormField->GetControl(c)) {
                 if (pFormCtrl->IsChecked()) {
                   dTemp +=
                       ParseStringToNumber(pFormCtrl->GetExportValue().c_str());
                   break;
-                } else
-                  continue;
+                }
               }
             }
             break;
           }
           case FIELDTYPE_LISTBOX: {
-            dTemp = 0.0;
             if (pFormField->CountSelectedItems() > 1)
               break;
-            else {
-              dTemp = ParseStringToNumber(pFormField->GetValue().c_str());
-              break;
-            }
+
+            dTemp = ParseStringToNumber(pFormField->GetValue().c_str());
+            break;
           }
           default:
             break;
         }
 
         if (i == 0 && j == 0 && (wcscmp(sFunction.c_str(), L"MIN") == 0 ||
                                  wcscmp(sFunction.c_str(), L"MAX") == 0))
           dValue = dTemp;
 
         dValue = AF_Simple(sFunction.c_str(), dValue, dTemp);
@@ skipping 79 matching lines @@
 
   CFX_WideString str = params[0].ToCFXWideString();
   CFX_WideString sPart;
 
   if (str.GetAt(0) == L'.' || str.GetAt(0) == L',')
     str = L"0" + str;
 
   int nIndex = 0;
   for (int i = 0, sz = str.GetLength(); i < sz; i++) {
     FX_WCHAR wc = str.GetAt(i);
-    if (IsDigit((wchar_t)wc)) {
+    if (FXSYS_iswdigit(wc)) {
       sPart += wc;
     } else {
       if (sPart.GetLength() > 0) {
         nums.SetElement(nIndex, CJS_Value(pRuntime, sPart.c_str()));
         sPart = L"";
         nIndex++;
       }
     }
   }
 
   if (sPart.GetLength() > 0) {
     nums.SetElement(nIndex, CJS_Value(pRuntime, sPart.c_str()));
   }
 
   if (nums.GetLength() > 0)
     vRet = nums;
   else
     vRet.SetNull();
 
   return TRUE;
 }