Add ZoneDefinition Parsing

src/ZoneCommon/Zone/Definition/ZoneDefinitionStream.cpp

@@ -1,13 +1,62 @@
 #include "ZoneDefinitionStream.h"
 
-ZoneDefinitionInputStream::ZoneDefinitionInputStream(std::istream& stream)
-    : m_stream(stream)
+#include <chrono>
+
+#include "Parsing/Impl/ParserInputStream.h"
+#include <Parsing/Impl/CommentRemovingStreamProxy.h>
+
+#include "Parsing/Impl/DefinesStreamProxy.h"
+#include "Parsing/Simple/SimpleLexer.h"
+#include "Parsing/ZoneDefinition/ZoneDefinitionParser.h"
+
+ZoneDefinitionInputStream::ZoneDefinitionInputStream(std::istream& stream, std::string fileName, bool verbose)
+    : m_file_name(std::move(fileName)),
+      m_verbose(verbose),
+      m_stream(nullptr)
 {
+    OpenBaseStream(stream);
+    SetupStreamProxies();
+    m_stream = m_open_streams.back().get();
+}
+
+bool ZoneDefinitionInputStream::OpenBaseStream(std::istream& stream)
+{
+    m_open_streams.emplace_back(std::make_unique<ParserInputStream>(stream, m_file_name));
+    return true;
+}
+
+void ZoneDefinitionInputStream::SetupStreamProxies()
+{
+    m_open_streams.emplace_back(std::make_unique<CommentRemovingStreamProxy>(m_open_streams.back().get()));
+    auto definesProxy = std::make_unique<DefinesStreamProxy>(m_open_streams.back().get());
+    definesProxy->AddDefine(DefinesStreamProxy::Define(ZONE_CODE_GENERATOR_DEFINE_NAME, ZONE_CODE_GENERATOR_DEFINE_VALUE));
+    m_open_streams.emplace_back(std::move(definesProxy));
+
+    m_stream = m_open_streams.back().get();
 }
 
 std::unique_ptr<ZoneDefinition> ZoneDefinitionInputStream::ReadDefinition()
 {
-    return nullptr;
+    if (m_verbose)
+    {
+        std::cout << "Reading zone definition file: " << m_file_name << std::endl;
+    }
+
+    const auto lexer = std::make_unique<SimpleLexer>(m_stream);
+    const auto parser = std::make_unique<ZoneDefinitionParser>(lexer.get());
+
+    const auto start = std::chrono::steady_clock::now();
+    std::unique_ptr<ZoneDefinition> definition;
+    if (parser->Parse())
+        definition = parser->GetParsedValue();
+    const auto end = std::chrono::steady_clock::now();
+
+    if (m_verbose)
+    {
+        std::cout << "Processing zone definition took " << std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count() << "ms" << std::endl;
+    }
+
+    return std::move(definition);
 }
 
 ZoneDefinitionOutputStream::ZoneDefinitionOutputStream(std::ostream& stream)

src/ZoneCommon/Zone/Definition/ZoneDefinitionStream.h

@@ -3,13 +3,23 @@
 #include <memory>
 
 #include "ZoneDefinition.h"
+#include "Parsing/IParserLineStream.h"
 
 class ZoneDefinitionInputStream
 {
-    std::istream& m_stream;
+    static constexpr const char* ZONE_CODE_GENERATOR_DEFINE_NAME = "__zonecodegenerator";
+    static constexpr const char* ZONE_CODE_GENERATOR_DEFINE_VALUE = "1";
+
+    std::string m_file_name;
+    bool m_verbose;
+    IParserLineStream* m_stream;
+    std::vector<std::unique_ptr<IParserLineStream>> m_open_streams;
+
+    bool OpenBaseStream(std::istream& stream);
+    void SetupStreamProxies();
 
 public:
-    explicit ZoneDefinitionInputStream(std::istream& stream);
+    ZoneDefinitionInputStream(std::istream& stream, std::string fileName, bool verbose);
 
     std::unique_ptr<ZoneDefinition> ReadDefinition();
 };