Replace FDE_XMLSYNTAX defines with enum classes.

xfa/fde/xml/fde_xml_imp.h

 // 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
 
 #ifndef XFA_FDE_XML_FDE_XML_IMP_H_
 #define XFA_FDE_XML_FDE_XML_IMP_H_
 
 #include "core/fxcrt/include/fx_system.h"
@@ skipping 273 matching lines @@
                                      int32_t& iBlockIndex,
                                      int32_t& iInnerIndex) const;
   void ClearBuffer();
   CFX_PtrArray m_BlockArray;
   int32_t m_iDataLength;
   int32_t m_iBufferSize;
   int32_t m_iAllocStep;
   int32_t m_iStartPosition;
 };
 
-#define FDE_XMLSYNTAXMODE_Text 0
-#define FDE_XMLSYNTAXMODE_Node 1
-#define FDE_XMLSYNTAXMODE_Target 2
-#define FDE_XMLSYNTAXMODE_Tag 3
-#define FDE_XMLSYNTAXMODE_AttriName 4
-#define FDE_XMLSYNTAXMODE_AttriEqualSign 5
-#define FDE_XMLSYNTAXMODE_AttriQuotation 6
-#define FDE_XMLSYNTAXMODE_AttriValue 7
-#define FDE_XMLSYNTAXMODE_Entity 8
-#define FDE_XMLSYNTAXMODE_EntityDecimal 9
-#define FDE_XMLSYNTAXMODE_EntityHex 10
-#define FDE_XMLSYNTAXMODE_CloseInstruction 11
-#define FDE_XMLSYNTAXMODE_BreakElement 12
-#define FDE_XMLSYNTAXMODE_CloseElement 13
-#define FDE_XMLSYNTAXMODE_SkipDeclNode 14
-#define FDE_XMLSYNTAXMODE_DeclCharData 15
-#define FDE_XMLSYNTAXMODE_SkipComment 16
-#define FDE_XMLSYNTAXMODE_SkipCommentOrDecl 17
-#define FDE_XMLSYNTAXMODE_SkipCData 18
-#define FDE_XMLSYNTAXMODE_TargetData 19
-
 class CFDE_XMLSyntaxParser : public CFX_Target {
  public:
   CFDE_XMLSyntaxParser();
   ~CFDE_XMLSyntaxParser();
   void Release() { delete this; }
   void Init(IFX_Stream* pStream,
             int32_t iXMLPlaneSize,
             int32_t iTextDataSize = 256);
-  uint32_t DoSyntaxParse();
+  FDE_XmlSyntaxResult DoSyntaxParse();
   int32_t GetStatus() const;
   int32_t GetCurrentPos() const {
     return m_iParsedChars + (m_pStart - m_pBuffer);
   }
   FX_FILESIZE GetCurrentBinaryPos() const;
   int32_t GetCurrentNodeNumber() const { return m_iCurrentNodeNum; }
   int32_t GetLastNodeNumber() const { return m_iLastNodeNum; }
 
   void GetTargetName(CFX_WideString& wsTarget) const {
     m_BlockBuffer.GetTextData(wsTarget, 0, m_iTextDataLength);
   }
   void GetTagName(CFX_WideString& wsTag) const {
     m_BlockBuffer.GetTextData(wsTag, 0, m_iTextDataLength);
   }
   void GetAttributeName(CFX_WideString& wsAttriName) const {
     m_BlockBuffer.GetTextData(wsAttriName, 0, m_iTextDataLength);
   }
   void GetAttributeValue(CFX_WideString& wsAttriValue) const {
     m_BlockBuffer.GetTextData(wsAttriValue, 0, m_iTextDataLength);
   }
   void GetTextData(CFX_WideString& wsText) const {
     m_BlockBuffer.GetTextData(wsText, 0, m_iTextDataLength);
   }
   void GetTargetData(CFX_WideString& wsData) const {
     m_BlockBuffer.GetTextData(wsData, 0, m_iTextDataLength);
   }
 
  protected:
+  enum class FDE_XmlSyntaxState {
+    Text,
+    Node,
+    Target,
+    Tag,
+    AttriName,
+    AttriEqualSign,
+    AttriQuotation,
+    AttriValue,
+    Entity,
+    EntityDecimal,
+    EntityHex,
+    CloseInstruction,
+    BreakElement,
+    CloseElement,
+    SkipDeclNode,
+    DeclCharData,
+    SkipComment,
+    SkipCommentOrDecl,
+    SkipCData,
+    TargetData
+  };
+
   IFX_Stream* m_pStream;
   int32_t m_iXMLPlaneSize;
   int32_t m_iCurrentPos;
   int32_t m_iCurrentNodeNum;
   int32_t m_iLastNodeNum;
   int32_t m_iParsedChars;
   int32_t m_iParsedBytes;
   FX_WCHAR* m_pBuffer;
   int32_t m_iBufferChars;
   FX_BOOL m_bEOS;
   FX_WCHAR* m_pStart;
   FX_WCHAR* m_pEnd;
   FDE_XMLNODE m_CurNode;
   CFDE_XMLNodeStack m_XMLNodeStack;
   CFDE_BlockBuffer m_BlockBuffer;
   int32_t m_iAllocStep;
   int32_t& m_iDataLength;
   FX_WCHAR* m_pCurrentBlock;
   int32_t m_iIndexInBlock;
   int32_t m_iTextDataLength;
-  uint32_t m_dwStatus;
-  uint32_t m_dwMode;
+  FDE_XmlSyntaxResult m_syntaxParserResult;
+  FDE_XmlSyntaxState m_syntaxParserState;
   FX_WCHAR m_wQuotationMark;
   int32_t m_iEntityStart;
   CFX_DWordStack m_SkipStack;
   FX_WCHAR m_SkipChar;
   inline void ParseTextChar(FX_WCHAR ch);
 };
 
 #endif  // XFA_FDE_XML_FDE_XML_IMP_H_