From deee3d2ee201d62e7ef41e7d8378d7f52e057a9c Mon Sep 17 00:00:00 2001 From: tsepez Date: Fri, 25 Mar 2016 14:38:58 -0700 Subject: Remove FX_DWORD from XFA, part 2 Some headers were missed in the previous CL. Review URL: https://codereview.chromium.org/1835703002 --- xfa/fxfa/fm2js/xfa_error.h | 2 +- xfa/fxfa/fm2js/xfa_expression.h | 32 +++++++++++------------ xfa/fxfa/fm2js/xfa_fmparse.h | 2 +- xfa/fxfa/fm2js/xfa_lexer.h | 14 +++++----- xfa/fxfa/fm2js/xfa_simpleexpression.h | 48 +++++++++++++++++------------------ 5 files changed, 49 insertions(+), 49 deletions(-) (limited to 'xfa/fxfa/fm2js') diff --git a/xfa/fxfa/fm2js/xfa_error.h b/xfa/fxfa/fm2js/xfa_error.h index b8116edf2a..2415cd3212 100644 --- a/xfa/fxfa/fm2js/xfa_error.h +++ b/xfa/fxfa/fm2js/xfa_error.h @@ -27,7 +27,7 @@ class CXFA_FMErrorInfo { public: CXFA_FMErrorInfo() : linenum(0) {} ~CXFA_FMErrorInfo() {} - FX_DWORD linenum; + uint32_t linenum; CFX_WideString message; }; const FX_WCHAR* XFA_FM_ErrorMsg(XFA_FM_ERRMSG msg); diff --git a/xfa/fxfa/fm2js/xfa_expression.h b/xfa/fxfa/fm2js/xfa_expression.h index 0b99e8da13..9bd0c9b89f 100644 --- a/xfa/fxfa/fm2js/xfa_expression.h +++ b/xfa/fxfa/fm2js/xfa_expression.h @@ -24,22 +24,22 @@ enum XFA_FM_EXPTYPE { class CXFA_FMExpression { public: - explicit CXFA_FMExpression(FX_DWORD line); - CXFA_FMExpression(FX_DWORD line, XFA_FM_EXPTYPE type); + explicit CXFA_FMExpression(uint32_t line); + CXFA_FMExpression(uint32_t line, XFA_FM_EXPTYPE type); virtual ~CXFA_FMExpression() {} virtual void ToJavaScript(CFX_WideTextBuf& javascript); virtual void ToImpliedReturnJS(CFX_WideTextBuf&); - FX_DWORD GetLine() { return m_line; } + uint32_t GetLine() { return m_line; } XFA_FM_EXPTYPE GetExpType() const { return m_type; } protected: XFA_FM_EXPTYPE m_type; - FX_DWORD m_line; + uint32_t m_line; }; class CXFA_FMFunctionDefinition : public CXFA_FMExpression { public: - CXFA_FMFunctionDefinition(FX_DWORD line, + CXFA_FMFunctionDefinition(uint32_t line, FX_BOOL isGlobal, const CFX_WideStringC& wsName, CFX_WideStringCArray* pArguments, @@ -57,7 +57,7 @@ class CXFA_FMFunctionDefinition : public CXFA_FMExpression { class CXFA_FMVarExpression : public CXFA_FMExpression { public: - CXFA_FMVarExpression(FX_DWORD line, + CXFA_FMVarExpression(uint32_t line, const CFX_WideStringC& wsName, CXFA_FMExpression* pInit); void ToJavaScript(CFX_WideTextBuf& javascript) override; @@ -70,7 +70,7 @@ class CXFA_FMVarExpression : public CXFA_FMExpression { class CXFA_FMExpExpression : public CXFA_FMExpression { public: - CXFA_FMExpExpression(FX_DWORD line, CXFA_FMSimpleExpression* pExpression); + CXFA_FMExpExpression(uint32_t line, CXFA_FMSimpleExpression* pExpression); void ToJavaScript(CFX_WideTextBuf& javascript) override; void ToImpliedReturnJS(CFX_WideTextBuf&) override; @@ -80,7 +80,7 @@ class CXFA_FMExpExpression : public CXFA_FMExpression { class CXFA_FMBlockExpression : public CXFA_FMExpression { public: - CXFA_FMBlockExpression(FX_DWORD line, CFX_PtrArray* pExpressionList); + CXFA_FMBlockExpression(uint32_t line, CFX_PtrArray* pExpressionList); ~CXFA_FMBlockExpression() override; void ToJavaScript(CFX_WideTextBuf& javascript) override; void ToImpliedReturnJS(CFX_WideTextBuf&) override; @@ -91,7 +91,7 @@ class CXFA_FMBlockExpression : public CXFA_FMExpression { class CXFA_FMDoExpression : public CXFA_FMExpression { public: - CXFA_FMDoExpression(FX_DWORD line, CXFA_FMExpression* pList); + CXFA_FMDoExpression(uint32_t line, CXFA_FMExpression* pList); void ToJavaScript(CFX_WideTextBuf& javascript) override; void ToImpliedReturnJS(CFX_WideTextBuf&) override; @@ -101,7 +101,7 @@ class CXFA_FMDoExpression : public CXFA_FMExpression { class CXFA_FMIfExpression : public CXFA_FMExpression { public: - CXFA_FMIfExpression(FX_DWORD line, + CXFA_FMIfExpression(uint32_t line, CXFA_FMSimpleExpression* pExpression, CXFA_FMExpression* pIfExpression, CXFA_FMExpression* pElseExpression); @@ -116,7 +116,7 @@ class CXFA_FMIfExpression : public CXFA_FMExpression { class CXFA_FMLoopExpression : public CXFA_FMExpression { public: - explicit CXFA_FMLoopExpression(FX_DWORD line) : CXFA_FMExpression(line) {} + explicit CXFA_FMLoopExpression(uint32_t line) : CXFA_FMExpression(line) {} ~CXFA_FMLoopExpression() override; void ToJavaScript(CFX_WideTextBuf& javascript) override; void ToImpliedReturnJS(CFX_WideTextBuf&) override; @@ -124,7 +124,7 @@ class CXFA_FMLoopExpression : public CXFA_FMExpression { class CXFA_FMWhileExpression : public CXFA_FMLoopExpression { public: - CXFA_FMWhileExpression(FX_DWORD line, + CXFA_FMWhileExpression(uint32_t line, CXFA_FMSimpleExpression* pCodition, CXFA_FMExpression* pExpression); void ToJavaScript(CFX_WideTextBuf& javascript) override; @@ -137,7 +137,7 @@ class CXFA_FMWhileExpression : public CXFA_FMLoopExpression { class CXFA_FMBreakExpression : public CXFA_FMExpression { public: - explicit CXFA_FMBreakExpression(FX_DWORD line); + explicit CXFA_FMBreakExpression(uint32_t line); ~CXFA_FMBreakExpression() override; void ToJavaScript(CFX_WideTextBuf& javascript) override; void ToImpliedReturnJS(CFX_WideTextBuf&) override; @@ -145,7 +145,7 @@ class CXFA_FMBreakExpression : public CXFA_FMExpression { class CXFA_FMContinueExpression : public CXFA_FMExpression { public: - explicit CXFA_FMContinueExpression(FX_DWORD line); + explicit CXFA_FMContinueExpression(uint32_t line); ~CXFA_FMContinueExpression() override; void ToJavaScript(CFX_WideTextBuf& javascript) override; void ToImpliedReturnJS(CFX_WideTextBuf&) override; @@ -153,7 +153,7 @@ class CXFA_FMContinueExpression : public CXFA_FMExpression { class CXFA_FMForExpression : public CXFA_FMLoopExpression { public: - CXFA_FMForExpression(FX_DWORD line, + CXFA_FMForExpression(uint32_t line, const CFX_WideStringC& wsVariant, CXFA_FMSimpleExpression* pAssignment, CXFA_FMSimpleExpression* pAccessor, @@ -174,7 +174,7 @@ class CXFA_FMForExpression : public CXFA_FMLoopExpression { class CXFA_FMForeachExpression : public CXFA_FMLoopExpression { public: - CXFA_FMForeachExpression(FX_DWORD line, + CXFA_FMForeachExpression(uint32_t line, const CFX_WideStringC& wsIdentifier, CFX_PtrArray* pAccessors, CXFA_FMExpression* pList); diff --git a/xfa/fxfa/fm2js/xfa_fmparse.h b/xfa/fxfa/fm2js/xfa_fmparse.h index a8991b466f..288ae90744 100644 --- a/xfa/fxfa/fm2js/xfa_fmparse.h +++ b/xfa/fxfa/fm2js/xfa_fmparse.h @@ -18,7 +18,7 @@ class CXFA_FMParse { int32_t Init(const CFX_WideStringC& wsFormcalc, CXFA_FMErrorInfo* pErrorInfo); void NextToken(); void Check(XFA_FM_TOKEN op); - void Error(FX_DWORD lineNum, XFA_FM_ERRMSG msg, ...); + void Error(uint32_t lineNum, XFA_FM_ERRMSG msg, ...); CFX_PtrArray* ParseTopExpression(); CXFA_FMExpression* ParseFunction(); CXFA_FMExpression* ParseExpression(); diff --git a/xfa/fxfa/fm2js/xfa_lexer.h b/xfa/fxfa/fm2js/xfa_lexer.h index 40fd8cae13..fd89dc72eb 100644 --- a/xfa/fxfa/fm2js/xfa_lexer.h +++ b/xfa/fxfa/fm2js/xfa_lexer.h @@ -94,25 +94,25 @@ const FX_WCHAR* XFA_FM_KeywordToString(XFA_FM_TOKEN op); class CXFA_FMToken { public: CXFA_FMToken(); - explicit CXFA_FMToken(FX_DWORD uLineNum); + explicit CXFA_FMToken(uint32_t uLineNum); CFX_WideStringC m_wstring; XFA_FM_TOKEN m_type; - FX_DWORD m_uLinenum; + uint32_t m_uLinenum; }; class CXFA_FMLexer { public: CXFA_FMLexer(const CFX_WideStringC& wsFormcalc, CXFA_FMErrorInfo* pErrorInfo); CXFA_FMToken* NextToken(); - FX_DWORD Number(CXFA_FMToken* t, const FX_WCHAR* p, const FX_WCHAR*& pEnd); - FX_DWORD String(CXFA_FMToken* t, const FX_WCHAR* p, const FX_WCHAR*& pEnd); - FX_DWORD Identifiers(CXFA_FMToken* t, + uint32_t Number(CXFA_FMToken* t, const FX_WCHAR* p, const FX_WCHAR*& pEnd); + uint32_t String(CXFA_FMToken* t, const FX_WCHAR* p, const FX_WCHAR*& pEnd); + uint32_t Identifiers(CXFA_FMToken* t, const FX_WCHAR* p, const FX_WCHAR*& pEnd); void Comment(const FX_WCHAR* p, const FX_WCHAR*& pEnd); XFA_FM_TOKEN IsKeyword(const CFX_WideStringC& p); - void SetCurrentLine(FX_DWORD line) { m_uCurrentLine = line; } + void SetCurrentLine(uint32_t line) { m_uCurrentLine = line; } void SetToken(CXFA_FMToken* pToken) { if (m_pToken.get() != pToken) m_pToken.reset(pToken); @@ -126,7 +126,7 @@ class CXFA_FMLexer { CXFA_FMToken* Scan(); const FX_WCHAR* m_ptr; - FX_DWORD m_uCurrentLine; + uint32_t m_uCurrentLine; std::unique_ptr m_pToken; CXFA_FMErrorInfo* m_pErrorInfo; }; diff --git a/xfa/fxfa/fm2js/xfa_simpleexpression.h b/xfa/fxfa/fm2js/xfa_simpleexpression.h index 3b8164e7d7..94f628b09b 100644 --- a/xfa/fxfa/fm2js/xfa_simpleexpression.h +++ b/xfa/fxfa/fm2js/xfa_simpleexpression.h @@ -57,7 +57,7 @@ enum XFA_FM_AccessorIndex { class CXFA_FMSimpleExpression { public: - CXFA_FMSimpleExpression(FX_DWORD line, XFA_FM_TOKEN op); + CXFA_FMSimpleExpression(uint32_t line, XFA_FM_TOKEN op); virtual ~CXFA_FMSimpleExpression() {} virtual void ToJavaScript(CFX_WideTextBuf& javascript); virtual void ToImpliedReturnJS(CFX_WideTextBuf& javascript); @@ -65,20 +65,20 @@ class CXFA_FMSimpleExpression { XFA_FM_TOKEN GetOperatorToken() const; protected: - FX_DWORD m_line; + uint32_t m_line; XFA_FM_TOKEN m_op; }; class CXFA_FMNullExpression : public CXFA_FMSimpleExpression { public: - explicit CXFA_FMNullExpression(FX_DWORD line); + explicit CXFA_FMNullExpression(uint32_t line); ~CXFA_FMNullExpression() override {} void ToJavaScript(CFX_WideTextBuf& javascript) override; }; class CXFA_FMNumberExpression : public CXFA_FMSimpleExpression { public: - CXFA_FMNumberExpression(FX_DWORD line, CFX_WideStringC wsNumber); + CXFA_FMNumberExpression(uint32_t line, CFX_WideStringC wsNumber); ~CXFA_FMNumberExpression() override {} void ToJavaScript(CFX_WideTextBuf& javascript) override; @@ -88,7 +88,7 @@ class CXFA_FMNumberExpression : public CXFA_FMSimpleExpression { class CXFA_FMStringExpression : public CXFA_FMSimpleExpression { public: - CXFA_FMStringExpression(FX_DWORD line, CFX_WideStringC wsString); + CXFA_FMStringExpression(uint32_t line, CFX_WideStringC wsString); ~CXFA_FMStringExpression() override {} void ToJavaScript(CFX_WideTextBuf& javascript) override; @@ -98,7 +98,7 @@ class CXFA_FMStringExpression : public CXFA_FMSimpleExpression { class CXFA_FMIdentifierExpressionn : public CXFA_FMSimpleExpression { public: - CXFA_FMIdentifierExpressionn(FX_DWORD line, CFX_WideStringC wsIdentifier); + CXFA_FMIdentifierExpressionn(uint32_t line, CFX_WideStringC wsIdentifier); ~CXFA_FMIdentifierExpressionn() override {} void ToJavaScript(CFX_WideTextBuf& javascript) override; @@ -108,7 +108,7 @@ class CXFA_FMIdentifierExpressionn : public CXFA_FMSimpleExpression { class CXFA_FMUnaryExpression : public CXFA_FMSimpleExpression { public: - CXFA_FMUnaryExpression(FX_DWORD line, + CXFA_FMUnaryExpression(uint32_t line, XFA_FM_TOKEN op, CXFA_FMSimpleExpression* pExp); void ToJavaScript(CFX_WideTextBuf& javascript) override; @@ -119,7 +119,7 @@ class CXFA_FMUnaryExpression : public CXFA_FMSimpleExpression { class CXFA_FMBinExpression : public CXFA_FMSimpleExpression { public: - CXFA_FMBinExpression(FX_DWORD line, + CXFA_FMBinExpression(uint32_t line, XFA_FM_TOKEN op, CXFA_FMSimpleExpression* pExp1, CXFA_FMSimpleExpression* pExp2); @@ -132,7 +132,7 @@ class CXFA_FMBinExpression : public CXFA_FMSimpleExpression { class CXFA_FMAssignExpression : public CXFA_FMBinExpression { public: - CXFA_FMAssignExpression(FX_DWORD line, + CXFA_FMAssignExpression(uint32_t line, XFA_FM_TOKEN op, CXFA_FMSimpleExpression* pExp1, CXFA_FMSimpleExpression* pExp2); @@ -143,7 +143,7 @@ class CXFA_FMAssignExpression : public CXFA_FMBinExpression { class CXFA_FMLogicalOrExpression : public CXFA_FMBinExpression { public: - CXFA_FMLogicalOrExpression(FX_DWORD line, + CXFA_FMLogicalOrExpression(uint32_t line, XFA_FM_TOKEN op, CXFA_FMSimpleExpression* pExp1, CXFA_FMSimpleExpression* pExp2); @@ -153,7 +153,7 @@ class CXFA_FMLogicalOrExpression : public CXFA_FMBinExpression { class CXFA_FMLogicalAndExpression : public CXFA_FMBinExpression { public: - CXFA_FMLogicalAndExpression(FX_DWORD line, + CXFA_FMLogicalAndExpression(uint32_t line, XFA_FM_TOKEN op, CXFA_FMSimpleExpression* pExp1, CXFA_FMSimpleExpression* pExp2); @@ -163,7 +163,7 @@ class CXFA_FMLogicalAndExpression : public CXFA_FMBinExpression { class CXFA_FMEqualityExpression : public CXFA_FMBinExpression { public: - CXFA_FMEqualityExpression(FX_DWORD line, + CXFA_FMEqualityExpression(uint32_t line, XFA_FM_TOKEN op, CXFA_FMSimpleExpression* pExp1, CXFA_FMSimpleExpression* pExp2); @@ -173,7 +173,7 @@ class CXFA_FMEqualityExpression : public CXFA_FMBinExpression { class CXFA_FMRelationalExpression : public CXFA_FMBinExpression { public: - CXFA_FMRelationalExpression(FX_DWORD line, + CXFA_FMRelationalExpression(uint32_t line, XFA_FM_TOKEN op, CXFA_FMSimpleExpression* pExp1, CXFA_FMSimpleExpression* pExp2); @@ -183,7 +183,7 @@ class CXFA_FMRelationalExpression : public CXFA_FMBinExpression { class CXFA_FMAdditiveExpression : public CXFA_FMBinExpression { public: - CXFA_FMAdditiveExpression(FX_DWORD line, + CXFA_FMAdditiveExpression(uint32_t line, XFA_FM_TOKEN op, CXFA_FMSimpleExpression* pExp1, CXFA_FMSimpleExpression* pExp2); @@ -193,7 +193,7 @@ class CXFA_FMAdditiveExpression : public CXFA_FMBinExpression { class CXFA_FMMultiplicativeExpression : public CXFA_FMBinExpression { public: - CXFA_FMMultiplicativeExpression(FX_DWORD line, + CXFA_FMMultiplicativeExpression(uint32_t line, XFA_FM_TOKEN op, CXFA_FMSimpleExpression* pExp1, CXFA_FMSimpleExpression* pExp2); @@ -203,34 +203,34 @@ class CXFA_FMMultiplicativeExpression : public CXFA_FMBinExpression { class CXFA_FMPosExpression : public CXFA_FMUnaryExpression { public: - CXFA_FMPosExpression(FX_DWORD line, CXFA_FMSimpleExpression* pExp); + CXFA_FMPosExpression(uint32_t line, CXFA_FMSimpleExpression* pExp); ~CXFA_FMPosExpression() override {} void ToJavaScript(CFX_WideTextBuf& javascript) override; }; class CXFA_FMNegExpression : public CXFA_FMUnaryExpression { public: - CXFA_FMNegExpression(FX_DWORD line, CXFA_FMSimpleExpression* pExp); + CXFA_FMNegExpression(uint32_t line, CXFA_FMSimpleExpression* pExp); ~CXFA_FMNegExpression() override {} void ToJavaScript(CFX_WideTextBuf& javascript) override; }; class CXFA_FMNotExpression : public CXFA_FMUnaryExpression { public: - CXFA_FMNotExpression(FX_DWORD line, CXFA_FMSimpleExpression* pExp); + CXFA_FMNotExpression(uint32_t line, CXFA_FMSimpleExpression* pExp); ~CXFA_FMNotExpression() override {} void ToJavaScript(CFX_WideTextBuf& javascript) override; }; class CXFA_FMCallExpression : public CXFA_FMUnaryExpression { public: - CXFA_FMCallExpression(FX_DWORD line, + CXFA_FMCallExpression(uint32_t line, CXFA_FMSimpleExpression* pExp, CFX_PtrArray* pArguments, FX_BOOL bIsSomMethod); ~CXFA_FMCallExpression() override; bool IsBuildInFunc(CFX_WideTextBuf* funcName); - FX_DWORD IsMethodWithObjParam(const CFX_WideStringC& methodName); + uint32_t IsMethodWithObjParam(const CFX_WideStringC& methodName); void ToJavaScript(CFX_WideTextBuf& javascript) override; private: @@ -240,7 +240,7 @@ class CXFA_FMCallExpression : public CXFA_FMUnaryExpression { class CXFA_FMDotAccessorExpression : public CXFA_FMBinExpression { public: - CXFA_FMDotAccessorExpression(FX_DWORD line, + CXFA_FMDotAccessorExpression(uint32_t line, CXFA_FMSimpleExpression* pAccessor, XFA_FM_TOKEN op, CFX_WideStringC wsIdentifier, @@ -254,7 +254,7 @@ class CXFA_FMDotAccessorExpression : public CXFA_FMBinExpression { class CXFA_FMIndexExpression : public CXFA_FMUnaryExpression { public: - CXFA_FMIndexExpression(FX_DWORD line, + CXFA_FMIndexExpression(uint32_t line, XFA_FM_AccessorIndex accessorIndex, CXFA_FMSimpleExpression* pIndexExp, FX_BOOL bIsStarIndex); @@ -268,7 +268,7 @@ class CXFA_FMIndexExpression : public CXFA_FMUnaryExpression { class CXFA_FMDotDotAccessorExpression : public CXFA_FMBinExpression { public: - CXFA_FMDotDotAccessorExpression(FX_DWORD line, + CXFA_FMDotDotAccessorExpression(uint32_t line, CXFA_FMSimpleExpression* pAccessor, XFA_FM_TOKEN op, CFX_WideStringC wsIdentifier, @@ -282,7 +282,7 @@ class CXFA_FMDotDotAccessorExpression : public CXFA_FMBinExpression { class CXFA_FMMethodCallExpression : public CXFA_FMBinExpression { public: - CXFA_FMMethodCallExpression(FX_DWORD line, + CXFA_FMMethodCallExpression(uint32_t line, CXFA_FMSimpleExpression* pAccessorExp1, CXFA_FMSimpleExpression* pCallExp); ~CXFA_FMMethodCallExpression() override {} -- cgit v1.2.3