From d19e912dd469e4bdad9f3020e1f6eb98f10f3470 Mon Sep 17 00:00:00 2001 From: tsepez Date: Wed, 2 Nov 2016 15:43:18 -0700 Subject: Remove FX_BOOL from xfa. Review-Url: https://codereview.chromium.org/2467203003 --- xfa/fxfa/fm2js/xfa_expression.cpp | 2 +- xfa/fxfa/fm2js/xfa_expression.h | 4 +- xfa/fxfa/fm2js/xfa_fm2jscontext.cpp | 346 +++++++++++------------ xfa/fxfa/fm2js/xfa_fm2jscontext.h | 130 ++++----- xfa/fxfa/fm2js/xfa_fmparse.cpp | 16 +- xfa/fxfa/fm2js/xfa_lexer.cpp | 48 ++-- xfa/fxfa/fm2js/xfa_lexer.h | 2 +- xfa/fxfa/fm2js/xfa_simpleexpression.cpp | 12 +- xfa/fxfa/fm2js/xfa_simpleexpression.h | 8 +- xfa/fxfa/fm2js/xfa_simpleexpression_unittest.cpp | 2 +- 10 files changed, 283 insertions(+), 287 deletions(-) (limited to 'xfa/fxfa/fm2js') diff --git a/xfa/fxfa/fm2js/xfa_expression.cpp b/xfa/fxfa/fm2js/xfa_expression.cpp index 829bf7d74e..4271ae04e2 100644 --- a/xfa/fxfa/fm2js/xfa_expression.cpp +++ b/xfa/fxfa/fm2js/xfa_expression.cpp @@ -30,7 +30,7 @@ void CXFA_FMExpression::ToImpliedReturnJS(CFX_WideTextBuf& javascript) {} CXFA_FMFunctionDefinition::CXFA_FMFunctionDefinition( uint32_t line, - FX_BOOL isGlobal, + bool isGlobal, const CFX_WideStringC& wsName, std::unique_ptr pArguments, CFX_ArrayTemplate* pExpressions) diff --git a/xfa/fxfa/fm2js/xfa_expression.h b/xfa/fxfa/fm2js/xfa_expression.h index 88cebdf036..69337350bf 100644 --- a/xfa/fxfa/fm2js/xfa_expression.h +++ b/xfa/fxfa/fm2js/xfa_expression.h @@ -42,7 +42,7 @@ class CXFA_FMFunctionDefinition : public CXFA_FMExpression { // Takes ownership of |pExpressions|. CXFA_FMFunctionDefinition( uint32_t line, - FX_BOOL isGlobal, + bool isGlobal, const CFX_WideStringC& wsName, std::unique_ptr pArguments, CFX_ArrayTemplate* pExpressions); @@ -55,7 +55,7 @@ class CXFA_FMFunctionDefinition : public CXFA_FMExpression { CFX_WideStringC m_wsName; std::unique_ptr m_pArguments; CFX_ArrayTemplate* m_pExpressions; - FX_BOOL m_isGlobal; + bool m_isGlobal; }; class CXFA_FMVarExpression : public CXFA_FMExpression { diff --git a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp index 8a7849f873..947ef7941e 100644 --- a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp +++ b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp @@ -377,8 +377,8 @@ void AlternateDateTimeSymbols(CFX_WideString& wsPattern, const CFX_WideString& wsAltSymbols, const uint8_t* pAltTable) { int32_t nLength = wsPattern.GetLength(); - FX_BOOL bInConstRange = FALSE; - FX_BOOL bEscape = FALSE; + bool bInConstRange = false; + bool bEscape = false; int32_t i = 0; while (i < nLength) { FX_WCHAR wc = wsPattern[i]; @@ -399,7 +399,7 @@ void AlternateDateTimeSymbols(CFX_WideString& wsPattern, wsPattern.SetAt(i, wsAltSymbols[nAlt]); } i++; - bEscape = FALSE; + bEscape = false; } } @@ -442,7 +442,7 @@ bool PatternStringType(const CFX_ByteStringC& szPattern, const FX_WCHAR* pData = wsPattern.c_str(); int32_t iLength = wsPattern.GetLength(); int32_t iIndex = 0; - FX_BOOL bSingleQuotation = FALSE; + bool bSingleQuotation = false; FX_WCHAR patternChar; while (iIndex < iLength) { patternChar = pData[iIndex]; @@ -1233,7 +1233,7 @@ void CXFA_FM2JSContext::LocalDateFmt(CFXJSE_Value* pThis, } CFX_ByteString formatStr; - GetLocalDateFormat(pThis, iStyle, szLocal.AsStringC(), formatStr, FALSE); + GetLocalDateFormat(pThis, iStyle, szLocal.AsStringC(), formatStr, false); args.GetReturnValue()->SetString(formatStr.AsStringC()); } @@ -1271,7 +1271,7 @@ void CXFA_FM2JSContext::LocalTimeFmt(CFXJSE_Value* pThis, } CFX_ByteString formatStr; - GetLocalTimeFormat(pThis, iStyle, szLocal.AsStringC(), formatStr, FALSE); + GetLocalTimeFormat(pThis, iStyle, szLocal.AsStringC(), formatStr, false); args.GetReturnValue()->SetString(formatStr.AsStringC()); } @@ -1461,7 +1461,7 @@ void CXFA_FM2JSContext::Num2GMTime(CFXJSE_Value* pThis, CFX_ByteString szGMTTimeString; Num2AllTime(pThis, iTime, formatString.AsStringC(), localString.AsStringC(), - TRUE, szGMTTimeString); + true, szGMTTimeString); args.GetReturnValue()->SetString(szGMTTimeString.AsStringC()); } @@ -1509,7 +1509,7 @@ void CXFA_FM2JSContext::Num2Time(CFXJSE_Value* pThis, CFX_ByteString szLocalTimeString; Num2AllTime(pThis, (int32_t)fTime, formatString.AsStringC(), - localString.AsStringC(), FALSE, szLocalTimeString); + localString.AsStringC(), false, szLocalTimeString); args.GetReturnValue()->SetString(szLocalTimeString.AsStringC()); } @@ -1661,31 +1661,31 @@ void CXFA_FM2JSContext::TimeFmt(CFXJSE_Value* pThis, } // static -FX_BOOL CXFA_FM2JSContext::IsIsoDateFormat(const FX_CHAR* pData, - int32_t iLength, - int32_t& iStyle, - int32_t& iYear, - int32_t& iMonth, - int32_t& iDay) { +bool CXFA_FM2JSContext::IsIsoDateFormat(const FX_CHAR* pData, + int32_t iLength, + int32_t& iStyle, + int32_t& iYear, + int32_t& iMonth, + int32_t& iDay) { iYear = 0; iMonth = 1; iDay = 1; if (iLength < 4) - return FALSE; + return false; FX_CHAR strYear[5]; strYear[4] = '\0'; for (int32_t i = 0; i < 4; ++i) { if (pData[i] > '9' || pData[i] < '0') - return FALSE; + return false; strYear[i] = pData[i]; } iYear = FXSYS_atoi(strYear); iStyle = 0; if (iLength == 4) - return TRUE; + return true; iStyle = pData[4] == '-' ? 1 : 0; @@ -1694,60 +1694,60 @@ FX_BOOL CXFA_FM2JSContext::IsIsoDateFormat(const FX_CHAR* pData, int32_t iPosOff = iStyle == 0 ? 4 : 5; if ((pData[iPosOff] > '9' || pData[iPosOff] < '0') || (pData[iPosOff + 1] > '9' || pData[iPosOff + 1] < '0')) - return FALSE; + return false; strTemp[0] = pData[iPosOff]; strTemp[1] = pData[iPosOff + 1]; iMonth = FXSYS_atoi(strTemp); if (iMonth > 12 || iMonth < 1) - return FALSE; + return false; if (iStyle == 0) { iPosOff += 2; if (iLength == 6) - return TRUE; + return true; } else { iPosOff += 3; if (iLength == 7) - return TRUE; + return true; } if ((pData[iPosOff] > '9' || pData[iPosOff] < '0') || (pData[iPosOff + 1] > '9' || pData[iPosOff + 1] < '0')) - return FALSE; + return false; strTemp[0] = pData[iPosOff]; strTemp[1] = pData[iPosOff + 1]; iDay = FXSYS_atoi(strTemp); if (iPosOff + 2 < iLength) - return FALSE; + return false; if ((!(iYear % 4) && (iYear % 100)) || !(iYear % 400)) { if (iMonth == 2 && iDay > 29) - return FALSE; + return false; } else { if (iMonth == 2 && iDay > 28) - return FALSE; + return false; } if (iMonth != 2) { if (iMonth < 8) { if (iDay > (iMonth % 2 == 0 ? 30 : 31)) - return FALSE; + return false; } else if (iDay > (iMonth % 2 == 0 ? 31 : 30)) { - return FALSE; + return false; } } - return TRUE; + return true; } // static -FX_BOOL CXFA_FM2JSContext::IsIsoTimeFormat(const FX_CHAR* pData, - int32_t iLength, - int32_t& iHour, - int32_t& iMinute, - int32_t& iSecond, - int32_t& iMilliSecond, - int32_t& iZoneHour, - int32_t& iZoneMinute) { +bool CXFA_FM2JSContext::IsIsoTimeFormat(const FX_CHAR* pData, + int32_t iLength, + int32_t& iHour, + int32_t& iMinute, + int32_t& iSecond, + int32_t& iMilliSecond, + int32_t& iZoneHour, + int32_t& iZoneMinute) { iHour = 0; iMinute = 0; iSecond = 0; @@ -1755,7 +1755,7 @@ FX_BOOL CXFA_FM2JSContext::IsIsoTimeFormat(const FX_CHAR* pData, iZoneHour = 0; iZoneMinute = 0; if (!pData) - return FALSE; + return false; FX_CHAR strTemp[3]; strTemp[2] = '\0'; @@ -1778,15 +1778,15 @@ FX_BOOL CXFA_FM2JSContext::IsIsoTimeFormat(const FX_CHAR* pData, break; if (pData[iIndex] > '9' || pData[iIndex] < '0') - return FALSE; + return false; strTemp[0] = pData[iIndex]; if (pData[iIndex + 1] > '9' || pData[iIndex + 1] < '0') - return FALSE; + return false; strTemp[1] = pData[iIndex + 1]; if (FXSYS_atoi(strTemp) > 60) - return FALSE; + return false; if (pData[2] == ':') { if (iPos == 0) { @@ -1818,26 +1818,26 @@ FX_BOOL CXFA_FM2JSContext::IsIsoTimeFormat(const FX_CHAR* pData, FX_CHAR strSec[4]; strSec[3] = '\0'; if (pData[iIndex] > '9' || pData[iIndex] < '0') - return FALSE; + return false; strSec[0] = pData[iIndex]; if (pData[iIndex + 1] > '9' || pData[iIndex + 1] < '0') - return FALSE; + return false; strSec[1] = pData[iIndex + 1]; if (pData[iIndex + 2] > '9' || pData[iIndex + 2] < '0') - return FALSE; + return false; strSec[2] = pData[iIndex + 2]; iMilliSecond = FXSYS_atoi(strSec); if (iMilliSecond > 100) { iMilliSecond = 0; - return FALSE; + return false; } iIndex += 3; } if (pData[iIndex] == 'z' || pData[iIndex] == 'Z') - return TRUE; + return true; int32_t iSign = 1; if (pData[iIndex] == '+') { @@ -1849,17 +1849,17 @@ FX_BOOL CXFA_FM2JSContext::IsIsoTimeFormat(const FX_CHAR* pData, iPos = 0; while (iIndex < iLength) { if (iIndex >= iLength) - return FALSE; + return false; if (pData[iIndex] > '9' || pData[iIndex] < '0') - return FALSE; + return false; strTemp[0] = pData[iIndex]; if (pData[iIndex + 1] > '9' || pData[iIndex + 1] < '0') - return FALSE; + return false; strTemp[1] = pData[iIndex + 1]; if (FXSYS_atoi(strTemp) > 60) - return FALSE; + return false; if (pData[2] == ':') { if (iPos == 0) { @@ -1880,24 +1880,24 @@ FX_BOOL CXFA_FM2JSContext::IsIsoTimeFormat(const FX_CHAR* pData, } } if (iIndex < iLength) - return FALSE; + return false; iZoneHour *= iSign; - return TRUE; + return true; } // static -FX_BOOL CXFA_FM2JSContext::IsIsoDateTimeFormat(const FX_CHAR* pData, - int32_t iLength, - int32_t& iYear, - int32_t& iMonth, - int32_t& iDay, - int32_t& iHour, - int32_t& iMinute, - int32_t& iSecond, - int32_t& iMillionSecond, - int32_t& iZoneHour, - int32_t& iZoneMinute) { +bool CXFA_FM2JSContext::IsIsoDateTimeFormat(const FX_CHAR* pData, + int32_t iLength, + int32_t& iYear, + int32_t& iMonth, + int32_t& iDay, + int32_t& iHour, + int32_t& iMinute, + int32_t& iSecond, + int32_t& iMillionSecond, + int32_t& iZoneHour, + int32_t& iZoneMinute) { iYear = 0; iMonth = 0; iDay = 0; @@ -1905,45 +1905,45 @@ FX_BOOL CXFA_FM2JSContext::IsIsoDateTimeFormat(const FX_CHAR* pData, iMinute = 0; iSecond = 0; if (!pData) - return FALSE; + return false; int32_t iIndex = 0; while (pData[iIndex] != 'T' && pData[iIndex] != 't') { if (iIndex >= iLength) - return FALSE; + return false; ++iIndex; } if (iIndex != 8 && iIndex != 10) - return FALSE; + return false; int32_t iStyle = -1; if (!IsIsoDateFormat(pData, iIndex, iStyle, iYear, iMonth, iDay)) - return FALSE; + return false; if (pData[iIndex] != 'T' && pData[iIndex] != 't') - return TRUE; + return true; ++iIndex; if (((iLength - iIndex > 13) && (iLength - iIndex < 6)) && (iLength - iIndex != 15)) { - return TRUE; + return true; } if (!IsIsoTimeFormat(pData + iIndex, iLength - iIndex, iHour, iMinute, iSecond, iMillionSecond, iZoneHour, iZoneMinute)) { - return FALSE; + return false; } - return TRUE; + return true; } // static -FX_BOOL CXFA_FM2JSContext::Local2IsoDate(CFXJSE_Value* pThis, - const CFX_ByteStringC& szDate, - const CFX_ByteStringC& szFormat, - const CFX_ByteStringC& szLocale, - CFX_ByteString& strIsoDate) { +bool CXFA_FM2JSContext::Local2IsoDate(CFXJSE_Value* pThis, + const CFX_ByteStringC& szDate, + const CFX_ByteStringC& szFormat, + const CFX_ByteStringC& szLocale, + CFX_ByteString& strIsoDate) { CXFA_Document* pDoc = ToJSContext(pThis, nullptr)->GetDocument(); if (!pDoc) - return FALSE; + return false; CXFA_LocaleMgr* pMgr = pDoc->GetLocalMgr(); IFX_Locale* pLocale = nullptr; @@ -1957,7 +1957,7 @@ FX_BOOL CXFA_FM2JSContext::Local2IsoDate(CFXJSE_Value* pThis, pLocale = pMgr->GetLocaleByName(CFX_WideString::FromUTF8(szLocale)); } if (!pLocale) - return FALSE; + return false; CFX_WideString wsFormat; if (szFormat.IsEmpty()) @@ -1969,18 +1969,18 @@ FX_BOOL CXFA_FM2JSContext::Local2IsoDate(CFXJSE_Value* pThis, wsFormat, pLocale, pMgr); CFX_Unitime dt = widgetValue.GetDate(); strIsoDate.Format("%4d-%02d-%02d", dt.GetYear(), dt.GetMonth(), dt.GetDay()); - return TRUE; + return true; } // static -FX_BOOL CXFA_FM2JSContext::Local2IsoTime(CFXJSE_Value* pThis, - const CFX_ByteStringC& szTime, - const CFX_ByteStringC& szFormat, - const CFX_ByteStringC& szLocale, - CFX_ByteString& strIsoTime) { +bool CXFA_FM2JSContext::Local2IsoTime(CFXJSE_Value* pThis, + const CFX_ByteStringC& szTime, + const CFX_ByteStringC& szFormat, + const CFX_ByteStringC& szLocale, + CFX_ByteString& strIsoTime) { CXFA_Document* pDoc = ToJSContext(pThis, nullptr)->GetDocument(); if (!pDoc) - return FALSE; + return false; CXFA_LocaleMgr* pMgr = pDoc->GetLocalMgr(); IFX_Locale* pLocale = nullptr; @@ -1994,7 +1994,7 @@ FX_BOOL CXFA_FM2JSContext::Local2IsoTime(CFXJSE_Value* pThis, pLocale = pMgr->GetLocaleByName(CFX_WideString::FromUTF8(szLocale)); } if (!pLocale) - return FALSE; + return false; CFX_WideString wsFormat; if (szFormat.IsEmpty()) @@ -2008,18 +2008,18 @@ FX_BOOL CXFA_FM2JSContext::Local2IsoTime(CFXJSE_Value* pThis, CFX_Unitime utime = widgetValue.GetTime(); strIsoTime.Format("%02d:%02d:%02d.%03d", utime.GetHour(), utime.GetMinute(), utime.GetSecond(), utime.GetMillisecond()); - return TRUE; + return true; } // static -FX_BOOL CXFA_FM2JSContext::IsoDate2Local(CFXJSE_Value* pThis, - const CFX_ByteStringC& szDate, - const CFX_ByteStringC& szFormat, - const CFX_ByteStringC& szLocale, - CFX_ByteString& strLocalDate) { +bool CXFA_FM2JSContext::IsoDate2Local(CFXJSE_Value* pThis, + const CFX_ByteStringC& szDate, + const CFX_ByteStringC& szFormat, + const CFX_ByteStringC& szLocale, + CFX_ByteString& strLocalDate) { CXFA_Document* pDoc = ToJSContext(pThis, nullptr)->GetDocument(); if (!pDoc) - return FALSE; + return false; CXFA_LocaleMgr* pMgr = pDoc->GetLocalMgr(); IFX_Locale* pLocale = nullptr; @@ -2032,7 +2032,7 @@ FX_BOOL CXFA_FM2JSContext::IsoDate2Local(CFXJSE_Value* pThis, pLocale = pMgr->GetLocaleByName(CFX_WideString::FromUTF8(szLocale)); } if (!pLocale) - return FALSE; + return false; CFX_WideString wsFormat; if (szFormat.IsEmpty()) @@ -2046,18 +2046,18 @@ FX_BOOL CXFA_FM2JSContext::IsoDate2Local(CFXJSE_Value* pThis, widgetValue.FormatPatterns(wsRet, wsFormat, pLocale, XFA_VALUEPICTURE_Display); strLocalDate = FX_UTF8Encode(wsRet.c_str(), wsRet.GetLength()); - return TRUE; + return true; } // static -FX_BOOL CXFA_FM2JSContext::IsoTime2Local(CFXJSE_Value* pThis, - const CFX_ByteStringC& szTime, - const CFX_ByteStringC& szFormat, - const CFX_ByteStringC& szLocale, - CFX_ByteString& strLocalTime) { +bool CXFA_FM2JSContext::IsoTime2Local(CFXJSE_Value* pThis, + const CFX_ByteStringC& szTime, + const CFX_ByteStringC& szFormat, + const CFX_ByteStringC& szLocale, + CFX_ByteString& strLocalTime) { CXFA_Document* pDoc = ToJSContext(pThis, nullptr)->GetDocument(); if (!pDoc) - return FALSE; + return false; CXFA_LocaleMgr* pMgr = pDoc->GetLocalMgr(); IFX_Locale* pLocale = nullptr; @@ -2070,7 +2070,7 @@ FX_BOOL CXFA_FM2JSContext::IsoTime2Local(CFXJSE_Value* pThis, pLocale = pMgr->GetLocaleByName(CFX_WideString::FromUTF8(szLocale)); } if (!pLocale) - return FALSE; + return false; CFX_WideString wsFormat; if (szFormat.IsEmpty()) @@ -2085,18 +2085,18 @@ FX_BOOL CXFA_FM2JSContext::IsoTime2Local(CFXJSE_Value* pThis, widgetValue.FormatPatterns(wsRet, wsFormat, pLocale, XFA_VALUEPICTURE_Display); strLocalTime = FX_UTF8Encode(wsRet.c_str(), wsRet.GetLength()); - return TRUE; + return true; } // static -FX_BOOL CXFA_FM2JSContext::GetGMTTime(CFXJSE_Value* pThis, - const CFX_ByteStringC& szTime, - const CFX_ByteStringC& szFormat, - const CFX_ByteStringC& szLocale, - CFX_ByteString& strGMTTime) { +bool CXFA_FM2JSContext::GetGMTTime(CFXJSE_Value* pThis, + const CFX_ByteStringC& szTime, + const CFX_ByteStringC& szFormat, + const CFX_ByteStringC& szLocale, + CFX_ByteString& strGMTTime) { CXFA_Document* pDoc = ToJSContext(pThis, nullptr)->GetDocument(); if (!pDoc) - return FALSE; + return false; CXFA_LocaleMgr* pMgr = pDoc->GetLocalMgr(); IFX_Locale* pLocale = nullptr; @@ -2109,7 +2109,7 @@ FX_BOOL CXFA_FM2JSContext::GetGMTTime(CFXJSE_Value* pThis, pLocale = pMgr->GetLocaleByName(CFX_WideString::FromUTF8(szLocale)); } if (!pLocale) - return FALSE; + return false; CFX_WideString wsFormat; if (szFormat.IsEmpty()) @@ -2124,7 +2124,7 @@ FX_BOOL CXFA_FM2JSContext::GetGMTTime(CFXJSE_Value* pThis, widgetValue.FormatPatterns(wsRet, wsFormat, pLocale, XFA_VALUEPICTURE_Display); strGMTTime = FX_UTF8Encode(wsRet.c_str(), wsRet.GetLength()); - return TRUE; + return true; } // static @@ -2189,7 +2189,7 @@ void CXFA_FM2JSContext::GetLocalDateFormat(CFXJSE_Value* pThis, int32_t iStyle, const CFX_ByteStringC& szLocalStr, CFX_ByteString& strFormat, - FX_BOOL bStandard) { + bool bStandard) { FX_LOCALEDATETIMESUBCATEGORY strStyle; switch (iStyle) { case 1: @@ -2240,7 +2240,7 @@ void CXFA_FM2JSContext::GetLocalTimeFormat(CFXJSE_Value* pThis, int32_t iStyle, const CFX_ByteStringC& szLocalStr, CFX_ByteString& strFormat, - FX_BOOL bStandard) { + bool bStandard) { FX_LOCALEDATETIMESUBCATEGORY strStyle; switch (iStyle) { case 1: @@ -2291,7 +2291,7 @@ void CXFA_FM2JSContext::GetStandardDateFormat(CFXJSE_Value* pThis, int32_t iStyle, const CFX_ByteStringC& szLocalStr, CFX_ByteString& strFormat) { - GetLocalDateFormat(pThis, iStyle, szLocalStr, strFormat, TRUE); + GetLocalDateFormat(pThis, iStyle, szLocalStr, strFormat, true); } // static @@ -2299,7 +2299,7 @@ void CXFA_FM2JSContext::GetStandardTimeFormat(CFXJSE_Value* pThis, int32_t iStyle, const CFX_ByteStringC& szLocalStr, CFX_ByteString& strFormat) { - GetLocalTimeFormat(pThis, iStyle, szLocalStr, strFormat, TRUE); + GetLocalTimeFormat(pThis, iStyle, szLocalStr, strFormat, true); } // static @@ -2307,7 +2307,7 @@ void CXFA_FM2JSContext::Num2AllTime(CFXJSE_Value* pThis, int32_t iTime, const CFX_ByteStringC& szFormat, const CFX_ByteStringC& szLocale, - FX_BOOL bGM, + bool bGM, CFX_ByteString& strTime) { int32_t iHour = 0; int32_t iMin = 0; @@ -2326,7 +2326,7 @@ void CXFA_FM2JSContext::Num2AllTime(CFXJSE_Value* pThis, iSec += iZoneSec; } - FX_BOOL iRet = FALSE; + bool iRet = false; CFX_ByteString strIsoTime; strIsoTime.Format("%02d:%02d:%02d", iHour, iMin, iSec); if (bGM) { @@ -2796,8 +2796,8 @@ void CXFA_FM2JSContext::Choose(CFXJSE_Value* pThis, return; } - FX_BOOL bFound = FALSE; - FX_BOOL bStopCounterFlags = FALSE; + bool bFound = false; + bool bStopCounterFlags = false; int32_t iArgIndex = 1; int32_t iValueIndex = 0; v8::Isolate* pIsolate = pContext->GetScriptRuntime(); @@ -2808,7 +2808,7 @@ void CXFA_FM2JSContext::Choose(CFXJSE_Value* pThis, argIndexValue->GetObjectProperty("length", lengthValue.get()); int32_t iLength = lengthValue->ToInteger(); if (iLength > 3) - bStopCounterFlags = TRUE; + bStopCounterFlags = true; iValueIndex += (iLength - 2); if (iValueIndex >= iIndex) { @@ -2828,7 +2828,7 @@ void CXFA_FM2JSContext::Choose(CFXJSE_Value* pThis, CFX_ByteString bsChoosed; ValueToUTF8String(newPropertyValue.get(), bsChoosed); args.GetReturnValue()->SetString(bsChoosed.AsStringC()); - bFound = TRUE; + bFound = true; } } else { iValueIndex++; @@ -2836,7 +2836,7 @@ void CXFA_FM2JSContext::Choose(CFXJSE_Value* pThis, CFX_ByteString bsChoosed; ValueToUTF8String(argIndexValue.get(), bsChoosed); args.GetReturnValue()->SetString(bsChoosed.AsStringC()); - bFound = TRUE; + bFound = true; } } iArgIndex++; @@ -2889,14 +2889,14 @@ void CXFA_FM2JSContext::Oneof(CFXJSE_Value* pThis, return; } - FX_BOOL bFlags = FALSE; + bool bFlags = false; std::unique_ptr argOne = GetSimpleValue(pThis, args, 0); CFXJSE_Value** parametersValue = nullptr; int32_t iCount = 0; unfoldArgs(pThis, args, parametersValue, iCount, 1); for (int32_t i = 0; i < iCount; i++) { if (simpleValueCompare(pThis, argOne.get(), parametersValue[i])) { - bFlags = TRUE; + bFlags = true; break; } } @@ -3360,13 +3360,13 @@ void CXFA_FM2JSContext::Concat(CFXJSE_Value* pThis, } CFX_ByteString resultString; - FX_BOOL bAllNull = TRUE; + bool bAllNull = true; for (int32_t i = 0; i < argc; i++) { std::unique_ptr value = GetSimpleValue(pThis, args, i); if (ValueIsNull(pThis, value.get())) continue; - bAllNull = FALSE; + bAllNull = false; CFX_ByteString valueStr; ValueToUTF8String(value.get(), valueStr); @@ -3933,8 +3933,8 @@ void CXFA_FM2JSContext::EncodeXML(const CFX_ByteStringC& szXMLString, } // static -FX_BOOL CXFA_FM2JSContext::HTMLSTR2Code(const CFX_WideStringC& pData, - uint32_t& iCode) { +bool CXFA_FM2JSContext::HTMLSTR2Code(const CFX_WideStringC& pData, + uint32_t& iCode) { uint32_t uHash = FX_HashCode_GetW(pData, false); int32_t iStart = 0; int32_t iEnd = FX_ArraySize(reservesForDecode) - 1; @@ -3943,7 +3943,7 @@ FX_BOOL CXFA_FM2JSContext::HTMLSTR2Code(const CFX_WideStringC& pData, XFA_FMHtmlHashedReserveCode htmlhashedreservecode = reservesForDecode[iMid]; if (uHash == htmlhashedreservecode.m_uHash) { iCode = htmlhashedreservecode.m_uCode; - return TRUE; + return true; } if (uHash < htmlhashedreservecode.m_uHash) @@ -3951,12 +3951,12 @@ FX_BOOL CXFA_FM2JSContext::HTMLSTR2Code(const CFX_WideStringC& pData, else iStart = iMid + 1; } while (iStart <= iEnd); - return FALSE; + return false; } // static -FX_BOOL CXFA_FM2JSContext::HTMLCode2STR(uint32_t iCode, - CFX_WideString& wsHTMLReserve) { +bool CXFA_FM2JSContext::HTMLCode2STR(uint32_t iCode, + CFX_WideString& wsHTMLReserve) { int32_t iStart = 0; int32_t iEnd = FX_ArraySize(reservesForEncode) - 1; do { @@ -3964,7 +3964,7 @@ FX_BOOL CXFA_FM2JSContext::HTMLCode2STR(uint32_t iCode, XFA_FMHtmlReserveCode htmlreservecode = reservesForEncode[iMid]; if (iCode == htmlreservecode.m_uCode) { wsHTMLReserve = htmlreservecode.m_htmlReserve; - return TRUE; + return true; } if (iCode < htmlreservecode.m_uCode) @@ -3972,7 +3972,7 @@ FX_BOOL CXFA_FM2JSContext::HTMLCode2STR(uint32_t iCode, else iStart = iMid + 1; } while (iStart <= iEnd); - return FALSE; + return false; } // static @@ -5190,12 +5190,12 @@ void CXFA_FM2JSContext::notequality_operator(CFXJSE_Value* pThis, } // static -FX_BOOL CXFA_FM2JSContext::fm_ref_equal(CFXJSE_Value* pThis, - CFXJSE_Arguments& args) { +bool CXFA_FM2JSContext::fm_ref_equal(CFXJSE_Value* pThis, + CFXJSE_Arguments& args) { std::unique_ptr argFirst = args.GetValue(0); std::unique_ptr argSecond = args.GetValue(1); if (!argFirst->IsArray() || !argSecond->IsArray()) - return FALSE; + return false; v8::Isolate* pIsolate = ToJSContext(pThis, nullptr)->GetScriptRuntime(); std::unique_ptr firstFlagValue(new CFXJSE_Value(pIsolate)); @@ -5203,14 +5203,14 @@ FX_BOOL CXFA_FM2JSContext::fm_ref_equal(CFXJSE_Value* pThis, argFirst->GetObjectPropertyByIdx(0, firstFlagValue.get()); argSecond->GetObjectPropertyByIdx(0, secondFlagValue.get()); if (firstFlagValue->ToInteger() != 3 || secondFlagValue->ToInteger() != 3) - return FALSE; + return false; std::unique_ptr firstJSObject(new CFXJSE_Value(pIsolate)); std::unique_ptr secondJSObject(new CFXJSE_Value(pIsolate)); argFirst->GetObjectPropertyByIdx(2, firstJSObject.get()); argSecond->GetObjectPropertyByIdx(2, secondJSObject.get()); if (firstJSObject->IsNull() || secondJSObject->IsNull()) - return FALSE; + return false; return (firstJSObject->ToHostObject(nullptr) == secondJSObject->ToHostObject(nullptr)); @@ -5505,14 +5505,14 @@ void CXFA_FM2JSContext::dot_accessor(CFXJSE_Value* pThis, iSizes[i] = 0; std::unique_ptr hJSObjValue(new CFXJSE_Value(pIsolate)); - FX_BOOL bAttribute = FALSE; + bool bAttribute = false; int32_t iCounter = 0; for (int32_t i = 2; i < iLength; i++) { argAccessor->GetObjectPropertyByIdx(i, hJSObjValue.get()); XFA_RESOLVENODE_RS resoveNodeRS; if (ResolveObjects(pThis, hJSObjValue.get(), szSomExp.AsStringC(), - resoveNodeRS, TRUE, szName.IsEmpty()) > 0) { + resoveNodeRS, true, szName.IsEmpty()) > 0) { ParseResolveResult(pThis, resoveNodeRS, hJSObjValue.get(), hResolveValues[i - 2], iSizes[i - 2], bAttribute); iCounter += iSizes[i - 2]; @@ -5570,12 +5570,12 @@ void CXFA_FM2JSContext::dot_accessor(CFXJSE_Value* pThis, if (argAccessor->IsObject() || (argAccessor->IsNull() && bsAccessorName.IsEmpty())) { iRet = ResolveObjects(pThis, argAccessor.get(), szSomExp.AsStringC(), - resoveNodeRS, TRUE, szName.IsEmpty()); + resoveNodeRS, true, szName.IsEmpty()); } else if (!argAccessor->IsObject() && !bsAccessorName.IsEmpty() && GetObjectForName(pThis, argAccessor.get(), bsAccessorName.AsStringC())) { iRet = ResolveObjects(pThis, argAccessor.get(), szSomExp.AsStringC(), - resoveNodeRS, TRUE, szName.IsEmpty()); + resoveNodeRS, true, szName.IsEmpty()); } if (iRet < 1) { CFX_WideString wsPropertyName = @@ -5589,7 +5589,7 @@ void CXFA_FM2JSContext::dot_accessor(CFXJSE_Value* pThis, CFXJSE_Value** hResolveValues; int32_t iSize = 0; - FX_BOOL bAttribute = FALSE; + bool bAttribute = false; ParseResolveResult(pThis, resoveNodeRS, argAccessor.get(), hResolveValues, iSize, bAttribute); CFXJSE_Value** rgValues = FX_Alloc(CFXJSE_Value*, iSize + 2); @@ -5649,12 +5649,12 @@ void CXFA_FM2JSContext::dotdot_accessor(CFXJSE_Value* pThis, CFXJSE_Value*** hResolveValues = FX_Alloc(CFXJSE_Value**, iLength - 2); int32_t* iSizes = FX_Alloc(int32_t, iLength - 2); std::unique_ptr hJSObjValue(new CFXJSE_Value(pIsolate)); - FX_BOOL bAttribute = FALSE; + bool bAttribute = false; for (int32_t i = 2; i < iLength; i++) { argAccessor->GetObjectPropertyByIdx(i, hJSObjValue.get()); XFA_RESOLVENODE_RS resoveNodeRS; if (ResolveObjects(pThis, hJSObjValue.get(), szSomExp.AsStringC(), - resoveNodeRS, FALSE) > 0) { + resoveNodeRS, false) > 0) { ParseResolveResult(pThis, resoveNodeRS, hJSObjValue.get(), hResolveValues[i - 2], iSizes[i - 2], bAttribute); iCounter += iSizes[i - 2]; @@ -5708,12 +5708,12 @@ void CXFA_FM2JSContext::dotdot_accessor(CFXJSE_Value* pThis, if (argAccessor->IsObject() || (argAccessor->IsNull() && bsAccessorName.IsEmpty())) { iRet = ResolveObjects(pThis, argAccessor.get(), szSomExp.AsStringC(), - resoveNodeRS, FALSE); + resoveNodeRS, false); } else if (!argAccessor->IsObject() && !bsAccessorName.IsEmpty() && GetObjectForName(pThis, argAccessor.get(), bsAccessorName.AsStringC())) { iRet = ResolveObjects(pThis, argAccessor.get(), szSomExp.AsStringC(), - resoveNodeRS, FALSE); + resoveNodeRS, false); } if (iRet < 1) { CFX_WideString wsPropertyName = @@ -5727,7 +5727,7 @@ void CXFA_FM2JSContext::dotdot_accessor(CFXJSE_Value* pThis, CFXJSE_Value** hResolveValues; int32_t iSize = 0; - FX_BOOL bAttribute = FALSE; + bool bAttribute = false; ParseResolveResult(pThis, resoveNodeRS, argAccessor.get(), hResolveValues, iSize, bAttribute); CFXJSE_Value** rgValues = FX_Alloc(CFXJSE_Value*, iSize + 2); @@ -5792,7 +5792,7 @@ void CXFA_FM2JSContext::is_fm_object(CFXJSE_Value* pThis, const CFX_ByteStringC& szFuncName, CFXJSE_Arguments& args) { if (args.GetLength() != 1) { - args.GetReturnValue()->SetBoolean(FALSE); + args.GetReturnValue()->SetBoolean(false); return; } @@ -5805,7 +5805,7 @@ void CXFA_FM2JSContext::is_fm_array(CFXJSE_Value* pThis, const CFX_ByteStringC& szFuncName, CFXJSE_Arguments& args) { if (args.GetLength() != 1) { - args.GetReturnValue()->SetBoolean(FALSE); + args.GetReturnValue()->SetBoolean(false); return; } @@ -6017,18 +6017,18 @@ std::unique_ptr CXFA_FM2JSContext::GetSimpleValue( } // static -FX_BOOL CXFA_FM2JSContext::ValueIsNull(CFXJSE_Value* pThis, CFXJSE_Value* arg) { +bool CXFA_FM2JSContext::ValueIsNull(CFXJSE_Value* pThis, CFXJSE_Value* arg) { if (!arg || arg->IsNull()) - return TRUE; + return true; if (!arg->IsArray() && !arg->IsObject()) - return FALSE; + return false; v8::Isolate* pIsolate = ToJSContext(pThis, nullptr)->GetScriptRuntime(); if (arg->IsArray()) { int32_t iLength = hvalue_get_array_length(pThis, arg); if (iLength < 3) - return TRUE; + return true; std::unique_ptr propertyValue(new CFXJSE_Value(pIsolate)); std::unique_ptr jsObjectValue(new CFXJSE_Value(pIsolate)); @@ -6064,11 +6064,11 @@ int32_t CXFA_FM2JSContext::hvalue_get_array_length(CFXJSE_Value* pThis, } // static -FX_BOOL CXFA_FM2JSContext::simpleValueCompare(CFXJSE_Value* pThis, - CFXJSE_Value* firstValue, - CFXJSE_Value* secondValue) { +bool CXFA_FM2JSContext::simpleValueCompare(CFXJSE_Value* pThis, + CFXJSE_Value* firstValue, + CFXJSE_Value* secondValue) { if (!firstValue) - return FALSE; + return false; if (firstValue->IsString()) { CFX_ByteString firstString, secondString; @@ -6157,18 +6157,18 @@ void CXFA_FM2JSContext::GetObjectDefaultValue(CFXJSE_Value* pValue, pDefaultValue->SetNull(); return; } - pNode->Script_Som_DefaultValue(pDefaultValue, FALSE, (XFA_ATTRIBUTE)-1); + pNode->Script_Som_DefaultValue(pDefaultValue, false, (XFA_ATTRIBUTE)-1); } // static -FX_BOOL CXFA_FM2JSContext::SetObjectDefaultValue(CFXJSE_Value* pValue, - CFXJSE_Value* hNewValue) { +bool CXFA_FM2JSContext::SetObjectDefaultValue(CFXJSE_Value* pValue, + CFXJSE_Value* hNewValue) { CXFA_Node* pNode = ToNode(CXFA_ScriptContext::ToObject(pValue, nullptr)); if (!pNode) - return FALSE; + return false; - pNode->Script_Som_DefaultValue(hNewValue, TRUE, (XFA_ATTRIBUTE)-1); - return TRUE; + pNode->Script_Som_DefaultValue(hNewValue, true, (XFA_ATTRIBUTE)-1); + return true; } // static @@ -6203,13 +6203,13 @@ void CXFA_FM2JSContext::GenerateSomExpression(const CFX_ByteStringC& szName, } // static -FX_BOOL CXFA_FM2JSContext::GetObjectForName( +bool CXFA_FM2JSContext::GetObjectForName( CFXJSE_Value* pThis, CFXJSE_Value* accessorValue, const CFX_ByteStringC& szAccessorName) { CXFA_Document* pDoc = ToJSContext(pThis, nullptr)->GetDocument(); if (!pDoc) - return FALSE; + return false; CXFA_ScriptContext* pScriptContext = pDoc->GetScriptContext(); XFA_RESOLVENODE_RS resoveNodeRS; @@ -6222,9 +6222,9 @@ FX_BOOL CXFA_FM2JSContext::GetObjectForName( if (iRet >= 1 && resoveNodeRS.dwFlags == XFA_RESOVENODE_RSTYPE_Nodes) { accessorValue->Assign( pScriptContext->GetJSValueFromMap(resoveNodeRS.nodes.GetAt(0))); - return TRUE; + return true; } - return FALSE; + return false; } // static @@ -6232,8 +6232,8 @@ int32_t CXFA_FM2JSContext::ResolveObjects(CFXJSE_Value* pThis, CFXJSE_Value* pRefValue, const CFX_ByteStringC& bsSomExp, XFA_RESOLVENODE_RS& resoveNodeRS, - FX_BOOL bdotAccessor, - FX_BOOL bHasNoResolveName) { + bool bdotAccessor, + bool bHasNoResolveName) { CXFA_Document* pDoc = ToJSContext(pThis, nullptr)->GetDocument(); if (!pDoc) return -1; @@ -6252,7 +6252,7 @@ int32_t CXFA_FM2JSContext::ResolveObjects(CFXJSE_Value* pThis, if (bHasNoResolveName) { CFX_WideString wsName; if (CXFA_Node* pXFANode = pNode->AsNode()) - pXFANode->GetAttribute(XFA_ATTRIBUTE_Name, wsName, FALSE); + pXFANode->GetAttribute(XFA_ATTRIBUTE_Name, wsName, false); if (wsName.IsEmpty()) wsName = FX_WSTRC(L"#") + pNode->GetClassName(); @@ -6280,14 +6280,14 @@ void CXFA_FM2JSContext::ParseResolveResult( CFXJSE_Value* pParentValue, CFXJSE_Value**& resultValues, int32_t& iSize, - FX_BOOL& bAttribute) { + bool& bAttribute) { iSize = 0; resultValues = nullptr; CXFA_FM2JSContext* pContext = ToJSContext(pThis, nullptr); v8::Isolate* pIsolate = pContext->GetScriptRuntime(); if (resoveNodeRS.dwFlags == XFA_RESOVENODE_RSTYPE_Nodes) { - bAttribute = FALSE; + bAttribute = false; iSize = resoveNodeRS.nodes.GetSize(); resultValues = FX_Alloc(CFXJSE_Value*, iSize); for (int32_t i = 0; i < iSize; i++) { diff --git a/xfa/fxfa/fm2js/xfa_fm2jscontext.h b/xfa/fxfa/fm2js/xfa_fm2jscontext.h index 2a81c48382..0f56c6964c 100644 --- a/xfa/fxfa/fm2js/xfa_fm2jscontext.h +++ b/xfa/fxfa/fm2js/xfa_fm2jscontext.h @@ -88,67 +88,67 @@ class CXFA_FM2JSContext : public CFXJSE_HostObject { const CFX_ByteStringC& szFuncName, CFXJSE_Arguments& args); - static FX_BOOL IsIsoDateFormat(const FX_CHAR* pData, - int32_t iLength, - int32_t& iStyle, - int32_t& iYear, - int32_t& iMonth, - int32_t& iDay); - static FX_BOOL IsIsoTimeFormat(const FX_CHAR* pData, - int32_t iLength, - int32_t& iHour, - int32_t& iMinute, - int32_t& iSecond, - int32_t& iMilliSecond, - int32_t& iZoneHour, - int32_t& iZoneMinute); - static FX_BOOL IsIsoDateTimeFormat(const FX_CHAR* pData, - int32_t iLength, - int32_t& iYear, - int32_t& iMonth, - int32_t& iDay, - int32_t& iHour, - int32_t& iMinute, - int32_t& iSecond, - int32_t& iMillionSecond, - int32_t& iZoneHour, - int32_t& iZoneMinute); - static FX_BOOL Local2IsoDate(CFXJSE_Value* pThis, - const CFX_ByteStringC& szDate, - const CFX_ByteStringC& szFormat, - const CFX_ByteStringC& szLocale, - CFX_ByteString& strIsoDate); - static FX_BOOL Local2IsoTime(CFXJSE_Value* pThis, - const CFX_ByteStringC& szTime, - const CFX_ByteStringC& szFormat, - const CFX_ByteStringC& szLocale, - CFX_ByteString& strIsoTime); - static FX_BOOL IsoDate2Local(CFXJSE_Value* pThis, - const CFX_ByteStringC& szDate, - const CFX_ByteStringC& szFormat, - const CFX_ByteStringC& szLocale, - CFX_ByteString& strLocalDate); - static FX_BOOL IsoTime2Local(CFXJSE_Value* pThis, - const CFX_ByteStringC& szTime, - const CFX_ByteStringC& szFormat, - const CFX_ByteStringC& szLocale, - CFX_ByteString& strLocalTime); - static FX_BOOL GetGMTTime(CFXJSE_Value* pThis, + static bool IsIsoDateFormat(const FX_CHAR* pData, + int32_t iLength, + int32_t& iStyle, + int32_t& iYear, + int32_t& iMonth, + int32_t& iDay); + static bool IsIsoTimeFormat(const FX_CHAR* pData, + int32_t iLength, + int32_t& iHour, + int32_t& iMinute, + int32_t& iSecond, + int32_t& iMilliSecond, + int32_t& iZoneHour, + int32_t& iZoneMinute); + static bool IsIsoDateTimeFormat(const FX_CHAR* pData, + int32_t iLength, + int32_t& iYear, + int32_t& iMonth, + int32_t& iDay, + int32_t& iHour, + int32_t& iMinute, + int32_t& iSecond, + int32_t& iMillionSecond, + int32_t& iZoneHour, + int32_t& iZoneMinute); + static bool Local2IsoDate(CFXJSE_Value* pThis, + const CFX_ByteStringC& szDate, + const CFX_ByteStringC& szFormat, + const CFX_ByteStringC& szLocale, + CFX_ByteString& strIsoDate); + static bool Local2IsoTime(CFXJSE_Value* pThis, + const CFX_ByteStringC& szTime, + const CFX_ByteStringC& szFormat, + const CFX_ByteStringC& szLocale, + CFX_ByteString& strIsoTime); + static bool IsoDate2Local(CFXJSE_Value* pThis, + const CFX_ByteStringC& szDate, + const CFX_ByteStringC& szFormat, + const CFX_ByteStringC& szLocale, + CFX_ByteString& strLocalDate); + static bool IsoTime2Local(CFXJSE_Value* pThis, const CFX_ByteStringC& szTime, const CFX_ByteStringC& szFormat, const CFX_ByteStringC& szLocale, - CFX_ByteString& strGMTTime); + CFX_ByteString& strLocalTime); + static bool GetGMTTime(CFXJSE_Value* pThis, + const CFX_ByteStringC& szTime, + const CFX_ByteStringC& szFormat, + const CFX_ByteStringC& szLocale, + CFX_ByteString& strGMTTime); static int32_t DateString2Num(const CFX_ByteStringC& szDateString); static void GetLocalDateFormat(CFXJSE_Value* pThis, int32_t iStyle, const CFX_ByteStringC& szLocalStr, CFX_ByteString& strFormat, - FX_BOOL bStandard); + bool bStandard); static void GetLocalTimeFormat(CFXJSE_Value* pThis, int32_t iStyle, const CFX_ByteStringC& szLocalStr, CFX_ByteString& strFormat, - FX_BOOL bStandard); + bool bStandard); static void GetStandardDateFormat(CFXJSE_Value* pThis, int32_t iStyle, const CFX_ByteStringC& szLocalStr, @@ -162,7 +162,7 @@ class CXFA_FM2JSContext : public CFXJSE_HostObject { int32_t iTime, const CFX_ByteStringC& szFormat, const CFX_ByteStringC& szLocale, - FX_BOOL bGM, + bool bGM, CFX_ByteString& strTime); static void GetLocalTimeZone(int32_t& iHour, int32_t& iMin, int32_t& iSec); @@ -251,8 +251,8 @@ class CXFA_FM2JSContext : public CFXJSE_HostObject { CFX_ByteTextBuf& szResultBuf); static void EncodeXML(const CFX_ByteStringC& szXMLString, CFX_ByteTextBuf& szResultBuf); - static FX_BOOL HTMLSTR2Code(const CFX_WideStringC& pData, uint32_t& iCode); - static FX_BOOL HTMLCode2STR(uint32_t iCode, CFX_WideString& wsHTMLReserve); + static bool HTMLSTR2Code(const CFX_WideStringC& pData, uint32_t& iCode); + static bool HTMLCode2STR(uint32_t iCode, CFX_WideString& wsHTMLReserve); static void Format(CFXJSE_Value* pThis, const CFX_ByteStringC& szFuncName, CFXJSE_Arguments& args); @@ -331,7 +331,7 @@ class CXFA_FM2JSContext : public CFXJSE_HostObject { static void notequality_operator(CFXJSE_Value* pThis, const CFX_ByteStringC& szFuncName, CFXJSE_Arguments& args); - static FX_BOOL fm_ref_equal(CFXJSE_Value* pThis, CFXJSE_Arguments& args); + static bool fm_ref_equal(CFXJSE_Value* pThis, CFXJSE_Arguments& args); static void less_operator(CFXJSE_Value* pThis, const CFX_ByteStringC& szFuncName, CFXJSE_Arguments& args); @@ -395,9 +395,9 @@ class CXFA_FM2JSContext : public CFXJSE_HostObject { static int32_t hvalue_get_array_length(CFXJSE_Value* pThis, CFXJSE_Value* arg); - static FX_BOOL simpleValueCompare(CFXJSE_Value* pThis, - CFXJSE_Value* firstValue, - CFXJSE_Value* secondValue); + static bool simpleValueCompare(CFXJSE_Value* pThis, + CFXJSE_Value* firstValue, + CFXJSE_Value* secondValue); static void unfoldArgs(CFXJSE_Value* pThis, CFXJSE_Arguments& args, CFXJSE_Value**& resultValues, @@ -405,33 +405,33 @@ class CXFA_FM2JSContext : public CFXJSE_HostObject { int32_t iStart = 0); static void GetObjectDefaultValue(CFXJSE_Value* pObjectValue, CFXJSE_Value* pDefaultValue); - static FX_BOOL SetObjectDefaultValue(CFXJSE_Value* pObjectValue, - CFXJSE_Value* pNewValue); + static bool SetObjectDefaultValue(CFXJSE_Value* pObjectValue, + CFXJSE_Value* pNewValue); static void GenerateSomExpression(const CFX_ByteStringC& szName, int32_t iIndexFlags, int32_t iIndexValue, bool bIsStar, CFX_ByteString& szSomExp); - static FX_BOOL GetObjectForName(CFXJSE_Value* pThis, - CFXJSE_Value* accessorValue, - const CFX_ByteStringC& szAccessorName); + static bool GetObjectForName(CFXJSE_Value* pThis, + CFXJSE_Value* accessorValue, + const CFX_ByteStringC& szAccessorName); static int32_t ResolveObjects(CFXJSE_Value* pThis, CFXJSE_Value* pParentValue, const CFX_ByteStringC& bsSomExp, XFA_RESOLVENODE_RS& resoveNodeRS, - FX_BOOL bdotAccessor = TRUE, - FX_BOOL bHasNoResolveName = FALSE); + bool bdotAccessor = true, + bool bHasNoResolveName = false); static void ParseResolveResult(CFXJSE_Value* pThis, const XFA_RESOLVENODE_RS& resoveNodeRS, CFXJSE_Value* pParentValue, CFXJSE_Value**& resultValues, int32_t& iSize, - FX_BOOL& bAttribute); + bool& bAttribute); static std::unique_ptr GetSimpleValue(CFXJSE_Value* pThis, CFXJSE_Arguments& args, uint32_t index); - static FX_BOOL ValueIsNull(CFXJSE_Value* pThis, CFXJSE_Value* pValue); + static bool ValueIsNull(CFXJSE_Value* pThis, CFXJSE_Value* pValue); static int32_t ValueToInteger(CFXJSE_Value* pThis, CFXJSE_Value* pValue); static FX_FLOAT ValueToFloat(CFXJSE_Value* pThis, CFXJSE_Value* pValue); static FX_DOUBLE ValueToDouble(CFXJSE_Value* pThis, CFXJSE_Value* pValue); diff --git a/xfa/fxfa/fm2js/xfa_fmparse.cpp b/xfa/fxfa/fm2js/xfa_fmparse.cpp index 3223df64dc..530ca85325 100644 --- a/xfa/fxfa/fm2js/xfa_fmparse.cpp +++ b/xfa/fxfa/fm2js/xfa_fmparse.cpp @@ -573,7 +573,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParsePostExpression( } } if (m_pErrorInfo->message.IsEmpty()) { - e = new CXFA_FMCallExpression(line, e, pArray.release(), FALSE); + e = new CXFA_FMCallExpression(line, e, pArray.release(), false); NextToken(); if (m_pToken->m_type != TOKlbracket) { continue; @@ -629,7 +629,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParsePostExpression( CXFA_FMSimpleExpression* pIdentifier = new CXFA_FMIdentifierExpression(tempLine, tempStr); pExpCall = new CXFA_FMCallExpression(line, pIdentifier, - pArray.release(), TRUE); + pArray.release(), true); e = new CXFA_FMMethodCallExpression(line, pExpAccessor, pExpCall); NextToken(); if (m_pToken->m_type != TOKlbracket) { @@ -661,7 +661,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParsePostExpression( s.release()); } else { CXFA_FMSimpleExpression* s = new CXFA_FMIndexExpression( - tempLine, ACCESSOR_NO_INDEX, nullptr, FALSE); + tempLine, ACCESSOR_NO_INDEX, nullptr, false); e = new CXFA_FMDotAccessorExpression(line, e, TOKdot, tempStr, s); continue; } @@ -688,7 +688,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParsePostExpression( tempStr, s.release()); } else { CXFA_FMSimpleExpression* s = new CXFA_FMIndexExpression( - tempLine, ACCESSOR_NO_INDEX, nullptr, FALSE); + tempLine, ACCESSOR_NO_INDEX, nullptr, false); e = new CXFA_FMDotDotAccessorExpression(line, e, TOKdotdot, tempStr, s); continue; @@ -716,7 +716,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParsePostExpression( tempStr, s.release()); } else { CXFA_FMSimpleExpression* s = new CXFA_FMIndexExpression( - tempLine, ACCESSOR_NO_INDEX, nullptr, FALSE); + tempLine, ACCESSOR_NO_INDEX, nullptr, false); e = new CXFA_FMDotAccessorExpression(line, e, TOKdotscream, tempStr, s); continue; @@ -730,7 +730,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParsePostExpression( break; case TOKdotstar: { CXFA_FMSimpleExpression* s = - new CXFA_FMIndexExpression(line, ACCESSOR_NO_INDEX, nullptr, FALSE); + new CXFA_FMIndexExpression(line, ACCESSOR_NO_INDEX, nullptr, false); e = new CXFA_FMDotAccessorExpression(line, e, TOKdotstar, FX_WSTRC(L"*"), s); } break; @@ -750,7 +750,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseIndexExpression() { XFA_FM_AccessorIndex accessorIndex = ACCESSOR_NO_RELATIVEINDEX; if (m_pToken->m_type == TOKmul) { pExp.reset( - new CXFA_FMIndexExpression(line, accessorIndex, s.release(), TRUE)); + new CXFA_FMIndexExpression(line, accessorIndex, s.release(), true)); NextToken(); if (m_pToken->m_type != TOKrbracket) { CFX_WideString ws_TempString(m_pToken->m_wstring); @@ -774,7 +774,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseIndexExpression() { XFA_FM_KeywordToString(TOKrparen), ws_TempString.c_str()); } else { pExp.reset( - new CXFA_FMIndexExpression(line, accessorIndex, s.release(), FALSE)); + new CXFA_FMIndexExpression(line, accessorIndex, s.release(), false)); } return pExp.release(); } diff --git a/xfa/fxfa/fm2js/xfa_lexer.cpp b/xfa/fxfa/fm2js/xfa_lexer.cpp index 2e8b6fed59..6e844bcdf0 100644 --- a/xfa/fxfa/fm2js/xfa_lexer.cpp +++ b/xfa/fxfa/fm2js/xfa_lexer.cpp @@ -20,36 +20,32 @@ struct XFA_FMDChar { return p; } static uint16_t get(const FX_WCHAR* p) { return *p; } - static FX_BOOL isWhiteSpace(const FX_WCHAR* p) { + static bool isWhiteSpace(const FX_WCHAR* p) { return (*p) == 0x09 || (*p) == 0x0b || (*p) == 0x0c || (*p) == 0x20; } - static FX_BOOL isLineTerminator(const FX_WCHAR* p) { + static bool isLineTerminator(const FX_WCHAR* p) { return *p == 0x0A || *p == 0x0D; } - static FX_BOOL isBinary(const FX_WCHAR* p) { - return (*p) >= '0' && (*p) <= '1'; - } - static FX_BOOL isOctal(const FX_WCHAR* p) { - return (*p) >= '0' && (*p) <= '7'; - } - static FX_BOOL isDigital(const FX_WCHAR* p) { + static bool isBinary(const FX_WCHAR* p) { return (*p) >= '0' && (*p) <= '1'; } + static bool isOctal(const FX_WCHAR* p) { return (*p) >= '0' && (*p) <= '7'; } + static bool isDigital(const FX_WCHAR* p) { return (*p) >= '0' && (*p) <= '9'; } - static FX_BOOL isHex(const FX_WCHAR* p) { + static bool isHex(const FX_WCHAR* p) { return isDigital(p) || ((*p) >= 'a' && (*p) <= 'f') || ((*p) >= 'A' && (*p) <= 'F'); } - static FX_BOOL isAlpha(const FX_WCHAR* p) { + static bool isAlpha(const FX_WCHAR* p) { return ((*p) <= 'z' && (*p) >= 'a') || ((*p) <= 'Z' && (*p) >= 'A'); } - static FX_BOOL isAvalid(const FX_WCHAR* p, FX_BOOL flag = 0); - static FX_BOOL string2number(const FX_WCHAR* s, - FX_DOUBLE* pValue, - const FX_WCHAR*& pEnd); - static FX_BOOL isUnicodeAlpha(uint16_t ch); + static bool isAvalid(const FX_WCHAR* p, bool flag = 0); + static bool string2number(const FX_WCHAR* s, + FX_DOUBLE* pValue, + const FX_WCHAR*& pEnd); + static bool isUnicodeAlpha(uint16_t ch); }; -inline FX_BOOL XFA_FMDChar::isAvalid(const FX_WCHAR* p, FX_BOOL flag) { +inline bool XFA_FMDChar::isAvalid(const FX_WCHAR* p, bool flag) { if (*p == 0) { return 1; } @@ -65,24 +61,24 @@ inline FX_BOOL XFA_FMDChar::isAvalid(const FX_WCHAR* p, FX_BOOL flag) { return 0; } -inline FX_BOOL XFA_FMDChar::string2number(const FX_WCHAR* s, - FX_DOUBLE* pValue, - const FX_WCHAR*& pEnd) { +inline bool XFA_FMDChar::string2number(const FX_WCHAR* s, + FX_DOUBLE* pValue, + const FX_WCHAR*& pEnd) { if (s) { *pValue = wcstod((wchar_t*)s, (wchar_t**)&pEnd); } return 0; } -inline FX_BOOL XFA_FMDChar::isUnicodeAlpha(uint16_t ch) { +inline bool XFA_FMDChar::isUnicodeAlpha(uint16_t ch) { if (ch == 0 || ch == 0x0A || ch == 0x0D || ch == 0x09 || ch == 0x0B || ch == 0x0C || ch == 0x20 || ch == '.' || ch == ';' || ch == '"' || ch == '=' || ch == '<' || ch == '>' || ch == ',' || ch == '(' || ch == ')' || ch == ']' || ch == '[' || ch == '&' || ch == '|' || ch == '+' || ch == '-' || ch == '*' || ch == '/') { - return FALSE; + return false; } - return TRUE; + return true; } const XFA_FMKeyword keyWords[] = { @@ -542,9 +538,9 @@ void CXFA_FMLexer::Error(const FX_WCHAR* msg, ...) { va_end(ap); } -FX_BOOL CXFA_FMLexer::HasError() const { +bool CXFA_FMLexer::HasError() const { if (m_pErrorInfo->message.IsEmpty()) { - return FALSE; + return false; } - return TRUE; + return true; } diff --git a/xfa/fxfa/fm2js/xfa_lexer.h b/xfa/fxfa/fm2js/xfa_lexer.h index 220a4d7630..9395c06814 100644 --- a/xfa/fxfa/fm2js/xfa_lexer.h +++ b/xfa/fxfa/fm2js/xfa_lexer.h @@ -122,7 +122,7 @@ class CXFA_FMLexer { const FX_WCHAR* SavePos() { return m_ptr; } void RestorePos(const FX_WCHAR* pPos) { m_ptr = pPos; } void Error(const FX_WCHAR* msg, ...); - FX_BOOL HasError() const; + bool HasError() const; protected: CXFA_FMToken* Scan(); diff --git a/xfa/fxfa/fm2js/xfa_simpleexpression.cpp b/xfa/fxfa/fm2js/xfa_simpleexpression.cpp index fdae9fc772..be02e51ec4 100644 --- a/xfa/fxfa/fm2js/xfa_simpleexpression.cpp +++ b/xfa/fxfa/fm2js/xfa_simpleexpression.cpp @@ -342,7 +342,7 @@ void CXFA_FMEqualityExpression::ToJavaScript(CFX_WideTextBuf& javascript) { javascript << gs_lpStrExpFuncName[NOTEQUALITY]; break; default: - ASSERT(FALSE); + ASSERT(false); break; } javascript << FX_WSTRC(L"("); @@ -378,7 +378,7 @@ void CXFA_FMRelationalExpression::ToJavaScript(CFX_WideTextBuf& javascript) { javascript << gs_lpStrExpFuncName[GREATEREQUAL]; break; default: - ASSERT(FALSE); + ASSERT(false); break; } javascript << FX_WSTRC(L"("); @@ -404,7 +404,7 @@ void CXFA_FMAdditiveExpression::ToJavaScript(CFX_WideTextBuf& javascript) { javascript << gs_lpStrExpFuncName[MINUS]; break; default: - ASSERT(FALSE); + ASSERT(false); break; } javascript << FX_WSTRC(L"("); @@ -431,7 +431,7 @@ void CXFA_FMMultiplicativeExpression::ToJavaScript( javascript << gs_lpStrExpFuncName[DIVIDE]; break; default: - ASSERT(FALSE); + ASSERT(false); break; } javascript << FX_WSTRC(L"("); @@ -478,7 +478,7 @@ CXFA_FMCallExpression::CXFA_FMCallExpression( uint32_t line, CXFA_FMSimpleExpression* pExp, CFX_ArrayTemplate* pArguments, - FX_BOOL bIsSomMethod) + bool bIsSomMethod) : CXFA_FMUnaryExpression(line, TOKcall, pExp), m_bIsSomMethod(bIsSomMethod), m_pArguments(pArguments) {} @@ -666,7 +666,7 @@ CXFA_FMIndexExpression::CXFA_FMIndexExpression( uint32_t line, XFA_FM_AccessorIndex accessorIndex, CXFA_FMSimpleExpression* pIndexExp, - FX_BOOL bIsStarIndex) + bool bIsStarIndex) : CXFA_FMUnaryExpression(line, TOKlbracket, pIndexExp), m_accessorIndex(accessorIndex), m_bIsStarIndex(bIsStarIndex) {} diff --git a/xfa/fxfa/fm2js/xfa_simpleexpression.h b/xfa/fxfa/fm2js/xfa_simpleexpression.h index f0f2f390d5..6c1e6257bd 100644 --- a/xfa/fxfa/fm2js/xfa_simpleexpression.h +++ b/xfa/fxfa/fm2js/xfa_simpleexpression.h @@ -231,7 +231,7 @@ class CXFA_FMCallExpression : public CXFA_FMUnaryExpression { CXFA_FMCallExpression(uint32_t line, CXFA_FMSimpleExpression* pExp, CFX_ArrayTemplate* pArguments, - FX_BOOL bIsSomMethod); + bool bIsSomMethod); ~CXFA_FMCallExpression() override; bool IsBuildInFunc(CFX_WideTextBuf* funcName); @@ -239,7 +239,7 @@ class CXFA_FMCallExpression : public CXFA_FMUnaryExpression { void ToJavaScript(CFX_WideTextBuf& javascript) override; private: - FX_BOOL m_bIsSomMethod; + bool m_bIsSomMethod; CFX_ArrayTemplate* m_pArguments; }; @@ -262,13 +262,13 @@ class CXFA_FMIndexExpression : public CXFA_FMUnaryExpression { CXFA_FMIndexExpression(uint32_t line, XFA_FM_AccessorIndex accessorIndex, CXFA_FMSimpleExpression* pIndexExp, - FX_BOOL bIsStarIndex); + bool bIsStarIndex); ~CXFA_FMIndexExpression() override {} void ToJavaScript(CFX_WideTextBuf& javascript) override; private: XFA_FM_AccessorIndex m_accessorIndex; - FX_BOOL m_bIsStarIndex; + bool m_bIsStarIndex; }; class CXFA_FMDotDotAccessorExpression : public CXFA_FMBinExpression { diff --git a/xfa/fxfa/fm2js/xfa_simpleexpression_unittest.cpp b/xfa/fxfa/fm2js/xfa_simpleexpression_unittest.cpp index 3c0a69c100..534fc18a6f 100644 --- a/xfa/fxfa/fm2js/xfa_simpleexpression_unittest.cpp +++ b/xfa/fxfa/fm2js/xfa_simpleexpression_unittest.cpp @@ -19,7 +19,7 @@ TEST(FMCallExpression, more_than_32_arguments) { for (size_t i = 0; i < 50; i++) args->Add(new CXFA_FMSimpleExpression(0, TOKnan)); - CXFA_FMCallExpression callExp(0, exp.release(), args.release(), TRUE); + CXFA_FMCallExpression callExp(0, exp.release(), args.release(), true); CFX_WideTextBuf js; callExp.ToJavaScript(js); -- cgit v1.2.3