Fix strings, remove stringify macros, void return types for Consts.h

fpdfsdk/src/javascript/Consts.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 "../../include/javascript/JavaScript.h"
 #include "../../include/javascript/IJavaScript.h"
 #include "../../include/javascript/JS_Define.h"
 #include "../../include/javascript/JS_Object.h"
@@ skipping 111 matching lines @@
 JS_STATIC_CONST_ENTRY_STRING(L"fitH", L"FitHeight")
 JS_STATIC_CONST_ENTRY_STRING(L"fitV", L"FitVisibleWidth")
 JS_STATIC_CONST_ENTRY_STRING(L"pref", L"Preferred")
 JS_STATIC_CONST_ENTRY_STRING(L"refW", L"ReflowWidth")
 END_JS_STATIC_CONST()
 
 IMPLEMENT_JS_CLASS_CONST(CJS_Zoomtype, zoomtype)
 
 /* ------------------------------ CJS_GlobalConsts ------------------------- */
 
-#define DEFINE_GLOBAL_CONST(pIsolate, const_name, const_value)   \
-  if (JS_DefineGlobalConst(                                      \
-          pIsolate, JS_WIDESTRING(const_name),                   \
-          JS_NewString(pIsolate, JS_WIDESTRING(const_value)))) { \
-    return -1;                                                   \
-  }
+static void DefineGlobalConstString(v8::Isolate* pIsolate,
+                                    const wchar_t* pConstName,
+                                    const wchar_t* pValue) {
+  JS_DefineGlobalConst(pIsolate, pConstName, JS_NewString(pIsolate, pValue));
+}
 
