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

core/src/fpdftext/fpdf_text.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 "core/include/fpdfapi/fpdf_page.h"
 #include "core/include/fpdfapi/fpdf_pageobj.h"
 #include "core/include/fpdfapi/fpdf_resource.h"
 #include "core/include/fpdftext/fpdf_text.h"
 #include "core/include/fxcrt/fx_bidi.h"
 #include "core/include/fxcrt/fx_ucd.h"
 #include "text_int.h"
 #include "third_party/base/nonstd_unique_ptr.h"
 #include "txtproc.h"
 
+#include <cctype>
+#include <cwctype>
+
 CFX_ByteString CharFromUnicodeAlt(FX_WCHAR unicode,
                                   int destcp,
                                   const FX_CHAR* defchar) {
   if (destcp == 0) {
     if (unicode < 0x80) {
       return CFX_ByteString((char)unicode);
     }
     const FX_CHAR* altstr = FCS_GetAltStr(unicode);
     return CFX_ByteString(altstr ? altstr : defchar);
   }
@@ skipping 402 matching lines @@
         }
       }
     }
   }
   str.Empty();
   str += sBuffer;
 }
 static FX_BOOL IsNumber(CFX_WideString& str) {
   for (int i = 0; i < str.GetLength(); i++) {
     FX_WCHAR ch = str[i];
-    if ((ch < '0' || ch > '9') && ch != '-' && ch != '+' && ch != '.' &&
-        ch != ' ') {
+    // TODO(dsinclair): --.+ +.-- should probably not be a number.
+    if (!std::iswdigit(ch) && ch != '-' && ch != '+' && ch != '.' && ch != ' ')
       return FALSE;
-    }
   }
   return TRUE;
 }
 void CTextPage::FindColumns() {
   int i;
   for (i = 0; i < m_BaseLines.GetSize(); i++) {
     CTextBaseLine* pBaseLine = (CTextBaseLine*)m_BaseLines.GetAt(i);
     for (int j = 0; j < pBaseLine->m_TextList.GetSize(); j++) {
       CTextBox* pTextBox = (CTextBox*)pBaseLine->m_TextList.GetAt(j);
       CTextColumn* pColumn = FindColumn(pTextBox->m_Right);
@@ skipping 330 matching lines @@
                                FX_DWORD flags) {
   buffer.EstimateSize(0, 10240);
   CPDF_Page page;
   page.Load(pDoc, pPage);
   CPDF_ParseOptions options;
   options.m_bTextOnly = TRUE;
   options.m_bSeparateForm = FALSE;
   page.ParseContent(&options);
   GetTextStream_Unicode(buffer, &page, TRUE, NULL);
 }