Header cleanup

CMakeLists.txt

@@ -78,7 +78,6 @@ set(libebml_PUBLIC_HEADERS
   ebml/EbmlSInteger.h
   ebml/EbmlStream.h
   ebml/EbmlString.h
-  ebml/EbmlSubHead.h
   ebml/EbmlTypes.h
   ebml/EbmlUInteger.h
   ebml/EbmlUnicodeString.h
@@ -148,6 +147,10 @@ if (BUILD_TESTING)
   target_link_libraries(test_macros PUBLIC ebml)
   add_test(test_macros test_macros)
 
+  add_executable(test_missing test/test_missing.cxx)
+  target_link_libraries(test_missing PUBLIC ebml)
+  add_test(test_missing test_missing)
+
 endif(BUILD_TESTING)
 
 

ebml/EbmlCrc32.h

@@ -9,10 +9,6 @@
 #ifndef LIBEBML_CRC32_H
 #define LIBEBML_CRC32_H
 
-#include <array>
-#include <cassert>
-
-#include "EbmlTypes.h"
 #include "EbmlBinary.h"
 
 namespace libebml {

ebml/EbmlDate.h

@@ -8,7 +8,6 @@
 #ifndef LIBEBML_DATE_H
 #define LIBEBML_DATE_H
 
-#include "EbmlTypes.h"
 #include "EbmlElement.h"
 
 namespace libebml {

ebml/EbmlFloat.h

@@ -8,7 +8,6 @@
 #ifndef LIBEBML_FLOAT_H
 #define LIBEBML_FLOAT_H
 
-#include "EbmlTypes.h"
 #include "EbmlElement.h"
 
 namespace libebml {

ebml/EbmlHead.h

@@ -8,8 +8,9 @@
 #ifndef LIBEBML_HEAD_H
 #define LIBEBML_HEAD_H
 
-#include "EbmlTypes.h"
 #include "EbmlMaster.h"
+#include "EbmlUInteger.h"
+#include "EbmlString.h"
 
 namespace libebml {
 
@@ -18,6 +19,41 @@ DECLARE_EBML_MASTER(EbmlHead)
         EBML_CONCRETE_CLASS(EbmlHead)
 };
 
+DECLARE_EBML_UINTEGER_DEF(EVersion)
+  public:
+        EBML_CONCRETE_CLASS(EVersion)
+};
+
+DECLARE_EBML_UINTEGER_DEF(EReadVersion)
+  public:
+        EBML_CONCRETE_CLASS(EReadVersion)
+};
+
+DECLARE_EBML_UINTEGER_DEF(EMaxIdLength)
+  public:
+        EBML_CONCRETE_CLASS(EMaxIdLength)
+};
+
+DECLARE_EBML_UINTEGER_DEF(EMaxSizeLength)
+  public:
+        EBML_CONCRETE_CLASS(EMaxSizeLength)
+};
+
+DECLARE_EBML_STRING_DEF(EDocType)
+  public:
+        EBML_CONCRETE_CLASS(EDocType)
+};
+
+DECLARE_EBML_UINTEGER_DEF(EDocTypeVersion)
+  public:
+        EBML_CONCRETE_CLASS(EDocTypeVersion)
+};
+
+DECLARE_EBML_UINTEGER_DEF(EDocTypeReadVersion)
+  public:
+        EBML_CONCRETE_CLASS(EDocTypeReadVersion)
+};
+
 } // namespace libebml
 
 #endif // LIBEBML_HEAD_H

ebml/EbmlMaster.h

@@ -8,10 +8,8 @@
 #ifndef LIBEBML_MASTER_H
 #define LIBEBML_MASTER_H
 
-#include <string>
 #include <vector>
 
-#include "EbmlTypes.h"
 #include "EbmlElement.h"
 #include "EbmlCrc32.h"
 
@@ -140,11 +138,6 @@ class EBML_DLL_API EbmlMaster : public EbmlElement {
       bChecksumUsed = true;
     }
 
-    /*!
-      \brief drill down all sub-elements, finding any missing elements
-    */
-    std::vector<std::string> FindAllMissingElements() const;
-
     private:
     std::vector<EbmlElement *> ElementList;
 

ebml/EbmlSInteger.h

@@ -12,7 +12,6 @@
 
 #include <cassert>
 
