diff options
author | dan sinclair <dsinclair@chromium.org> | 2017-05-17 22:17:34 -0400 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-05-18 15:27:37 +0000 |
commit | 2034b941dfa07d30c286bfcceffd6904740ac446 (patch) | |
tree | 1bc3c9be4d3108b53ced4db9837187dddf6df88d /xfa/fxfa/fm2js/cxfa_fmlexer.h | |
parent | cfd56852b6375d2b4eea473399231caf7dcdbf36 (diff) | |
download | pdfium-2034b941dfa07d30c286bfcceffd6904740ac446.tar.xz |
Remove CXFA_FMErrorInfo
This Cl removes the CXFA_FMErrorInfo class. The message was never output, just
used as a flag to determine if there was an error. The class has been replaced
with a boolean.
Change-Id: I1cde99ce6957f5f8c6be0755a198d80ec8378b3a
Reviewed-on: https://pdfium-review.googlesource.com/5653
Reviewed-by: Nicolás Peña <npm@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/fm2js/cxfa_fmlexer.h')
-rw-r--r-- | xfa/fxfa/fm2js/cxfa_fmlexer.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/xfa/fxfa/fm2js/cxfa_fmlexer.h b/xfa/fxfa/fm2js/cxfa_fmlexer.h index 4baa4a594f..f4f8a68d8c 100644 --- a/xfa/fxfa/fm2js/cxfa_fmlexer.h +++ b/xfa/fxfa/fm2js/cxfa_fmlexer.h @@ -11,7 +11,6 @@ #include <utility> #include "core/fxcrt/fx_string.h" -#include "xfa/fxfa/fm2js/cxfa_fmerrorinfo.h" enum XFA_FM_TOKEN { TOKand, @@ -104,11 +103,11 @@ class CXFA_FMToken { class CXFA_FMLexer { public: - CXFA_FMLexer(const CFX_WideStringC& wsFormcalc, CXFA_FMErrorInfo* pErrorInfo); + explicit CXFA_FMLexer(const CFX_WideStringC& wsFormcalc); ~CXFA_FMLexer(); CXFA_FMToken* NextToken(); - bool HasError() const; + bool HasError() const { return m_LexerError; } void SetCurrentLine(uint32_t line) { m_uCurrentLine = line; } void SetToken(std::unique_ptr<CXFA_FMToken> pToken) { @@ -124,14 +123,13 @@ class CXFA_FMLexer { const wchar_t* Identifiers(CXFA_FMToken* t, const wchar_t* p); const wchar_t* Comment(const wchar_t* p); XFA_FM_TOKEN IsKeyword(const CFX_WideStringC& p); - void Error(const wchar_t* msg, ...); std::unique_ptr<CXFA_FMToken> Scan(); const wchar_t* m_ptr; const wchar_t* const m_end; uint32_t m_uCurrentLine; std::unique_ptr<CXFA_FMToken> m_pToken; - CXFA_FMErrorInfo* m_pErrorInfo; + bool m_LexerError; }; #endif // XFA_FXFA_FM2JS_CXFA_FMLEXER_H_ |