-int CJS_GlobalConsts::DefineJSObjects(v8::Isolate* pIsolate) {
-  DEFINE_GLOBAL_CONST(pIsolate, IDS_GREATER_THAN, Invalid value
-                      : must be greater than or equal to % s.);
-  DEFINE_GLOBAL_CONST(
-      pIsolate, IDS_GT_AND_LT, Invalid value
-      : must be greater than or equal to % s and less than or equal to % s.);
-  DEFINE_GLOBAL_CONST(pIsolate, IDS_LESS_THAN, Invalid value
-                      : must be less than or equal to % s.);
-  DEFINE_GLOBAL_CONST(pIsolate, IDS_INVALID_MONTH, **Invalid**);
-  DEFINE_GLOBAL_CONST(pIsolate, IDS_INVALID_DATE, Invalid date / time
-                      : please ensure that the date / time exists.Field);
-  DEFINE_GLOBAL_CONST(pIsolate, IDS_INVALID_VALUE,
-                      The value entered does not match the format of the field);
-  DEFINE_GLOBAL_CONST(pIsolate, IDS_AM, am);
-  DEFINE_GLOBAL_CONST(pIsolate, IDS_PM, pm);
-  DEFINE_GLOBAL_CONST(
-      pIsolate, IDS_MONTH_INFO,
-      January[1] February[2] March[3] April[4] May[5] June[6] July[7] August
-          [8] September[9] October[10] November[11] December[12] Sept[9] Jan
-              [1] Feb[2] Mar[3] Apr[4] Jun[6] Jul[7] Aug[8] Sep[9] Oct[10] Nov
-                  [11] Dec[12]);
-  DEFINE_GLOBAL_CONST(pIsolate, IDS_STARTUP_CONSOLE_MSG, ** ^ _ ^ **);
-
-  return 0;
+void CJS_GlobalConsts::DefineJSObjects(v8::Isolate* pIsolate) {
+  DefineGlobalConstString(
+      pIsolate, L"IDS_GREATER_THAN",
+      L"Invalid value: must be greater than or equal to % s.");
+  DefineGlobalConstString(
+      pIsolate, L"IDS_GT_AND_LT",
+      L"Invalid value: must be greater than or equal to % s "
+      L"and less than or equal to % s.");
+  DefineGlobalConstString(pIsolate, L"IDS_LESS_THAN",
+                          L"Invalid value: must be less than or equal to % s.");
+  DefineGlobalConstString(pIsolate, L"IDS_INVALID_MONTH", L"**Invalid**");
+  DefineGlobalConstString(
+      pIsolate, L"IDS_INVALID_DATE",
+      L"Invalid date / time: please ensure that the date / time exists.Field");
+  DefineGlobalConstString(
+      pIsolate, L"IDS_INVALID_VALUE",
+      L"The value entered does not match the format of the field");
+  DefineGlobalConstString(pIsolate, L"IDS_AM", L"am");
+  DefineGlobalConstString(pIsolate, L"IDS_PM", L"pm");
+  DefineGlobalConstString(
+      pIsolate, L"IDS_MONTH_INFO",
+      L"January[1] February[2] March[3] April[4] May[5] "
+      L"June[6] July[7] August[8] September[9] October[10] "
+      L"November[11] December[12] Sept[9] Jan[1] Feb[2] Mar[3] "
+      L"Apr[4] Jun[6] Jul[7] Aug[8] Sep[9] Oct[10] Nov[11] "
+      L"Dec[12]");
+  DefineGlobalConstString(pIsolate, L"IDS_STARTUP_CONSOLE_MSG", L"** ^ _ ^ **");
 }
 
 /* ------------------------------ CJS_GlobalArrays  ------------------------ */
 
-#define DEFINE_GLOBAL_ARRAY(pIsolate)                           \
-  int size = FX_ArraySize(ArrayContent);                        \
-                                                                \
-  CJS_Array array(pIsolate);                                    \
-  for (int i = 0; i < size; i++)                                \
-    array.SetElement(i, CJS_Value(pIsolate, ArrayContent[i]));  \
-                                                                \
-  CJS_PropValue prop(pIsolate);                                 \
-  prop << array;                                                \
-  if (JS_DefineGlobalConst(pIsolate, (const wchar_t*)ArrayName, \
-                           prop.ToV8Value()) < 0) {             \
-    return -1;                                                  \
+void DefineGlobalConstStringArray(v8::Isolate* pIsolate,
+                                  const wchar_t* sConstName,
+                                  const wchar_t** pValues,
+                                  size_t nValues) {
+  CJS_Array array(pIsolate);
+  for (size_t i = 0; i < nValues; ++i) {
+    array.SetElement(i, CJS_Value(pIsolate, pValues[i]));
   }
+  CJS_PropValue prop(pIsolate);
+  prop << array;
+  JS_DefineGlobalConst(pIsolate, sConstName, prop.ToV8Value());
+}
 
-int CJS_GlobalArrays::DefineJSObjects(v8::Isolate* pIsolate) {
+void CJS_GlobalArrays::DefineJSObjects(v8::Isolate* pIsolate) {
   {
     const FX_WCHAR* ArrayName = L"RE_NUMBER_ENTRY_DOT_SEP";
     const FX_WCHAR* ArrayContent[] = {L"[+-]?\\d*\\.?\\d*"};
-    DEFINE_GLOBAL_ARRAY(pIsolate);
+    DefineGlobalConstStringArray(pIsolate, ArrayName, ArrayContent,
+                                 FX_ArraySize(ArrayContent));
   }
 
   {
     const FX_WCHAR* ArrayName = L"RE_NUMBER_COMMIT_DOT_SEP";
     const FX_WCHAR* ArrayContent[] = {
         L"[+-]?\\d+(\\.\\d+)?", /* -1.0 or -1 */
         L"[+-]?\\.\\d+",        /* -.1 */
         L"[+-]?\\d+\\."         /* -1. */
     };
-    DEFINE_GLOBAL_ARRAY(pIsolate);
+    DefineGlobalConstStringArray(pIsolate, ArrayName, ArrayContent,
+                                 FX_ArraySize(ArrayContent));
   }
 
   {
     const FX_WCHAR* ArrayName = L"RE_NUMBER_ENTRY_COMMA_SEP";
     const FX_WCHAR* ArrayContent[] = {L"[+-]?\\d*,?\\d*"};
 
-    DEFINE_GLOBAL_ARRAY(pIsolate);
+    DefineGlobalConstStringArray(pIsolate, ArrayName, ArrayContent,
+                                 FX_ArraySize(ArrayContent));
   }
 
   {
     const FX_WCHAR* ArrayName = L"RE_NUMBER_COMMIT_COMMA_SEP";
     const FX_WCHAR* ArrayContent[] = {
         L"[+-]?\\d+([.,]\\d+)?", /* -1,0 or -1 */
         L"[+-]?[.,]\\d+",        /* -,1 */
         L"[+-]?\\d+[.,]"         /* -1, */
     };
-    DEFINE_GLOBAL_ARRAY(pIsolate);
+    DefineGlobalConstStringArray(pIsolate, ArrayName, ArrayContent,
+                                 FX_ArraySize(ArrayContent));
   }
 
   {
     const FX_WCHAR* ArrayName = L"RE_ZIP_ENTRY";
     const FX_WCHAR* ArrayContent[] = {L"\\d{0,5}"};
-    DEFINE_GLOBAL_ARRAY(pIsolate);
+    DefineGlobalConstStringArray(pIsolate, ArrayName, ArrayContent,
+                                 FX_ArraySize(ArrayContent));
   }
 
   {
     const FX_WCHAR* ArrayName = L"RE_ZIP_COMMIT";
     const FX_WCHAR* ArrayContent[] = {L"\\d{5}"};
-    DEFINE_GLOBAL_ARRAY(pIsolate);
+    DefineGlobalConstStringArray(pIsolate, ArrayName, ArrayContent,
+                                 FX_ArraySize(ArrayContent));
   }
 
   {
     const FX_WCHAR* ArrayName = L"RE_ZIP4_ENTRY";
     const FX_WCHAR* ArrayContent[] = {L"\\d{0,5}(\\.|[- ])?\\d{0,4}"};
-    DEFINE_GLOBAL_ARRAY(pIsolate);
+    DefineGlobalConstStringArray(pIsolate, ArrayName, ArrayContent,
+                                 FX_ArraySize(ArrayContent));
   }
 
   {
     const FX_WCHAR* ArrayName = L"RE_ZIP4_COMMIT";
     const FX_WCHAR* ArrayContent[] = {L"\\d{5}(\\.|[- ])?\\d{4}"};
-    DEFINE_GLOBAL_ARRAY(pIsolate);
+    DefineGlobalConstStringArray(pIsolate, ArrayName, ArrayContent,
+                                 FX_ArraySize(ArrayContent));
   }
 
   {
     const FX_WCHAR* ArrayName = L"RE_PHONE_ENTRY";
     const FX_WCHAR* ArrayContent[] = {
         L"\\d{0,3}(\\.|[- ])?\\d{0,3}(\\.|[- ])?\\d{0,4}", /* 555-1234 or 408
                                                               555-1234 */
         L"\\(\\d{0,3}",                                    /* (408 */
         L"\\(\\d{0,3}\\)(\\.|[- ])?\\d{0,3}(\\.|[- ])?\\d{0,4}", /* (408)
                                                                     555-1234 */
         /* (allow the addition of parens as an afterthought) */
         L"\\(\\d{0,3}(\\.|[- ])?\\d{0,3}(\\.|[- ])?\\d{0,4}", /* (408 555-1234
                                                                  */
         L"\\d{0,3}\\)(\\.|[- ])?\\d{0,3}(\\.|[- ])?\\d{0,4}", /* 408) 555-1234
                                                                  */
         L"011(\\.|[- \\d])*" /* international */
     };
-    DEFINE_GLOBAL_ARRAY(pIsolate);
+    DefineGlobalConstStringArray(pIsolate, ArrayName, ArrayContent,
+                                 FX_ArraySize(ArrayContent));
   }
 
   {
     const FX_WCHAR* ArrayName = L"RE_PHONE_COMMIT";
     const FX_WCHAR* ArrayContent[] = {
         L"\\d{3}(\\.|[- ])?\\d{4}",                        /* 555-1234 */
         L"\\d{3}(\\.|[- ])?\\d{3}(\\.|[- ])?\\d{4}",       /* 408 555-1234 */
         L"\\(\\d{3}\\)(\\.|[- ])?\\d{3}(\\.|[- ])?\\d{4}", /* (408) 555-1234 */
         L"011(\\.|[- \\d])*"                               /* international */
     };
-    DEFINE_GLOBAL_ARRAY(pIsolate);
+    DefineGlobalConstStringArray(pIsolate, ArrayName, ArrayContent,
+                                 FX_ArraySize(ArrayContent));
   }
 
   {
     const FX_WCHAR* ArrayName = L"RE_SSN_ENTRY";
     const FX_WCHAR* ArrayContent[] = {
         L"\\d{0,3}(\\.|[- ])?\\d{0,2}(\\.|[- ])?\\d{0,4}"};
-    DEFINE_GLOBAL_ARRAY(pIsolate);
+    DefineGlobalConstStringArray(pIsolate, ArrayName, ArrayContent,
+                                 FX_ArraySize(ArrayContent));
   }
 
   {
     const FX_WCHAR* ArrayName = L"RE_SSN_COMMIT";
     const FX_WCHAR* ArrayContent[] = {
         L"\\d{3}(\\.|[- ])?\\d{2}(\\.|[- ])?\\d{4}"};
-    DEFINE_GLOBAL_ARRAY(pIsolate);
+    DefineGlobalConstStringArray(pIsolate, ArrayName, ArrayContent,
+                                 FX_ArraySize(ArrayContent));
   }
-
-  return 0;
 }