-#include "EbmlTypes.h"
 #include "EbmlElement.h"
 
 namespace libebml {

ebml/EbmlStream.h

@@ -8,7 +8,6 @@
 #ifndef LIBEBML_STREAM_H
 #define LIBEBML_STREAM_H
 
-#include "EbmlTypes.h"
 #include "IOCallback.h"
 #include "EbmlElement.h"
 

ebml/EbmlString.h

@@ -10,7 +10,6 @@
 
 #include <string>
 
-#include "EbmlTypes.h"
 #include "EbmlElement.h"
 
 namespace libebml {

ebml/EbmlUInteger.h

@@ -10,7 +10,6 @@
 #ifndef LIBEBML_UINTEGER_H
 #define LIBEBML_UINTEGER_H
 
-#include "EbmlTypes.h"
 #include "EbmlElement.h"
 
 namespace libebml {

ebml/EbmlUnicodeString.h

@@ -12,7 +12,6 @@
 
 #include <string>
 
-#include "EbmlTypes.h"
 #include "EbmlElement.h"
 
 namespace libebml {

ebml/EbmlVoid.h

@@ -8,7 +8,6 @@
 #ifndef LIBEBML_VOID_H
 #define LIBEBML_VOID_H
 
-#include "EbmlTypes.h"
 #include "EbmlBinary.h"
 
 namespace libebml {

ebml/SafeReadIOCallback.h

@@ -9,7 +9,6 @@
 #define LIBEBML_SAFEREADIOCALLBACK_H
 
 #include "EbmlBinary.h"
-#include "EbmlTypes.h"
 #include "IOCallback.h"
 
 #include <memory>

src/EbmlHead.cpp

@@ -6,7 +6,6 @@
   \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #include "ebml/EbmlHead.h"
-#include "ebml/EbmlSubHead.h"
 #include "ebml/EbmlContexts.h"
 
 namespace libebml {

src/EbmlMaster.cpp

@@ -186,48 +186,6 @@ bool EbmlMaster::CheckMandatory() const
   return true;
 }
 
-std::vector<std::string> EbmlMaster::FindAllMissingElements() const
-{
-  assert(MasterContext.GetSize() != 0);
-
-  std::vector<std::string> missingElements;
-
-  for (auto childElement : ElementList) {
-    if (!childElement->ValueIsSet()) {
-      std::string missingValue;
-      missingValue = "The Child Element \"";
-      missingValue.append(EBML_NAME(childElement));
-      missingValue.append("\" of EbmlMaster \"");
-      missingValue.append(EBML_NAME(this));
-      missingValue.append("\", does not have a value set.");
-      missingElements.push_back(std::move(missingValue));
-    }
-
-    if (childElement->IsMaster()) {
-      const auto childMaster = static_cast<const EbmlMaster*>(childElement);
-
-      std::vector<std::string> childMissingElements = childMaster->FindAllMissingElements();
-      std::copy(childMissingElements.begin(), childMissingElements.end(), std::back_inserter(missingElements));
-    }
-  }
-  unsigned int EltIdx;
-  for (EltIdx = 0; EltIdx < EBML_CTX_SIZE(MasterContext); EltIdx++) {
-    if (EBML_CTX_IDX(MasterContext,EltIdx).IsMandatory()) {
-      if (FindElt(EBML_CTX_IDX_INFO(MasterContext,EltIdx)) == nullptr) {
-        std::string missingElement;
-        missingElement = "Missing element \"";
-        missingElement.append(EBML_INFO_NAME(EBML_CTX_IDX_INFO(MasterContext,EltIdx)));
-        missingElement.append("\" in EbmlMaster \"");
-        missingElement.append(EBML_INFO_NAME(*EBML_CTX_MASTER(MasterContext)));
-        missingElement.append("\"");
-        missingElements.push_back(std::move(missingElement));
-      }
-    }
-  }
-
-  return missingElements;
-}
-
 EbmlElement *EbmlMaster::FindElt(const EbmlCallbacks & Callbacks) const
 {
   auto it = std::find_if(ElementList.begin(), ElementList.end(), [&](const EbmlElement *Element)

test/test_header.cxx

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: ISC
 
 #include <ebml/EbmlHead.h>
-#include <ebml/EbmlSubHead.h>
 #include <ebml/EbmlMaster.h>
 #include <ebml/EbmlStream.h>
 #include <ebml/MemIOCallback.h>

test/test_missing.cxx

@@ -0,0 +1,59 @@
+// Copyright © 2023 Steve Lhomme.
+// SPDX-License-Identifier: ISC
+
+#include <ebml/EbmlHead.h>
+
+#include <cassert>
+#include <string>
+
+using namespace libebml;
+
+static void FindAllMissingElements(const EbmlMaster *pThis, std::vector<std::string> & missingElements)
+{
+  const EbmlSemanticContext & MasterContext = EBML_CONTEXT(pThis);
+  for (auto childElement : pThis->GetElementList()) {
+    if (!childElement->ValueIsSet()) {
+      std::string missingValue;
+      missingValue = "The Child Element \"";
+      missingValue.append(EBML_NAME(childElement));
+      missingValue.append("\" of EbmlMaster \"");
+      missingValue.append(EBML_NAME(pThis));
+      missingValue.append("\", does not have a value set.");
+      missingElements.push_back(std::move(missingValue));
+    }
+
+    if (childElement->IsMaster()) {
+      const auto childMaster = static_cast<const EbmlMaster*>(childElement);
+
+      FindAllMissingElements(childMaster, missingElements);
+    }
+  }
+  unsigned int EltIdx;
+  for (EltIdx = 0; EltIdx < EBML_CTX_SIZE(MasterContext); EltIdx++) {
+    if (EBML_CTX_IDX(MasterContext,EltIdx).IsMandatory()) {
+      if (pThis->FindElt(EBML_CTX_IDX_INFO(MasterContext,EltIdx)) == nullptr) {
+        std::string missingElement;
+        missingElement = "Missing element \"";
+        missingElement.append(EBML_INFO_NAME(EBML_CTX_IDX_INFO(MasterContext,EltIdx)));
+        missingElement.append("\" in EbmlMaster \"");
+        missingElement.append(EBML_INFO_NAME(*EBML_CTX_MASTER(MasterContext)));
+        missingElement.append("\"");
+        missingElements.push_back(std::move(missingElement));
+      }
+    }
+  }
+
+}
+
+int main(void)
+{
+    EbmlHead TestHead;
+    const EbmlSemanticContext & MasterContext = EBML_CONTEXT(&TestHead);
+
+    assert(MasterContext.GetSize() != 0);
+
+    std::vector<std::string> missingElements;
+    FindAllMissingElements(&TestHead, missingElements);
+
+    return 0;
+}