Rename Parser to Container

Werni2A · Dec 24, 2023 · fd6fc26 · fd6fc26
1 parent 23ab7a4
commit fd6fc26
Show file tree

Hide file tree

Showing 13 changed files with 299 additions and 299 deletions.
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -6,11 +6,11 @@ find_package(tinyxml2 CONFIG REQUIRED)
 
 set(SOURCES
    ${LIB_SRC_DIR}/CommonBase.cpp
+   ${LIB_SRC_DIR}/Container.cpp
    ${LIB_SRC_DIR}/ContainerExtractor.cpp
    ${LIB_SRC_DIR}/DataStream.cpp
    # ${LIB_SRC_DIR}/Misc.cpp
    ${LIB_SRC_DIR}/PageSettings.cpp
-   ${LIB_SRC_DIR}/Parser.cpp
    ${LIB_SRC_DIR}/Primitives/Point.cpp
    ${LIB_SRC_DIR}/Primitives/PrimArc.cpp
    ${LIB_SRC_DIR}/Primitives/PrimBezier.cpp
@@ -99,6 +99,7 @@ set(SOURCES
 )
 
 set(HEADERS
+   ${LIB_INCLUDE_DIR}/Container.hpp
    ${LIB_INCLUDE_DIR}/ContainerExtractor.hpp
    ${LIB_INCLUDE_DIR}/DataStream.hpp
    ${LIB_INCLUDE_DIR}/Enums/Color.hpp
@@ -113,7 +114,6 @@ set(HEADERS
    ${LIB_INCLUDE_DIR}/FutureData.hpp
    ${LIB_INCLUDE_DIR}/General.hpp
    ${LIB_INCLUDE_DIR}/PageSettings.hpp
-   ${LIB_INCLUDE_DIR}/Parser.hpp
    ${LIB_INCLUDE_DIR}/ParserContext.hpp
    ${LIB_INCLUDE_DIR}/Primitives/Point.hpp
    ${LIB_INCLUDE_DIR}/Primitives/PrimArc.hpp

diff --git a/src/Parser.cpp → src/Container.cpp b/src/Parser.cpp → src/Container.cpp
@@ -19,6 +19,7 @@
 #include <spdlog/spdlog.h>
 
 #include "CommonBase.hpp"
+#include "Container.hpp"
 #include "ContainerExtractor.hpp"
 #include "DataStream.hpp"
 #include "Enums/FillStyle.hpp"
@@ -32,7 +33,6 @@
 #include "Exception.hpp"
 #include "General.hpp"
 #include "Library.hpp"
-#include "Parser.hpp"
 #include "PinShape.hpp"
 #include "StreamFactory.hpp"
 
@@ -46,7 +46,7 @@ FileType gFileType = FileType::Library; // @todo move to parser context
 FileFormatVersion gFileFormatVersion = FileFormatVersion::C; // @todo move to parser context
 
 
-Parser::Parser(const fs::path& aCfbfContainer, ParserConfig aCfg) :
+Container::Container(const fs::path& aCfbfContainer, ParserConfig aCfg) :
     mFileCtr{0U}, mFileErrCtr{0U}, tmpCtx{"", "", "", aCfg}, mCtx{tmpCtx}, mCfg{aCfg}
 {
     gFileType      = getFileTypeByExtension(aCfbfContainer);
@@ -67,7 +67,7 @@ Parser::Parser(const fs::path& aCfbfContainer, ParserConfig aCfg) :
 }
 
 
-Parser::~Parser()
+Container::~Container()
 {
     if(!mCfg.mKeepTmpFiles)
     {
@@ -81,7 +81,7 @@ Parser::~Parser()
 /**
  * @brief Parse the whole library.
  */
-void Parser::parseLibrary()
+void Container::parseLibrary()
 {
     spdlog::info("Start parsing library located at {}", mExtractedCfbfPath.string());
 
@@ -134,7 +134,7 @@ void Parser::parseLibrary()
 }
 
 
-void Parser::exceptionHandling()
+void Container::exceptionHandling()
 {
     try
     {
@@ -158,7 +158,7 @@ void Parser::exceptionHandling()
 }
 
 
-fs::path Parser::extractContainer(const fs::path& aFile, const fs::path& aOutDir) const
+fs::path Container::extractContainer(const fs::path& aFile, const fs::path& aOutDir) const
 {
     ContainerExtractor extractor{aFile};
 
@@ -168,20 +168,20 @@ fs::path Parser::extractContainer(const fs::path& aFile, const fs::path& aOutDir
 }
 
 
-fs::path Parser::extractContainer(const fs::path& aOutDir) const
+fs::path Container::extractContainer(const fs::path& aOutDir) const
 {
     return extractContainer(mInputCfbfFile, aOutDir);
 }
 
 
-void Parser::printContainerTree() const
+void Container::printContainerTree() const
 {
     ContainerExtractor extractor{mInputCfbfFile};
     extractor.printContainerTree();
 }
 
 
-FileType Parser::getFileTypeByExtension(const fs::path& aFile) const
+FileType Container::getFileTypeByExtension(const fs::path& aFile) const
 {
     std::string extension = aFile.extension().string();
 
@@ -212,15 +212,15 @@ FileType Parser::getFileTypeByExtension(const fs::path& aFile) const
 }
 
 
-void Parser::openFile(const fs::path& aInputStream)
+void Container::openFile(const fs::path& aInputStream)
 {
     spdlog::info("Opening file: {}", aInputStream.string());
 
     spdlog::info("File contains {} byte.", fs::file_size(aInputStream));
 }
 
 
-void Parser::closeFile()
+void Container::closeFile()
 {
     spdlog::info("Closing file: {}", mCtx.get().mInputStream.string());
 

diff --git a/src/Parser.hpp → src/Container.hpp b/src/Parser.hpp → src/Container.hpp
@@ -1,5 +1,5 @@
-#ifndef PARSER_HPP
-#define PARSER_HPP
+#ifndef CONTAINER_HPP
+#define CONTAINER_HPP
 
 
 #include <any>
@@ -25,13 +25,13 @@
 namespace fs = std::filesystem;
 
 
-class Parser
+class Container
 {
 public:
 
-    Parser(const fs::path& aFile, ParserConfig aCfg);
+    Container(const fs::path& aFile, ParserConfig aCfg);
 
-    ~Parser();
+    ~Container();
 
     size_t getFileErrCtr() const
     {
@@ -102,4 +102,4 @@ class Parser
 };
 
 
-#endif // PARSER_HPP
+#endif // CONTAINER_HPP
diff --git a/src/Misc.cpp b/src/Misc.cpp
@@ -85,7 +85,7 @@ std::string SymbolUserProp::getVal() const
 
 
 // @todo this is a whole file parser. Split it up into the title block structure and move the rest to the symbol parser?
-void Parser::readTitleBlockSymbol()
+void Container::readTitleBlockSymbol()
 {
     auto& ds = mCtx.get().mDs.get();
 

diff --git a/src/Structures/StructBookMarkSymbolInst.cpp b/src/Structures/StructBookMarkSymbolInst.cpp
@@ -4,9 +4,9 @@
 
 #include <nameof.hpp>
 
+#include "Container.hpp"
 #include "Enums/Structure.hpp"
 #include "General.hpp"
-#include "Parser.hpp"
 #include "Structures/StructBookMarkSymbolInst.hpp"
 
 

diff --git a/src/Structures/StructERCSymbolInst.cpp b/src/Structures/StructERCSymbolInst.cpp
@@ -4,9 +4,9 @@
 
 #include <nameof.hpp>
 
+#include "Container.hpp"
 #include "Enums/Structure.hpp"
 #include "General.hpp"
-#include "Parser.hpp"
 #include "Structures/StructERCSymbolInst.hpp"
 
 

diff --git a/src/Structures/StructGlobal.cpp b/src/Structures/StructGlobal.cpp
@@ -4,9 +4,9 @@
 
 #include <nameof.hpp>
 
+#include "Container.hpp"
 #include "Enums/Structure.hpp"
 #include "General.hpp"
-#include "Parser.hpp"
 #include "Structures/StructGlobal.hpp"
 
 

diff --git a/src/Structures/StructT0x10.cpp b/src/Structures/StructT0x10.cpp
@@ -4,9 +4,9 @@
 
 #include <nameof.hpp>
 
+#include "Container.hpp"
 #include "Enums/Structure.hpp"
 #include "General.hpp"
-#include "Parser.hpp"
 #include "Structures/StructT0x10.hpp"
 
 

diff --git a/src/Structures/StructTitleBlock.cpp b/src/Structures/StructTitleBlock.cpp
@@ -4,9 +4,9 @@
 
 #include <nameof.hpp>
 
+#include "Container.hpp"
 #include "Enums/Structure.hpp"
 #include "General.hpp"
-#include "Parser.hpp"
 #include "Structures/StructTitleBlock.hpp"
 
 

diff --git a/src/main.cpp b/src/main.cpp
@@ -6,7 +6,7 @@
 #include <spdlog/sinks/stdout_color_sinks.h>
 #include <spdlog/spdlog.h>
 
-#include "Parser.hpp"
+#include "Container.hpp"
 #include "XmlExporter.hpp"
 
 
@@ -153,7 +153,7 @@ int main(int argc, char* argv[])
     cfg.mSkipInvalidPrim   = allowSkipping;
     cfg.mKeepTmpFiles      = keepTmpFiles;
 
-    Parser parser{inputFile, cfg};
+    Container parser{inputFile, cfg};
 
     ParserContext& ctx = parser.getContext();
 

diff --git a/test/py/testing.py b/test/py/testing.py
@@ -102,7 +102,7 @@ def create_repo_cpp_unit_test(repo: Repository, path_repo: str, path_unit_test:
 
 #include <catch2/catch_all.hpp>
 
-#include <Parser.hpp>
+#include <Container.hpp>
 
 #include "Helper.hpp"
 
@@ -125,7 +125,7 @@ def create_repo_cpp_unit_test(repo: Repository, path_repo: str, path_unit_test:
 
     ParserConfig cfg = get_parser_config();
 
-    Parser parser{{inputFile, cfg}};
+    Container parser{{inputFile, cfg}};
 
     parser.parseLibrary();
     check_error_count(inputFile, parser.getFileErrCtr(), {file.errors});

diff --git a/test/src/Helper.hpp b/test/src/Helper.hpp
@@ -10,7 +10,7 @@
 
 #include <spdlog/spdlog.h>
 
-#include <Parser.hpp>
+#include <Container.hpp>
 
 
 namespace fs = std::filesystem;