From 736f28ab2434e2da1de66ff91b64741483ff9cba Mon Sep 17 00:00:00 2001 From: tsepez Date: Fri, 25 Mar 2016 14:19:51 -0700 Subject: Remove FX_DWORD from XFA. Review URL: https://codereview.chromium.org/1830323006 --- xfa/fxfa/fm2js/xfa_expression.cpp | 26 ++++++++--------- xfa/fxfa/fm2js/xfa_fm2jscontext.cpp | 10 +++---- xfa/fxfa/fm2js/xfa_fmparse.cpp | 52 ++++++++++++++++----------------- xfa/fxfa/fm2js/xfa_lexer.cpp | 8 ++--- xfa/fxfa/fm2js/xfa_simpleexpression.cpp | 52 ++++++++++++++++----------------- 5 files changed, 74 insertions(+), 74 deletions(-) (limited to 'xfa/fxfa/fm2js') diff --git a/xfa/fxfa/fm2js/xfa_expression.cpp b/xfa/fxfa/fm2js/xfa_expression.cpp index a97e777256..0166fa609f 100644 --- a/xfa/fxfa/fm2js/xfa_expression.cpp +++ b/xfa/fxfa/fm2js/xfa_expression.cpp @@ -18,10 +18,10 @@ const CFX_WideStringC RUNTIMEBLOCKTEMPARRAYINDEX = } // namespace -CXFA_FMExpression::CXFA_FMExpression(FX_DWORD line) +CXFA_FMExpression::CXFA_FMExpression(uint32_t line) : m_type(XFA_FM_EXPTYPE_UNKNOWN), m_line(line) {} -CXFA_FMExpression::CXFA_FMExpression(FX_DWORD line, XFA_FM_EXPTYPE type) +CXFA_FMExpression::CXFA_FMExpression(uint32_t line, XFA_FM_EXPTYPE type) : m_type(type), m_line(line) {} void CXFA_FMExpression::ToJavaScript(CFX_WideTextBuf& javascript) {} @@ -29,7 +29,7 @@ void CXFA_FMExpression::ToJavaScript(CFX_WideTextBuf& javascript) {} void CXFA_FMExpression::ToImpliedReturnJS(CFX_WideTextBuf& javascript) {} CXFA_FMFunctionDefinition::CXFA_FMFunctionDefinition( - FX_DWORD line, + uint32_t line, FX_BOOL isGlobal, const CFX_WideStringC& wsName, CFX_WideStringCArray* pArguments, @@ -118,7 +118,7 @@ void CXFA_FMFunctionDefinition::ToJavaScript(CFX_WideTextBuf& javascript) { void CXFA_FMFunctionDefinition::ToImpliedReturnJS(CFX_WideTextBuf&) {} -CXFA_FMVarExpression::CXFA_FMVarExpression(FX_DWORD line, +CXFA_FMVarExpression::CXFA_FMVarExpression(uint32_t line, const CFX_WideStringC& wsName, CXFA_FMExpression* pInit) : CXFA_FMExpression(line, XFA_FM_EXPTYPE_VAR), @@ -171,7 +171,7 @@ void CXFA_FMVarExpression::ToImpliedReturnJS(CFX_WideTextBuf& javascript) { javascript << FX_WSTRC(L";\n"); } -CXFA_FMExpExpression::CXFA_FMExpExpression(FX_DWORD line, +CXFA_FMExpExpression::CXFA_FMExpExpression(uint32_t line, CXFA_FMSimpleExpression* pExpression) : CXFA_FMExpression(line, XFA_FM_EXPTYPE_EXP), m_pExpression(pExpression) {} @@ -208,7 +208,7 @@ void CXFA_FMExpExpression::ToImpliedReturnJS(CFX_WideTextBuf& javascript) { } } -CXFA_FMBlockExpression::CXFA_FMBlockExpression(FX_DWORD line, +CXFA_FMBlockExpression::CXFA_FMBlockExpression(uint32_t line, CFX_PtrArray* pExpressionList) : CXFA_FMExpression(line, XFA_FM_EXPTYPE_BLOCK), m_pExpressionList(pExpressionList) {} @@ -251,7 +251,7 @@ void CXFA_FMBlockExpression::ToImpliedReturnJS(CFX_WideTextBuf& javascript) { javascript << FX_WSTRC(L"}\n"); } -CXFA_FMDoExpression::CXFA_FMDoExpression(FX_DWORD line, +CXFA_FMDoExpression::CXFA_FMDoExpression(uint32_t line, CXFA_FMExpression* pList) : CXFA_FMExpression(line), m_pList(pList) {} @@ -263,7 +263,7 @@ void CXFA_FMDoExpression::ToImpliedReturnJS(CFX_WideTextBuf& javascript) { m_pList->ToImpliedReturnJS(javascript); } -CXFA_FMIfExpression::CXFA_FMIfExpression(FX_DWORD line, +CXFA_FMIfExpression::CXFA_FMIfExpression(uint32_t line, CXFA_FMSimpleExpression* pExpression, CXFA_FMExpression* pIfExpression, CXFA_FMExpression* pElseExpression) @@ -331,7 +331,7 @@ void CXFA_FMLoopExpression::ToJavaScript(CFX_WideTextBuf& javascript) {} void CXFA_FMLoopExpression::ToImpliedReturnJS(CFX_WideTextBuf&) {} CXFA_FMWhileExpression::CXFA_FMWhileExpression( - FX_DWORD line, + uint32_t line, CXFA_FMSimpleExpression* pCondition, CXFA_FMExpression* pExpression) : CXFA_FMLoopExpression(line), @@ -354,7 +354,7 @@ void CXFA_FMWhileExpression::ToImpliedReturnJS(CFX_WideTextBuf& javascript) { m_pExpression->ToImpliedReturnJS(javascript); } -CXFA_FMBreakExpression::CXFA_FMBreakExpression(FX_DWORD line) +CXFA_FMBreakExpression::CXFA_FMBreakExpression(uint32_t line) : CXFA_FMExpression(line, XFA_FM_EXPTYPE_BREAK) {} CXFA_FMBreakExpression::~CXFA_FMBreakExpression() {} @@ -371,7 +371,7 @@ void CXFA_FMBreakExpression::ToImpliedReturnJS(CFX_WideTextBuf& javascript) { javascript << FX_WSTRC(L"break;\n"); } -CXFA_FMContinueExpression::CXFA_FMContinueExpression(FX_DWORD line) +CXFA_FMContinueExpression::CXFA_FMContinueExpression(uint32_t line) : CXFA_FMExpression(line, XFA_FM_EXPTYPE_CONTINUE) {} CXFA_FMContinueExpression::~CXFA_FMContinueExpression() {} @@ -388,7 +388,7 @@ void CXFA_FMContinueExpression::ToImpliedReturnJS(CFX_WideTextBuf& javascript) { javascript << FX_WSTRC(L"continue;\n"); } -CXFA_FMForExpression::CXFA_FMForExpression(FX_DWORD line, +CXFA_FMForExpression::CXFA_FMForExpression(uint32_t line, const CFX_WideStringC& wsVariant, CXFA_FMSimpleExpression* pAssignment, CXFA_FMSimpleExpression* pAccessor, @@ -504,7 +504,7 @@ void CXFA_FMForExpression::ToImpliedReturnJS(CFX_WideTextBuf& javascript) { } CXFA_FMForeachExpression::CXFA_FMForeachExpression( - FX_DWORD line, + uint32_t line, const CFX_WideStringC& wsIdentifier, CFX_PtrArray* pAccessors, CXFA_FMExpression* pList) diff --git a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp index 7b3573f36e..3acae67bc3 100644 --- a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp +++ b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp @@ -4288,7 +4288,7 @@ FX_BOOL CXFA_FM2JSContext::HTMLCode2STR(uint32_t iCode, return FALSE; } static FX_BOOL XFA_PATTERN_STRING_Type(const CFX_ByteStringC& szPattern, - FX_DWORD& patternType) { + uint32_t& patternType) { CFX_WideString wsPattern = CFX_WideString::FromUTF8(szPattern.GetCStr(), szPattern.GetLength()); if (FX_WSTRC(L"datetime") == wsPattern.Left(8)) { @@ -4391,7 +4391,7 @@ void CXFA_FM2JSContext::Format(FXJSE_HOBJECT hThis, FXSYS_assert(pThisNode); CXFA_WidgetData widgetData(pThisNode); IFX_Locale* pLocale = widgetData.GetLocal(); - FX_DWORD patternType; + uint32_t patternType; FX_BOOL bCompelte = XFA_PATTERN_STRING_Type(szPattern, patternType); CFX_WideString wsPattern = CFX_WideString::FromUTF8(szPattern, szPattern.GetLength()); @@ -4603,7 +4603,7 @@ void CXFA_FM2JSContext::Parse(FXJSE_HOBJECT hThis, FXSYS_assert(pThisNode); CXFA_WidgetData widgetData(pThisNode); IFX_Locale* pLocale = widgetData.GetLocal(); - FX_DWORD patternType; + uint32_t patternType; FX_BOOL bCompletePattern = XFA_PATTERN_STRING_Type(szPattern, patternType); CFX_WideString wsPattern = @@ -6837,7 +6837,7 @@ FX_BOOL CXFA_FM2JSContext::GetObjectByName( } IXFA_ScriptContext* pScriptContext = pDoc->GetScriptContext(); XFA_RESOLVENODE_RS resoveNodeRS; - FX_DWORD dwFlags = XFA_RESOLVENODE_Children | XFA_RESOLVENODE_Properties | + uint32_t dwFlags = XFA_RESOLVENODE_Children | XFA_RESOLVENODE_Properties | XFA_RESOLVENODE_Siblings | XFA_RESOLVENODE_Parent; int32_t iRet = pScriptContext->ResolveObjects( pScriptContext->GetThisObject(), @@ -6868,7 +6868,7 @@ int32_t CXFA_FM2JSContext::ResolveObjects(FXJSE_HOBJECT hThis, } IXFA_ScriptContext* pScriptContext = pDoc->GetScriptContext(); CXFA_Object* pNode = NULL; - FX_DWORD dFlags = 0UL; + uint32_t dFlags = 0UL; if (bdotAccessor) { if (FXJSE_Value_IsNull(hRefValue)) { pNode = pScriptContext->GetThisObject(); diff --git a/xfa/fxfa/fm2js/xfa_fmparse.cpp b/xfa/fxfa/fm2js/xfa_fmparse.cpp index 6e30d95f1a..e66a42f471 100644 --- a/xfa/fxfa/fm2js/xfa_fmparse.cpp +++ b/xfa/fxfa/fm2js/xfa_fmparse.cpp @@ -36,7 +36,7 @@ void CXFA_FMParse::Check(XFA_FM_TOKEN op) { NextToken(); } -void CXFA_FMParse::Error(FX_DWORD lineNum, XFA_FM_ERRMSG msg, ...) { +void CXFA_FMParse::Error(uint32_t lineNum, XFA_FM_ERRMSG msg, ...) { m_pErrorInfo->linenum = lineNum; const FX_WCHAR* lpMessageInfo = XFA_FM_ErrorMsg(msg); va_list ap; @@ -79,7 +79,7 @@ CXFA_FMExpression* CXFA_FMParse::ParseFunction() { CFX_WideStringC ident; std::unique_ptr pArguments; std::unique_ptr pExpressions; - FX_DWORD line = m_pToken->m_uLinenum; + uint32_t line = m_pToken->m_uLinenum; NextToken(); if (m_pToken->m_type != TOKidentifier) { CFX_WideString ws_TempString = m_pToken->m_wstring; @@ -142,7 +142,7 @@ CXFA_FMExpression* CXFA_FMParse::ParseFunction() { CXFA_FMExpression* CXFA_FMParse::ParseExpression() { std::unique_ptr e; - FX_DWORD line = m_pToken->m_uLinenum; + uint32_t line = m_pToken->m_uLinenum; switch (m_pToken->m_type) { case TOKvar: e.reset(ParseVarExpression()); @@ -193,7 +193,7 @@ CXFA_FMExpression* CXFA_FMParse::ParseExpression() { CXFA_FMExpression* CXFA_FMParse::ParseVarExpression() { std::unique_ptr e; CFX_WideStringC ident; - FX_DWORD line = m_pToken->m_uLinenum; + uint32_t line = m_pToken->m_uLinenum; NextToken(); if (m_pToken->m_type != TOKidentifier) { CFX_WideString ws_TempString = m_pToken->m_wstring; @@ -216,7 +216,7 @@ CXFA_FMExpression* CXFA_FMParse::ParseVarExpression() { } CXFA_FMSimpleExpression* CXFA_FMParse::ParseSimpleExpression() { - FX_DWORD line = m_pToken->m_uLinenum; + uint32_t line = m_pToken->m_uLinenum; std::unique_ptr pExp1(ParseLogicalOrExpression()); while (m_pToken->m_type == TOKassign) { NextToken(); @@ -232,7 +232,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseSimpleExpression() { } CXFA_FMExpression* CXFA_FMParse::ParseExpExpression() { - FX_DWORD line = m_pToken->m_uLinenum; + uint32_t line = m_pToken->m_uLinenum; std::unique_ptr pExp1(ParseSimpleExpression()); std::unique_ptr e; if (m_pErrorInfo->message.IsEmpty()) { @@ -244,7 +244,7 @@ CXFA_FMExpression* CXFA_FMParse::ParseExpExpression() { } CXFA_FMSimpleExpression* CXFA_FMParse::ParseLogicalOrExpression() { - FX_DWORD line = m_pToken->m_uLinenum; + uint32_t line = m_pToken->m_uLinenum; std::unique_ptr e1(ParseLogicalAndExpression()); for (;;) { switch (m_pToken->m_type) { @@ -270,7 +270,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseLogicalOrExpression() { } CXFA_FMSimpleExpression* CXFA_FMParse::ParseLogicalAndExpression() { - FX_DWORD line = m_pToken->m_uLinenum; + uint32_t line = m_pToken->m_uLinenum; std::unique_ptr e1(ParseEqualityExpression()); for (;;) { switch (m_pToken->m_type) { @@ -295,7 +295,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseLogicalAndExpression() { } CXFA_FMSimpleExpression* CXFA_FMParse::ParseEqualityExpression() { - FX_DWORD line = m_pToken->m_uLinenum; + uint32_t line = m_pToken->m_uLinenum; std::unique_ptr e1(ParseRelationalExpression()); for (;;) { std::unique_ptr e2; @@ -331,7 +331,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseEqualityExpression() { } CXFA_FMSimpleExpression* CXFA_FMParse::ParseRelationalExpression() { - FX_DWORD line = m_pToken->m_uLinenum; + uint32_t line = m_pToken->m_uLinenum; std::unique_ptr e1(ParseAddtiveExpression()); for (;;) { std::unique_ptr e2; @@ -389,7 +389,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseRelationalExpression() { } CXFA_FMSimpleExpression* CXFA_FMParse::ParseAddtiveExpression() { - FX_DWORD line = m_pToken->m_uLinenum; + uint32_t line = m_pToken->m_uLinenum; std::unique_ptr e1(ParseMultiplicativeExpression()); for (;;) { std::unique_ptr e2; @@ -423,7 +423,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseAddtiveExpression() { } CXFA_FMSimpleExpression* CXFA_FMParse::ParseMultiplicativeExpression() { - FX_DWORD line = m_pToken->m_uLinenum; + uint32_t line = m_pToken->m_uLinenum; std::unique_ptr e1(ParseUnaryExpression()); for (;;) { std::unique_ptr e2; @@ -458,7 +458,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseMultiplicativeExpression() { CXFA_FMSimpleExpression* CXFA_FMParse::ParseUnaryExpression() { std::unique_ptr e; - FX_DWORD line = m_pToken->m_uLinenum; + uint32_t line = m_pToken->m_uLinenum; switch (m_pToken->m_type) { case TOKplus: NextToken(); @@ -496,7 +496,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseUnaryExpression() { CXFA_FMSimpleExpression* CXFA_FMParse::ParsePrimaryExpression() { std::unique_ptr e; - FX_DWORD line = m_pToken->m_uLinenum; + uint32_t line = m_pToken->m_uLinenum; switch (m_pToken->m_type) { case TOKnumber: e.reset(new CXFA_FMNumberExpression(line, m_pToken->m_wstring)); @@ -546,7 +546,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParsePrimaryExpression() { CXFA_FMSimpleExpression* CXFA_FMParse::ParsePostExpression( CXFA_FMSimpleExpression* e) { - FX_DWORD line = m_pToken->m_uLinenum; + uint32_t line = m_pToken->m_uLinenum; while (1) { switch (m_pToken->m_type) { case TOKlparen: { @@ -599,7 +599,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParsePostExpression( NextToken(); if (m_pToken->m_type == TOKidentifier) { CFX_WideStringC tempStr = m_pToken->m_wstring; - FX_DWORD tempLine = m_pToken->m_uLinenum; + uint32_t tempLine = m_pToken->m_uLinenum; NextToken(); if (m_pToken->m_type == TOKlparen) { CXFA_FMSimpleExpression* pExpAccessor; @@ -678,7 +678,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParsePostExpression( NextToken(); if (m_pToken->m_type == TOKidentifier) { CFX_WideStringC tempStr = m_pToken->m_wstring; - FX_DWORD tempLine = m_pToken->m_uLinenum; + uint32_t tempLine = m_pToken->m_uLinenum; NextToken(); if (m_pToken->m_type == TOKlbracket) { std::unique_ptr s(ParseIndexExpression()); @@ -706,7 +706,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParsePostExpression( NextToken(); if (m_pToken->m_type == TOKidentifier) { CFX_WideStringC tempStr = m_pToken->m_wstring; - FX_DWORD tempLine = m_pToken->m_uLinenum; + uint32_t tempLine = m_pToken->m_uLinenum; NextToken(); if (m_pToken->m_type == TOKlbracket) { std::unique_ptr s(ParseIndexExpression()); @@ -746,7 +746,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParsePostExpression( CXFA_FMSimpleExpression* CXFA_FMParse::ParseIndexExpression() { std::unique_ptr pExp; - FX_DWORD line = m_pToken->m_uLinenum; + uint32_t line = m_pToken->m_uLinenum; NextToken(); std::unique_ptr s; XFA_FM_AccessorIndex accessorIndex = ACCESSOR_NO_RELATIVEINDEX; @@ -790,7 +790,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseParenExpression() { return nullptr; } - FX_DWORD line = m_pToken->m_uLinenum; + uint32_t line = m_pToken->m_uLinenum; std::unique_ptr pExp1(ParseLogicalOrExpression()); while (m_pToken->m_type == TOKassign) { @@ -808,7 +808,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseParenExpression() { } CXFA_FMExpression* CXFA_FMParse::ParseBlockExpression() { - FX_DWORD line = m_pToken->m_uLinenum; + uint32_t line = m_pToken->m_uLinenum; CXFA_FMExpression* e = nullptr; std::unique_ptr expression(new CFX_PtrArray()); while (1) { @@ -849,7 +849,7 @@ CXFA_FMExpression* CXFA_FMParse::ParseBlockExpression() { } CXFA_FMExpression* CXFA_FMParse::ParseIfExpression() { - FX_DWORD line = m_pToken->m_uLinenum; + uint32_t line = m_pToken->m_uLinenum; const FX_WCHAR* pStartPos = m_lexer->SavePos(); NextToken(); Check(TOKlparen); @@ -906,7 +906,7 @@ CXFA_FMExpression* CXFA_FMParse::ParseIfExpression() { } CXFA_FMExpression* CXFA_FMParse::ParseWhileExpression() { - FX_DWORD line = m_pToken->m_uLinenum; + uint32_t line = m_pToken->m_uLinenum; NextToken(); std::unique_ptr pCondition(ParseParenExpression()); Check(TOKdo); @@ -938,7 +938,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseSubassignmentInForExpression() { CXFA_FMExpression* CXFA_FMParse::ParseForExpression() { CFX_WideStringC wsVariant; - FX_DWORD line = m_pToken->m_uLinenum; + uint32_t line = m_pToken->m_uLinenum; NextToken(); if (m_pToken->m_type != TOKidentifier) { CFX_WideString ws_TempString = m_pToken->m_wstring; @@ -990,7 +990,7 @@ CXFA_FMExpression* CXFA_FMParse::ParseForeachExpression() { CFX_WideStringC wsIdentifier; std::unique_ptr pAccessors; std::unique_ptr pList; - FX_DWORD line = m_pToken->m_uLinenum; + uint32_t line = m_pToken->m_uLinenum; NextToken(); if (m_pToken->m_type != TOKidentifier) { CFX_WideString ws_TempString = m_pToken->m_wstring; @@ -1038,7 +1038,7 @@ CXFA_FMExpression* CXFA_FMParse::ParseForeachExpression() { CXFA_FMExpression* CXFA_FMParse::ParseDoExpression() { std::unique_ptr e; - FX_DWORD line = m_pToken->m_uLinenum; + uint32_t line = m_pToken->m_uLinenum; NextToken(); e.reset(ParseBlockExpression()); Check(TOKend); diff --git a/xfa/fxfa/fm2js/xfa_lexer.cpp b/xfa/fxfa/fm2js/xfa_lexer.cpp index 7c9682de8b..20b1320f70 100644 --- a/xfa/fxfa/fm2js/xfa_lexer.cpp +++ b/xfa/fxfa/fm2js/xfa_lexer.cpp @@ -160,7 +160,7 @@ const FX_WCHAR* XFA_FM_KeywordToString(XFA_FM_TOKEN op) { CXFA_FMToken::CXFA_FMToken() : m_type(TOKreserver), m_uLinenum(1) {} -CXFA_FMToken::CXFA_FMToken(FX_DWORD uLineNum) +CXFA_FMToken::CXFA_FMToken(uint32_t uLineNum) : m_type(TOKreserver), m_uLinenum(uLineNum) {} CXFA_FMLexer::CXFA_FMLexer(const CFX_WideStringC& wsFormCalc, @@ -404,7 +404,7 @@ CXFA_FMToken* CXFA_FMLexer::Scan() { } } -FX_DWORD CXFA_FMLexer::Number(CXFA_FMToken* t, +uint32_t CXFA_FMLexer::Number(CXFA_FMToken* t, const FX_WCHAR* p, const FX_WCHAR*& pEnd) { FX_DOUBLE number = 0; @@ -418,7 +418,7 @@ FX_DWORD CXFA_FMLexer::Number(CXFA_FMToken* t, return 0; } -FX_DWORD CXFA_FMLexer::String(CXFA_FMToken* t, +uint32_t CXFA_FMLexer::String(CXFA_FMToken* t, const FX_WCHAR* p, const FX_WCHAR*& pEnd) { const FX_WCHAR* pStart = p; @@ -458,7 +458,7 @@ FX_DWORD CXFA_FMLexer::String(CXFA_FMToken* t, return 0; } -FX_DWORD CXFA_FMLexer::Identifiers(CXFA_FMToken* t, +uint32_t CXFA_FMLexer::Identifiers(CXFA_FMToken* t, const FX_WCHAR* p, const FX_WCHAR*& pEnd) { const FX_WCHAR* pStart = p; diff --git a/xfa/fxfa/fm2js/xfa_simpleexpression.cpp b/xfa/fxfa/fm2js/xfa_simpleexpression.cpp index ece1cde7ae..113fbfb536 100644 --- a/xfa/fxfa/fm2js/xfa_simpleexpression.cpp +++ b/xfa/fxfa/fm2js/xfa_simpleexpression.cpp @@ -81,7 +81,7 @@ const XFA_FMBuildInFunc g_BuildInFuncs[] = { struct XFA_FMSOMMethod { uint32_t m_uHash; const FX_WCHAR* m_wsSomMethodName; - FX_DWORD m_dParameters; + uint32_t m_dParameters; }; const XFA_FMSOMMethod gs_FMSomMethods[] = { {0x00000068, L"h", 0x01}, @@ -114,7 +114,7 @@ CFX_WideStringC XFA_FM_EXPTypeToString( return gs_lpStrExpFuncName[simpleExpType]; } -CXFA_FMSimpleExpression::CXFA_FMSimpleExpression(FX_DWORD line, XFA_FM_TOKEN op) +CXFA_FMSimpleExpression::CXFA_FMSimpleExpression(uint32_t line, XFA_FM_TOKEN op) : m_line(line), m_op(op) {} void CXFA_FMSimpleExpression::ToJavaScript(CFX_WideTextBuf& javascript) {} @@ -125,14 +125,14 @@ XFA_FM_TOKEN CXFA_FMSimpleExpression::GetOperatorToken() const { return m_op; } -CXFA_FMNullExpression::CXFA_FMNullExpression(FX_DWORD line) +CXFA_FMNullExpression::CXFA_FMNullExpression(uint32_t line) : CXFA_FMSimpleExpression(line, TOKnull) {} void CXFA_FMNullExpression::ToJavaScript(CFX_WideTextBuf& javascript) { javascript << FX_WSTRC(L"null"); } -CXFA_FMNumberExpression::CXFA_FMNumberExpression(FX_DWORD line, +CXFA_FMNumberExpression::CXFA_FMNumberExpression(uint32_t line, CFX_WideStringC wsNumber) : CXFA_FMSimpleExpression(line, TOKnumber), m_wsNumber(wsNumber) {} @@ -140,7 +140,7 @@ void CXFA_FMNumberExpression::ToJavaScript(CFX_WideTextBuf& javascript) { javascript << m_wsNumber; } -CXFA_FMStringExpression::CXFA_FMStringExpression(FX_DWORD line, +CXFA_FMStringExpression::CXFA_FMStringExpression(uint32_t line, CFX_WideStringC wsString) : CXFA_FMSimpleExpression(line, TOKstring), m_wsString(wsString) {} @@ -171,7 +171,7 @@ void CXFA_FMStringExpression::ToJavaScript(CFX_WideTextBuf& javascript) { } CXFA_FMIdentifierExpressionn::CXFA_FMIdentifierExpressionn( - FX_DWORD line, + uint32_t line, CFX_WideStringC wsIdentifier) : CXFA_FMSimpleExpression(line, TOKidentifier), m_wsIdentifier(wsIdentifier) {} @@ -200,14 +200,14 @@ void CXFA_FMIdentifierExpressionn::ToJavaScript(CFX_WideTextBuf& javascript) { javascript << tempStr; } -CXFA_FMUnaryExpression::CXFA_FMUnaryExpression(FX_DWORD line, +CXFA_FMUnaryExpression::CXFA_FMUnaryExpression(uint32_t line, XFA_FM_TOKEN op, CXFA_FMSimpleExpression* pExp) : CXFA_FMSimpleExpression(line, op), m_pExp(pExp) {} void CXFA_FMUnaryExpression::ToJavaScript(CFX_WideTextBuf& javascript) {} -CXFA_FMBinExpression::CXFA_FMBinExpression(FX_DWORD line, +CXFA_FMBinExpression::CXFA_FMBinExpression(uint32_t line, XFA_FM_TOKEN op, CXFA_FMSimpleExpression* pExp1, CXFA_FMSimpleExpression* pExp2) @@ -215,7 +215,7 @@ CXFA_FMBinExpression::CXFA_FMBinExpression(FX_DWORD line, void CXFA_FMBinExpression::ToJavaScript(CFX_WideTextBuf& javascript) {} -CXFA_FMAssignExpression::CXFA_FMAssignExpression(FX_DWORD line, +CXFA_FMAssignExpression::CXFA_FMAssignExpression(uint32_t line, XFA_FM_TOKEN op, CXFA_FMSimpleExpression* pExp1, CXFA_FMSimpleExpression* pExp2) @@ -282,7 +282,7 @@ void CXFA_FMAssignExpression::ToImpliedReturnJS(CFX_WideTextBuf& javascript) { } CXFA_FMLogicalOrExpression::CXFA_FMLogicalOrExpression( - FX_DWORD line, + uint32_t line, XFA_FM_TOKEN op, CXFA_FMSimpleExpression* pExp1, CXFA_FMSimpleExpression* pExp2) @@ -298,7 +298,7 @@ void CXFA_FMLogicalOrExpression::ToJavaScript(CFX_WideTextBuf& javascript) { } CXFA_FMLogicalAndExpression::CXFA_FMLogicalAndExpression( - FX_DWORD line, + uint32_t line, XFA_FM_TOKEN op, CXFA_FMSimpleExpression* pExp1, CXFA_FMSimpleExpression* pExp2) @@ -314,7 +314,7 @@ void CXFA_FMLogicalAndExpression::ToJavaScript(CFX_WideTextBuf& javascript) { } CXFA_FMEqualityExpression::CXFA_FMEqualityExpression( - FX_DWORD line, + uint32_t line, XFA_FM_TOKEN op, CXFA_FMSimpleExpression* pExp1, CXFA_FMSimpleExpression* pExp2) @@ -342,7 +342,7 @@ void CXFA_FMEqualityExpression::ToJavaScript(CFX_WideTextBuf& javascript) { } CXFA_FMRelationalExpression::CXFA_FMRelationalExpression( - FX_DWORD line, + uint32_t line, XFA_FM_TOKEN op, CXFA_FMSimpleExpression* pExp1, CXFA_FMSimpleExpression* pExp2) @@ -378,7 +378,7 @@ void CXFA_FMRelationalExpression::ToJavaScript(CFX_WideTextBuf& javascript) { } CXFA_FMAdditiveExpression::CXFA_FMAdditiveExpression( - FX_DWORD line, + uint32_t line, XFA_FM_TOKEN op, CXFA_FMSimpleExpression* pExp1, CXFA_FMSimpleExpression* pExp2) @@ -404,7 +404,7 @@ void CXFA_FMAdditiveExpression::ToJavaScript(CFX_WideTextBuf& javascript) { } CXFA_FMMultiplicativeExpression::CXFA_FMMultiplicativeExpression( - FX_DWORD line, + uint32_t line, XFA_FM_TOKEN op, CXFA_FMSimpleExpression* pExp1, CXFA_FMSimpleExpression* pExp2) @@ -430,7 +430,7 @@ void CXFA_FMMultiplicativeExpression::ToJavaScript( javascript << FX_WSTRC(L")"); } -CXFA_FMPosExpression::CXFA_FMPosExpression(FX_DWORD line, +CXFA_FMPosExpression::CXFA_FMPosExpression(uint32_t line, CXFA_FMSimpleExpression* pExp) : CXFA_FMUnaryExpression(line, TOKplus, pExp) {} @@ -441,7 +441,7 @@ void CXFA_FMPosExpression::ToJavaScript(CFX_WideTextBuf& javascript) { javascript << FX_WSTRC(L")"); } -CXFA_FMNegExpression::CXFA_FMNegExpression(FX_DWORD line, +CXFA_FMNegExpression::CXFA_FMNegExpression(uint32_t line, CXFA_FMSimpleExpression* pExp) : CXFA_FMUnaryExpression(line, TOKminus, pExp) {} @@ -452,7 +452,7 @@ void CXFA_FMNegExpression::ToJavaScript(CFX_WideTextBuf& javascript) { javascript << FX_WSTRC(L")"); } -CXFA_FMNotExpression::CXFA_FMNotExpression(FX_DWORD line, +CXFA_FMNotExpression::CXFA_FMNotExpression(uint32_t line, CXFA_FMSimpleExpression* pExp) : CXFA_FMUnaryExpression(line, TOKksnot, pExp) {} @@ -463,7 +463,7 @@ void CXFA_FMNotExpression::ToJavaScript(CFX_WideTextBuf& javascript) { javascript << FX_WSTRC(L")"); } -CXFA_FMCallExpression::CXFA_FMCallExpression(FX_DWORD line, +CXFA_FMCallExpression::CXFA_FMCallExpression(uint32_t line, CXFA_FMSimpleExpression* pExp, CFX_PtrArray* pArguments, FX_BOOL bIsSomMethod) @@ -498,12 +498,12 @@ bool CXFA_FMCallExpression::IsBuildInFunc(CFX_WideTextBuf* funcName) { return false; } -FX_DWORD CXFA_FMCallExpression::IsMethodWithObjParam( +uint32_t CXFA_FMCallExpression::IsMethodWithObjParam( const CFX_WideStringC& methodName) { int32_t iLength = methodName.GetLength(); uint32_t uHash = FX_HashCode_String_GetW(methodName.GetPtr(), iLength); XFA_FMSOMMethod somMethodWithObjPara; - FX_DWORD parameters = 0x00; + uint32_t parameters = 0x00; int32_t iStart = 0, iEnd = (sizeof(gs_FMSomMethods) / sizeof(gs_FMSomMethods[0])) - 1; int32_t iMid = (iStart + iEnd) / 2; @@ -529,7 +529,7 @@ void CXFA_FMCallExpression::ToJavaScript(CFX_WideTextBuf& javascript) { javascript << funcName; javascript << FX_WSTRC(L"("); if (m_pArguments) { - FX_DWORD methodPara = IsMethodWithObjParam(funcName.GetWideString()); + uint32_t methodPara = IsMethodWithObjParam(funcName.GetWideString()); if (methodPara > 0) { for (int i = 0; i < m_pArguments->GetSize(); ++i) { if ((methodPara & (0x01 << i)) > 0) { @@ -615,7 +615,7 @@ void CXFA_FMCallExpression::ToJavaScript(CFX_WideTextBuf& javascript) { } CXFA_FMDotAccessorExpression::CXFA_FMDotAccessorExpression( - FX_DWORD line, + uint32_t line, CXFA_FMSimpleExpression* pAccessor, XFA_FM_TOKEN op, CFX_WideStringC wsIdentifier, @@ -655,7 +655,7 @@ void CXFA_FMDotAccessorExpression::ToJavaScript(CFX_WideTextBuf& javascript) { } CXFA_FMIndexExpression::CXFA_FMIndexExpression( - FX_DWORD line, + uint32_t line, XFA_FM_AccessorIndex accessorIndex, CXFA_FMSimpleExpression* pIndexExp, FX_BOOL bIsStarIndex) @@ -691,7 +691,7 @@ void CXFA_FMIndexExpression::ToJavaScript(CFX_WideTextBuf& javascript) { } CXFA_FMDotDotAccessorExpression::CXFA_FMDotDotAccessorExpression( - FX_DWORD line, + uint32_t line, CXFA_FMSimpleExpression* pAccessor, XFA_FM_TOKEN op, CFX_WideStringC wsIdentifier, @@ -718,7 +718,7 @@ void CXFA_FMDotDotAccessorExpression::ToJavaScript( } CXFA_FMMethodCallExpression::CXFA_FMMethodCallExpression( - FX_DWORD line, + uint32_t line, CXFA_FMSimpleExpression* pAccessorExp1, CXFA_FMSimpleExpression* pCallExp) : CXFA_FMBinExpression(line, TOKdot, pAccessorExp1, pCallExp) {} -- cgit v1.2.3