From ff823b47220052e974d11b9f4b563523a12f24a0 Mon Sep 17 00:00:00 2001 From: Jan Date: Mon, 1 Nov 2021 09:43:07 +0100 Subject: [PATCH] Move menu parsing classes to menu namespace --- .../IW4/AssetLoaders/AssetLoaderMenuList.cpp | 2 +- .../Parsing/Menu/Domain/CommonFunctionDef.h | 11 +++-- .../Parsing/Menu/Domain/CommonItemDef.h | 11 +++-- .../Parsing/Menu/Domain/CommonMenuDef.h | 13 +++--- .../Parsing/Menu/Domain/MenuFeatureLevel.h | 11 +++-- .../Parsing/Menu/Domain/MenuParsingResult.h | 15 ++++--- .../Parsing/Menu/MenuFileParser.cpp | 4 +- src/ObjLoading/Parsing/Menu/MenuFileParser.h | 43 ++++++++++--------- .../Parsing/Menu/MenuFileParserState.cpp | 4 +- .../Parsing/Menu/MenuFileParserState.h | 31 +++++++------ .../Parsing/Menu/MenuFileReader.cpp | 18 ++++---- src/ObjLoading/Parsing/Menu/MenuFileReader.h | 41 ++++++++++-------- .../Menu/Sequence/Properties/SequenceName.cpp | 2 + .../Menu/Sequence/Properties/SequenceName.h | 17 +++++--- .../Menu/Sequence/SequenceCloseBlock.cpp | 2 + .../Menu/Sequence/SequenceCloseBlock.h | 17 +++++--- .../Menu/Sequence/SequenceFunctionDef.cpp | 2 + .../Menu/Sequence/SequenceFunctionDef.h | 15 ++++--- .../Parsing/Menu/Sequence/SequenceItemDef.cpp | 2 + .../Parsing/Menu/Sequence/SequenceItemDef.h | 15 ++++--- .../Menu/Sequence/SequenceLoadMenu.cpp | 2 + .../Parsing/Menu/Sequence/SequenceLoadMenu.h | 17 +++++--- .../Parsing/Menu/Sequence/SequenceMenuDef.cpp | 2 + .../Parsing/Menu/Sequence/SequenceMenuDef.h | 15 ++++--- .../Sequence/SequenceOpenGlobalScopeBlock.cpp | 2 + .../Sequence/SequenceOpenGlobalScopeBlock.h | 15 ++++--- 26 files changed, 197 insertions(+), 132 deletions(-) diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderMenuList.cpp b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderMenuList.cpp index 4202acd4..c825f30c 100644 --- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderMenuList.cpp +++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderMenuList.cpp @@ -28,7 +28,7 @@ bool AssetLoaderMenuList::LoadFromRaw(const std::string& assetName, ISearchPath* if (!file.IsOpen()) return false; - MenuFileReader reader(*file.m_stream, assetName, MenuFeatureLevel::IW4, [searchPath](const std::string& filename, const std::string& sourceFile) -> std::unique_ptr + menu::MenuFileReader reader(*file.m_stream, assetName, menu::FeatureLevel::IW4, [searchPath](const std::string& filename, const std::string& sourceFile) -> std::unique_ptr { auto foundFileToInclude = searchPath->Open(filename); if (!foundFileToInclude.IsOpen() || !foundFileToInclude.m_stream) diff --git a/src/ObjLoading/Parsing/Menu/Domain/CommonFunctionDef.h b/src/ObjLoading/Parsing/Menu/Domain/CommonFunctionDef.h index 40e42237..ef459bc3 100644 --- a/src/ObjLoading/Parsing/Menu/Domain/CommonFunctionDef.h +++ b/src/ObjLoading/Parsing/Menu/Domain/CommonFunctionDef.h @@ -2,8 +2,11 @@ #include -class CommonFunctionDef +namespace menu { -public: - std::string m_name; -}; \ No newline at end of file + class CommonFunctionDef + { + public: + std::string m_name; + }; +} diff --git a/src/ObjLoading/Parsing/Menu/Domain/CommonItemDef.h b/src/ObjLoading/Parsing/Menu/Domain/CommonItemDef.h index dacff268..1a2a04ec 100644 --- a/src/ObjLoading/Parsing/Menu/Domain/CommonItemDef.h +++ b/src/ObjLoading/Parsing/Menu/Domain/CommonItemDef.h @@ -2,8 +2,11 @@ #include -class CommonItemDef +namespace menu { -public: - std::string m_name; -}; \ No newline at end of file + class CommonItemDef + { + public: + std::string m_name; + }; +} diff --git a/src/ObjLoading/Parsing/Menu/Domain/CommonMenuDef.h b/src/ObjLoading/Parsing/Menu/Domain/CommonMenuDef.h index 22065bd9..5ff0bc25 100644 --- a/src/ObjLoading/Parsing/Menu/Domain/CommonMenuDef.h +++ b/src/ObjLoading/Parsing/Menu/Domain/CommonMenuDef.h @@ -5,9 +5,12 @@ #include "CommonItemDef.h" -class CommonMenuDef +namespace menu { -public: - std::string m_name; - std::vector> m_items; -}; + class CommonMenuDef + { + public: + std::string m_name; + std::vector> m_items; + }; +} diff --git a/src/ObjLoading/Parsing/Menu/Domain/MenuFeatureLevel.h b/src/ObjLoading/Parsing/Menu/Domain/MenuFeatureLevel.h index 22249c46..8fb8c5e7 100644 --- a/src/ObjLoading/Parsing/Menu/Domain/MenuFeatureLevel.h +++ b/src/ObjLoading/Parsing/Menu/Domain/MenuFeatureLevel.h @@ -1,7 +1,10 @@ #pragma once -enum class MenuFeatureLevel +namespace menu { - IW4, - IW5 -}; \ No newline at end of file + enum class FeatureLevel + { + IW4, + IW5 + }; +} \ No newline at end of file diff --git a/src/ObjLoading/Parsing/Menu/Domain/MenuParsingResult.h b/src/ObjLoading/Parsing/Menu/Domain/MenuParsingResult.h index 5977da6b..46c02297 100644 --- a/src/ObjLoading/Parsing/Menu/Domain/MenuParsingResult.h +++ b/src/ObjLoading/Parsing/Menu/Domain/MenuParsingResult.h @@ -6,10 +6,13 @@ #include "CommonFunctionDef.h" #include "CommonMenuDef.h" -class MenuParsingResult +namespace menu { -public: - std::vector> m_menus; - std::vector> m_functions; - std::vector m_menus_to_load; -}; + class ParsingResult + { + public: + std::vector> m_menus; + std::vector> m_functions; + std::vector m_menus_to_load; + }; +} diff --git a/src/ObjLoading/Parsing/Menu/MenuFileParser.cpp b/src/ObjLoading/Parsing/Menu/MenuFileParser.cpp index 385b8bf9..81f884b2 100644 --- a/src/ObjLoading/Parsing/Menu/MenuFileParser.cpp +++ b/src/ObjLoading/Parsing/Menu/MenuFileParser.cpp @@ -8,7 +8,9 @@ #include "Sequence/SequenceOpenGlobalScopeBlock.h" #include "Sequence/Properties/SequenceName.h" -MenuFileParser::MenuFileParser(SimpleLexer* lexer, const MenuFeatureLevel featureLevel) +using namespace menu; + +MenuFileParser::MenuFileParser(SimpleLexer* lexer, const FeatureLevel featureLevel) : AbstractParser(lexer, std::make_unique(featureLevel)) { CreateTestCollections(); diff --git a/src/ObjLoading/Parsing/Menu/MenuFileParser.h b/src/ObjLoading/Parsing/Menu/MenuFileParser.h index 253558c9..ee62b0d4 100644 --- a/src/ObjLoading/Parsing/Menu/MenuFileParser.h +++ b/src/ObjLoading/Parsing/Menu/MenuFileParser.h @@ -6,27 +6,30 @@ #include "Parsing/Simple/SimpleParserValue.h" #include "Parsing/Impl/AbstractParser.h" -class MenuFileParser final : public AbstractParser +namespace menu { - std::vector> m_all_tests; - std::vector m_no_scope_tests; - std::vector m_global_scope_tests; - std::vector m_function_scope_tests; - std::vector m_menu_scope_tests; - std::vector m_item_scope_tests; + class MenuFileParser final : public AbstractParser + { + std::vector> m_all_tests; + std::vector m_no_scope_tests; + std::vector m_global_scope_tests; + std::vector m_function_scope_tests; + std::vector m_menu_scope_tests; + std::vector m_item_scope_tests; - void AddTest(std::vector& collection, std::unique_ptr test); - void CreateNoScopeTests(); - void CreateGlobalScopeTests(); - void CreateFunctionScopeTests(); - void CreateMenuScopeTests(); - void CreateItemScopeTests(); - void CreateTestCollections(); + void AddTest(std::vector& collection, std::unique_ptr test); + void CreateNoScopeTests(); + void CreateGlobalScopeTests(); + void CreateFunctionScopeTests(); + void CreateMenuScopeTests(); + void CreateItemScopeTests(); + void CreateTestCollections(); -protected: - const std::vector& GetTestsForState() override; + protected: + const std::vector& GetTestsForState() override; -public: - MenuFileParser(SimpleLexer* lexer, MenuFeatureLevel featureLevel); - _NODISCARD MenuFileParserState* GetState() const; -}; + public: + MenuFileParser(SimpleLexer* lexer, FeatureLevel featureLevel); + _NODISCARD MenuFileParserState* GetState() const; + }; +} diff --git a/src/ObjLoading/Parsing/Menu/MenuFileParserState.cpp b/src/ObjLoading/Parsing/Menu/MenuFileParserState.cpp index df27f35c..4b7139d8 100644 --- a/src/ObjLoading/Parsing/Menu/MenuFileParserState.cpp +++ b/src/ObjLoading/Parsing/Menu/MenuFileParserState.cpp @@ -1,6 +1,8 @@ #include "MenuFileParserState.h" -MenuFileParserState::MenuFileParserState(const MenuFeatureLevel featureLevel) +using namespace menu; + +MenuFileParserState::MenuFileParserState(const FeatureLevel featureLevel) : m_feature_level(featureLevel), m_in_global_scope(false) { diff --git a/src/ObjLoading/Parsing/Menu/MenuFileParserState.h b/src/ObjLoading/Parsing/Menu/MenuFileParserState.h index 036860ff..51fc058c 100644 --- a/src/ObjLoading/Parsing/Menu/MenuFileParserState.h +++ b/src/ObjLoading/Parsing/Menu/MenuFileParserState.h @@ -8,22 +8,25 @@ #include "Domain/CommonMenuDef.h" #include "Domain/MenuFeatureLevel.h" -class MenuFileParserState +namespace menu { -public: - const MenuFeatureLevel m_feature_level; + class MenuFileParserState + { + public: + const FeatureLevel m_feature_level; - std::vector m_menus_to_load; - std::vector> m_functions; - std::vector> m_menus; + std::vector m_menus_to_load; + std::vector> m_functions; + std::vector> m_menus; - std::map m_functions_by_name; - std::map m_menus_by_name; + std::map m_functions_by_name; + std::map m_menus_by_name; - bool m_in_global_scope; - std::unique_ptr m_current_function; - std::unique_ptr m_current_menu; - std::unique_ptr m_current_item; + bool m_in_global_scope; + std::unique_ptr m_current_function; + std::unique_ptr m_current_menu; + std::unique_ptr m_current_item; - explicit MenuFileParserState(MenuFeatureLevel featureLevel); -}; + explicit MenuFileParserState(FeatureLevel featureLevel); + }; +} diff --git a/src/ObjLoading/Parsing/Menu/MenuFileReader.cpp b/src/ObjLoading/Parsing/Menu/MenuFileReader.cpp index 90999898..9e7a51f0 100644 --- a/src/ObjLoading/Parsing/Menu/MenuFileReader.cpp +++ b/src/ObjLoading/Parsing/Menu/MenuFileReader.cpp @@ -8,7 +8,9 @@ #include "Parsing/Impl/ParserSingleInputStream.h" #include "Parsing/Simple/SimpleLexer.h" -MenuFileReader::MenuFileReader(std::istream& stream, std::string fileName, const MenuFeatureLevel featureLevel, include_callback_t includeCallback) +using namespace menu; + +MenuFileReader::MenuFileReader(std::istream& stream, std::string fileName, const FeatureLevel featureLevel, include_callback_t includeCallback) : m_feature_level(featureLevel), m_file_name(std::move(fileName)), m_stream(nullptr) @@ -18,7 +20,7 @@ MenuFileReader::MenuFileReader(std::istream& stream, std::string fileName, const m_stream = m_open_streams.back().get(); } -MenuFileReader::MenuFileReader(std::istream& stream, std::string fileName, const MenuFeatureLevel featureLevel) +MenuFileReader::MenuFileReader(std::istream& stream, std::string fileName, const FeatureLevel featureLevel) : m_feature_level(featureLevel), m_file_name(std::move(fileName)), m_stream(nullptr) @@ -45,10 +47,10 @@ void MenuFileReader::SetupDefinesProxy() defines->AddDefine(DefinesStreamProxy::Define("PC", "1")); switch(m_feature_level) { - case MenuFeatureLevel::IW4: + case FeatureLevel::IW4: defines->AddDefine(DefinesStreamProxy::Define("FEATURE_LEVEL_IW4", "1")); break; - case MenuFeatureLevel::IW5: + case FeatureLevel::IW5: defines->AddDefine(DefinesStreamProxy::Define("FEATURE_LEVEL_IW5", "1")); break; default: @@ -97,9 +99,9 @@ bool MenuFileReader::IsValidEndState(const MenuFileParserState* state) const return true; } -std::unique_ptr MenuFileReader::CreateParsingResult(MenuFileParserState* state) const +std::unique_ptr MenuFileReader::CreateParsingResult(MenuFileParserState* state) const { - auto result = std::make_unique(); + auto result = std::make_unique(); result->m_menus = std::move(state->m_menus); result->m_functions = std::move(state->m_functions); result->m_menus_to_load = std::move(state->m_menus_to_load); @@ -107,9 +109,9 @@ std::unique_ptr MenuFileReader::CreateParsingResult(MenuFileP return result; } -std::unique_ptr MenuFileReader::ReadMenuFile() +std::unique_ptr MenuFileReader::ReadMenuFile() { - const auto lexer = std::make_unique(m_stream, SimpleLexer::Config{false, true, false}); + const auto lexer = std::make_unique(m_stream, SimpleLexer::Config{false, true, true}); const auto parser = std::make_unique(lexer.get(), m_feature_level); if (!parser->Parse()) diff --git a/src/ObjLoading/Parsing/Menu/MenuFileReader.h b/src/ObjLoading/Parsing/Menu/MenuFileReader.h index 038a7478..1fe36f3d 100644 --- a/src/ObjLoading/Parsing/Menu/MenuFileReader.h +++ b/src/ObjLoading/Parsing/Menu/MenuFileReader.h @@ -9,28 +9,31 @@ #include "Domain/MenuParsingResult.h" #include "Parsing/IParserLineStream.h" -class MenuFileReader +namespace menu { -public: - using include_callback_t = std::function(const std::string& filename, const std::string& sourceFile)>; - -private: - const MenuFeatureLevel m_feature_level; - const std::string m_file_name; + class MenuFileReader + { + public: + using include_callback_t = std::function(const std::string& filename, const std::string& sourceFile)>; - IParserLineStream* m_stream; - std::vector> m_open_streams; + private: + const FeatureLevel m_feature_level; + const std::string m_file_name; - bool OpenBaseStream(std::istream& stream, include_callback_t includeCallback); - void SetupDefinesProxy(); - void SetupStreamProxies(); + IParserLineStream* m_stream; + std::vector> m_open_streams; - bool IsValidEndState(const MenuFileParserState* state) const; - std::unique_ptr CreateParsingResult(MenuFileParserState* state) const; + bool OpenBaseStream(std::istream& stream, include_callback_t includeCallback); + void SetupDefinesProxy(); + void SetupStreamProxies(); -public: - MenuFileReader(std::istream& stream, std::string fileName, MenuFeatureLevel featureLevel); - MenuFileReader(std::istream& stream, std::string fileName, MenuFeatureLevel featureLevel, include_callback_t includeCallback); + bool IsValidEndState(const MenuFileParserState* state) const; + std::unique_ptr CreateParsingResult(MenuFileParserState* state) const; - std::unique_ptr ReadMenuFile(); -}; + public: + MenuFileReader(std::istream& stream, std::string fileName, FeatureLevel featureLevel); + MenuFileReader(std::istream& stream, std::string fileName, FeatureLevel featureLevel, include_callback_t includeCallback); + + std::unique_ptr ReadMenuFile(); + }; +} diff --git a/src/ObjLoading/Parsing/Menu/Sequence/Properties/SequenceName.cpp b/src/ObjLoading/Parsing/Menu/Sequence/Properties/SequenceName.cpp index 5c783241..0e5d6536 100644 --- a/src/ObjLoading/Parsing/Menu/Sequence/Properties/SequenceName.cpp +++ b/src/ObjLoading/Parsing/Menu/Sequence/Properties/SequenceName.cpp @@ -2,6 +2,8 @@ #include "Parsing/Simple/Matcher/SimpleMatcherFactory.h" +using namespace menu; + SequenceName::SequenceName() { const SimpleMatcherFactory create(this); diff --git a/src/ObjLoading/Parsing/Menu/Sequence/Properties/SequenceName.h b/src/ObjLoading/Parsing/Menu/Sequence/Properties/SequenceName.h index 8783502d..800aecd7 100644 --- a/src/ObjLoading/Parsing/Menu/Sequence/Properties/SequenceName.h +++ b/src/ObjLoading/Parsing/Menu/Sequence/Properties/SequenceName.h @@ -2,13 +2,16 @@ #include "Parsing/Menu/MenuFileParser.h" -class SequenceName final : public MenuFileParser::sequence_t +namespace menu { - static constexpr auto CAPTURE_NAME = 1; + class SequenceName final : public MenuFileParser::sequence_t + { + static constexpr auto CAPTURE_NAME = 1; -protected: - void ProcessMatch(MenuFileParserState* state, SequenceResult& result) const override; + protected: + void ProcessMatch(MenuFileParserState* state, SequenceResult& result) const override; -public: - SequenceName(); -}; + public: + SequenceName(); + }; +} diff --git a/src/ObjLoading/Parsing/Menu/Sequence/SequenceCloseBlock.cpp b/src/ObjLoading/Parsing/Menu/Sequence/SequenceCloseBlock.cpp index b9ed1722..08c5587d 100644 --- a/src/ObjLoading/Parsing/Menu/Sequence/SequenceCloseBlock.cpp +++ b/src/ObjLoading/Parsing/Menu/Sequence/SequenceCloseBlock.cpp @@ -4,6 +4,8 @@ #include "Parsing/Simple/Matcher/SimpleMatcherFactory.h" +using namespace menu; + SequenceCloseBlock::SequenceCloseBlock() { const SimpleMatcherFactory create(this); diff --git a/src/ObjLoading/Parsing/Menu/Sequence/SequenceCloseBlock.h b/src/ObjLoading/Parsing/Menu/Sequence/SequenceCloseBlock.h index 7a7c836e..a6870824 100644 --- a/src/ObjLoading/Parsing/Menu/Sequence/SequenceCloseBlock.h +++ b/src/ObjLoading/Parsing/Menu/Sequence/SequenceCloseBlock.h @@ -2,13 +2,16 @@ #include "Parsing/Menu/MenuFileParser.h" -class SequenceCloseBlock final : public MenuFileParser::sequence_t +namespace menu { - static constexpr auto CAPTURE_TOKEN = 1; + class SequenceCloseBlock final : public MenuFileParser::sequence_t + { + static constexpr auto CAPTURE_TOKEN = 1; -protected: - void ProcessMatch(MenuFileParserState* state, SequenceResult& result) const override; + protected: + void ProcessMatch(MenuFileParserState* state, SequenceResult& result) const override; -public: - SequenceCloseBlock(); -}; + public: + SequenceCloseBlock(); + }; +} diff --git a/src/ObjLoading/Parsing/Menu/Sequence/SequenceFunctionDef.cpp b/src/ObjLoading/Parsing/Menu/Sequence/SequenceFunctionDef.cpp index c6c4b393..5ed3245c 100644 --- a/src/ObjLoading/Parsing/Menu/Sequence/SequenceFunctionDef.cpp +++ b/src/ObjLoading/Parsing/Menu/Sequence/SequenceFunctionDef.cpp @@ -2,6 +2,8 @@ #include "Parsing/Simple/Matcher/SimpleMatcherFactory.h" +using namespace menu; + SequenceFunctionDef::SequenceFunctionDef() { const SimpleMatcherFactory create(this); diff --git a/src/ObjLoading/Parsing/Menu/Sequence/SequenceFunctionDef.h b/src/ObjLoading/Parsing/Menu/Sequence/SequenceFunctionDef.h index 84603a31..78af061b 100644 --- a/src/ObjLoading/Parsing/Menu/Sequence/SequenceFunctionDef.h +++ b/src/ObjLoading/Parsing/Menu/Sequence/SequenceFunctionDef.h @@ -2,11 +2,14 @@ #include "Parsing/Menu/MenuFileParser.h" -class SequenceFunctionDef final : public MenuFileParser::sequence_t +namespace menu { -protected: - void ProcessMatch(MenuFileParserState* state, SequenceResult& result) const override; + class SequenceFunctionDef final : public MenuFileParser::sequence_t + { + protected: + void ProcessMatch(MenuFileParserState* state, SequenceResult& result) const override; -public: - SequenceFunctionDef(); -}; + public: + SequenceFunctionDef(); + }; +} diff --git a/src/ObjLoading/Parsing/Menu/Sequence/SequenceItemDef.cpp b/src/ObjLoading/Parsing/Menu/Sequence/SequenceItemDef.cpp index 84c20cd3..bc88bf7d 100644 --- a/src/ObjLoading/Parsing/Menu/Sequence/SequenceItemDef.cpp +++ b/src/ObjLoading/Parsing/Menu/Sequence/SequenceItemDef.cpp @@ -2,6 +2,8 @@ #include "Parsing/Simple/Matcher/SimpleMatcherFactory.h" +using namespace menu; + SequenceItemDef::SequenceItemDef() { const SimpleMatcherFactory create(this); diff --git a/src/ObjLoading/Parsing/Menu/Sequence/SequenceItemDef.h b/src/ObjLoading/Parsing/Menu/Sequence/SequenceItemDef.h index ed1b8c58..a04cd8b9 100644 --- a/src/ObjLoading/Parsing/Menu/Sequence/SequenceItemDef.h +++ b/src/ObjLoading/Parsing/Menu/Sequence/SequenceItemDef.h @@ -2,11 +2,14 @@ #include "Parsing/Menu/MenuFileParser.h" -class SequenceItemDef final : public MenuFileParser::sequence_t +namespace menu { -protected: - void ProcessMatch(MenuFileParserState* state, SequenceResult& result) const override; + class SequenceItemDef final : public MenuFileParser::sequence_t + { + protected: + void ProcessMatch(MenuFileParserState* state, SequenceResult& result) const override; -public: - SequenceItemDef(); -}; + public: + SequenceItemDef(); + }; +} diff --git a/src/ObjLoading/Parsing/Menu/Sequence/SequenceLoadMenu.cpp b/src/ObjLoading/Parsing/Menu/Sequence/SequenceLoadMenu.cpp index 77406cc4..7e97b5da 100644 --- a/src/ObjLoading/Parsing/Menu/Sequence/SequenceLoadMenu.cpp +++ b/src/ObjLoading/Parsing/Menu/Sequence/SequenceLoadMenu.cpp @@ -2,6 +2,8 @@ #include "Parsing/Simple/Matcher/SimpleMatcherFactory.h" +using namespace menu; + SequenceLoadMenu::SequenceLoadMenu() { const SimpleMatcherFactory create(this); diff --git a/src/ObjLoading/Parsing/Menu/Sequence/SequenceLoadMenu.h b/src/ObjLoading/Parsing/Menu/Sequence/SequenceLoadMenu.h index 108a273e..aefe4415 100644 --- a/src/ObjLoading/Parsing/Menu/Sequence/SequenceLoadMenu.h +++ b/src/ObjLoading/Parsing/Menu/Sequence/SequenceLoadMenu.h @@ -2,13 +2,16 @@ #include "Parsing/Menu/MenuFileParser.h" -class SequenceLoadMenu final : public MenuFileParser::sequence_t +namespace menu { - static constexpr auto CAPTURE_MENU_NAME = 1; + class SequenceLoadMenu final : public MenuFileParser::sequence_t + { + static constexpr auto CAPTURE_MENU_NAME = 1; -protected: - void ProcessMatch(MenuFileParserState* state, SequenceResult& result) const override; + protected: + void ProcessMatch(MenuFileParserState* state, SequenceResult& result) const override; -public: - SequenceLoadMenu(); -}; + public: + SequenceLoadMenu(); + }; +} diff --git a/src/ObjLoading/Parsing/Menu/Sequence/SequenceMenuDef.cpp b/src/ObjLoading/Parsing/Menu/Sequence/SequenceMenuDef.cpp index 91a22a2a..9b39bdca 100644 --- a/src/ObjLoading/Parsing/Menu/Sequence/SequenceMenuDef.cpp +++ b/src/ObjLoading/Parsing/Menu/Sequence/SequenceMenuDef.cpp @@ -2,6 +2,8 @@ #include "Parsing/Simple/Matcher/SimpleMatcherFactory.h" +using namespace menu; + SequenceMenuDef::SequenceMenuDef() { const SimpleMatcherFactory create(this); diff --git a/src/ObjLoading/Parsing/Menu/Sequence/SequenceMenuDef.h b/src/ObjLoading/Parsing/Menu/Sequence/SequenceMenuDef.h index c17289ef..1577620f 100644 --- a/src/ObjLoading/Parsing/Menu/Sequence/SequenceMenuDef.h +++ b/src/ObjLoading/Parsing/Menu/Sequence/SequenceMenuDef.h @@ -2,11 +2,14 @@ #include "Parsing/Menu/MenuFileParser.h" -class SequenceMenuDef final : public MenuFileParser::sequence_t +namespace menu { -protected: - void ProcessMatch(MenuFileParserState* state, SequenceResult& result) const override; + class SequenceMenuDef final : public MenuFileParser::sequence_t + { + protected: + void ProcessMatch(MenuFileParserState* state, SequenceResult& result) const override; -public: - SequenceMenuDef(); -}; + public: + SequenceMenuDef(); + }; +} diff --git a/src/ObjLoading/Parsing/Menu/Sequence/SequenceOpenGlobalScopeBlock.cpp b/src/ObjLoading/Parsing/Menu/Sequence/SequenceOpenGlobalScopeBlock.cpp index 458f28f6..b84a7754 100644 --- a/src/ObjLoading/Parsing/Menu/Sequence/SequenceOpenGlobalScopeBlock.cpp +++ b/src/ObjLoading/Parsing/Menu/Sequence/SequenceOpenGlobalScopeBlock.cpp @@ -2,6 +2,8 @@ #include "Parsing/Simple/Matcher/SimpleMatcherFactory.h" +using namespace menu; + SequenceOpenGlobalScopeBlock::SequenceOpenGlobalScopeBlock() { const SimpleMatcherFactory create(this); diff --git a/src/ObjLoading/Parsing/Menu/Sequence/SequenceOpenGlobalScopeBlock.h b/src/ObjLoading/Parsing/Menu/Sequence/SequenceOpenGlobalScopeBlock.h index aab4eccf..6aa93d12 100644 --- a/src/ObjLoading/Parsing/Menu/Sequence/SequenceOpenGlobalScopeBlock.h +++ b/src/ObjLoading/Parsing/Menu/Sequence/SequenceOpenGlobalScopeBlock.h @@ -2,11 +2,14 @@ #include "Parsing/Menu/MenuFileParser.h" -class SequenceOpenGlobalScopeBlock final : public MenuFileParser::sequence_t +namespace menu { -protected: - void ProcessMatch(MenuFileParserState* state, SequenceResult& result) const override; + class SequenceOpenGlobalScopeBlock final : public MenuFileParser::sequence_t + { + protected: + void ProcessMatch(MenuFileParserState* state, SequenceResult& result) const override; -public: - SequenceOpenGlobalScopeBlock(); -}; + public: + SequenceOpenGlobalScopeBlock(); + }; +}