From e9fb5dc4ddd5e24865b346c9c883305055077585 Mon Sep 17 00:00:00 2001 From: Jan Laupetin Date: Wed, 4 Feb 2026 21:05:39 +0000 Subject: [PATCH] fix: compilation with CommonTechset --- src/Common/{ => Techset}/StateMap/StateMapLayout.cpp | 0 src/Common/{ => Techset}/StateMap/StateMapLayout.h | 0 src/ObjCommon/Game/IW4/Techset/TechsetConstantsIW4.h | 2 +- src/ObjCompiling/Game/IW4/Material/CompilerMaterialIW4.cpp | 4 ++-- src/ObjCompiling/Game/IW4/Techset/CompilerTechsetIW4.cpp | 2 +- src/ObjCompiling/Game/IW4/Techset/CompilerTechsetIW4.h | 2 +- .../Techset/CommonTechsetCache.cpp | 0 .../Techset/CommonTechsetCache.h | 0 .../Parsing/Matcher/StateMapExpressionMatchers.cpp | 0 .../StateMap/Parsing/Matcher/StateMapExpressionMatchers.h | 2 +- .../Techset}/StateMap/Parsing/StateMapParser.cpp | 0 .../Techset}/StateMap/Parsing/StateMapParser.h | 6 ++---- .../Techset}/StateMap/Parsing/StateMapParserState.cpp | 0 .../Techset}/StateMap/Parsing/StateMapParserState.h | 4 ++-- .../Techset}/StateMap/StateMapDefinition.cpp | 0 .../Techset}/StateMap/StateMapDefinition.h | 0 .../Techset}/StateMap/StateMapFromTechniqueExtractor.cpp | 0 .../Techset}/StateMap/StateMapFromTechniqueExtractor.h | 0 .../Techset}/StateMap/StateMapHandler.cpp | 0 .../Techset}/StateMap/StateMapHandler.h | 7 +++---- .../Techset}/StateMap/StateMapReader.cpp | 0 .../Techset}/StateMap/StateMapReader.h | 2 +- .../Techset/TechniqueDefinitionAcceptor.cpp | 0 .../Techset/TechniqueDefinitionAcceptor.h | 0 .../Techset/TechniqueFileReader.cpp | 2 +- .../Techset/TechniqueFileReader.h | 1 - .../Techset/TechniqueStateMapCache.cpp | 0 .../Techset/TechniqueStateMapCache.h | 0 28 files changed, 15 insertions(+), 19 deletions(-) rename src/Common/{ => Techset}/StateMap/StateMapLayout.cpp (100%) rename src/Common/{ => Techset}/StateMap/StateMapLayout.h (100%) rename src/{ObjLoading => ObjCompiling}/Techset/CommonTechsetCache.cpp (100%) rename src/{ObjLoading => ObjCompiling}/Techset/CommonTechsetCache.h (100%) rename src/{ObjLoading => ObjCompiling/Techset}/StateMap/Parsing/Matcher/StateMapExpressionMatchers.cpp (100%) rename src/{ObjLoading => ObjCompiling/Techset}/StateMap/Parsing/Matcher/StateMapExpressionMatchers.h (91%) rename src/{ObjLoading => ObjCompiling/Techset}/StateMap/Parsing/StateMapParser.cpp (100%) rename src/{ObjLoading => ObjCompiling/Techset}/StateMap/Parsing/StateMapParser.h (71%) rename src/{ObjLoading => ObjCompiling/Techset}/StateMap/Parsing/StateMapParserState.cpp (100%) rename src/{ObjLoading => ObjCompiling/Techset}/StateMap/Parsing/StateMapParserState.h (88%) rename src/{ObjLoading => ObjCompiling/Techset}/StateMap/StateMapDefinition.cpp (100%) rename src/{ObjLoading => ObjCompiling/Techset}/StateMap/StateMapDefinition.h (100%) rename src/{ObjLoading => ObjCompiling/Techset}/StateMap/StateMapFromTechniqueExtractor.cpp (100%) rename src/{ObjLoading => ObjCompiling/Techset}/StateMap/StateMapFromTechniqueExtractor.h (100%) rename src/{ObjLoading => ObjCompiling/Techset}/StateMap/StateMapHandler.cpp (100%) rename src/{ObjLoading => ObjCompiling/Techset}/StateMap/StateMapHandler.h (81%) rename src/{ObjLoading => ObjCompiling/Techset}/StateMap/StateMapReader.cpp (100%) rename src/{ObjLoading => ObjCompiling/Techset}/StateMap/StateMapReader.h (94%) rename src/{ObjLoading => ObjCompiling}/Techset/TechniqueDefinitionAcceptor.cpp (100%) rename src/{ObjLoading => ObjCompiling}/Techset/TechniqueDefinitionAcceptor.h (100%) rename src/{ObjLoading => ObjCompiling}/Techset/TechniqueFileReader.cpp (96%) rename src/{ObjLoading => ObjCompiling}/Techset/TechniqueFileReader.h (95%) rename src/{ObjLoading => ObjCompiling}/Techset/TechniqueStateMapCache.cpp (100%) rename src/{ObjLoading => ObjCompiling}/Techset/TechniqueStateMapCache.h (100%) diff --git a/src/Common/StateMap/StateMapLayout.cpp b/src/Common/Techset/StateMap/StateMapLayout.cpp similarity index 100% rename from src/Common/StateMap/StateMapLayout.cpp rename to src/Common/Techset/StateMap/StateMapLayout.cpp diff --git a/src/Common/StateMap/StateMapLayout.h b/src/Common/Techset/StateMap/StateMapLayout.h similarity index 100% rename from src/Common/StateMap/StateMapLayout.h rename to src/Common/Techset/StateMap/StateMapLayout.h diff --git a/src/ObjCommon/Game/IW4/Techset/TechsetConstantsIW4.h b/src/ObjCommon/Game/IW4/Techset/TechsetConstantsIW4.h index 0f4f1a32..0881ff8c 100644 --- a/src/ObjCommon/Game/IW4/Techset/TechsetConstantsIW4.h +++ b/src/ObjCommon/Game/IW4/Techset/TechsetConstantsIW4.h @@ -2,8 +2,8 @@ #include "Game/IW4/CommonIW4.h" #include "Game/IW4/IW4.h" -#include "StateMap/StateMapLayout.h" #include "Techset/CommonTechset.h" +#include "Techset/StateMap/StateMapLayout.h" #include #include diff --git a/src/ObjCompiling/Game/IW4/Material/CompilerMaterialIW4.cpp b/src/ObjCompiling/Game/IW4/Material/CompilerMaterialIW4.cpp index 76a46ab9..0f3fdecd 100644 --- a/src/ObjCompiling/Game/IW4/Material/CompilerMaterialIW4.cpp +++ b/src/ObjCompiling/Game/IW4/Material/CompilerMaterialIW4.cpp @@ -9,9 +9,9 @@ #include "Gdt/AbstractGdtEntryReader.h" #include "Gdt/IGdtQueryable.h" #include "Pool/GlobalAssetPool.h" -#include "StateMap/StateMapFromTechniqueExtractor.h" -#include "StateMap/StateMapHandler.h" #include "Techset/CommonTechsetCache.h" +#include "Techset/StateMap/StateMapFromTechniqueExtractor.h" +#include "Techset/StateMap/StateMapHandler.h" #include "Techset/TechniqueFileReader.h" #include "Techset/TechniqueStateMapCache.h" #include "Techset/TechsetCommon.h" diff --git a/src/ObjCompiling/Game/IW4/Techset/CompilerTechsetIW4.cpp b/src/ObjCompiling/Game/IW4/Techset/CompilerTechsetIW4.cpp index 65e5f671..158b9984 100644 --- a/src/ObjCompiling/Game/IW4/Techset/CompilerTechsetIW4.cpp +++ b/src/ObjCompiling/Game/IW4/Techset/CompilerTechsetIW4.cpp @@ -6,9 +6,9 @@ #include "Game/IW4/Techset/TechsetConstantsIW4.h" #include "Shader/D3D9ShaderAnalyser.h" #include "Shader/ShaderCommon.h" -#include "StateMap/StateMapReader.h" #include "Techset/CommonTechsetCache.h" #include "Techset/CommonTechsetLoader.h" +#include "Techset/StateMap/StateMapReader.h" #include "Techset/TechniqueFileReader.h" #include "Techset/TechniqueStateMapCache.h" #include "Techset/TechsetCommon.h" diff --git a/src/ObjCompiling/Game/IW4/Techset/CompilerTechsetIW4.h b/src/ObjCompiling/Game/IW4/Techset/CompilerTechsetIW4.h index b1dd340c..c0e54d87 100644 --- a/src/ObjCompiling/Game/IW4/Techset/CompilerTechsetIW4.h +++ b/src/ObjCompiling/Game/IW4/Techset/CompilerTechsetIW4.h @@ -3,8 +3,8 @@ #include "Asset/IAssetCreator.h" #include "Game/IW4/IW4.h" #include "SearchPath/ISearchPath.h" -#include "StateMap/StateMapDefinition.h" #include "Techset/CommonTechset.h" +#include "Techset/StateMap/StateMapDefinition.h" #include "Utils/MemoryManager.h" #include diff --git a/src/ObjLoading/Techset/CommonTechsetCache.cpp b/src/ObjCompiling/Techset/CommonTechsetCache.cpp similarity index 100% rename from src/ObjLoading/Techset/CommonTechsetCache.cpp rename to src/ObjCompiling/Techset/CommonTechsetCache.cpp diff --git a/src/ObjLoading/Techset/CommonTechsetCache.h b/src/ObjCompiling/Techset/CommonTechsetCache.h similarity index 100% rename from src/ObjLoading/Techset/CommonTechsetCache.h rename to src/ObjCompiling/Techset/CommonTechsetCache.h diff --git a/src/ObjLoading/StateMap/Parsing/Matcher/StateMapExpressionMatchers.cpp b/src/ObjCompiling/Techset/StateMap/Parsing/Matcher/StateMapExpressionMatchers.cpp similarity index 100% rename from src/ObjLoading/StateMap/Parsing/Matcher/StateMapExpressionMatchers.cpp rename to src/ObjCompiling/Techset/StateMap/Parsing/Matcher/StateMapExpressionMatchers.cpp diff --git a/src/ObjLoading/StateMap/Parsing/Matcher/StateMapExpressionMatchers.h b/src/ObjCompiling/Techset/StateMap/Parsing/Matcher/StateMapExpressionMatchers.h similarity index 91% rename from src/ObjLoading/StateMap/Parsing/Matcher/StateMapExpressionMatchers.h rename to src/ObjCompiling/Techset/StateMap/Parsing/Matcher/StateMapExpressionMatchers.h index 1480bd91..b3a48882 100644 --- a/src/ObjLoading/StateMap/Parsing/Matcher/StateMapExpressionMatchers.h +++ b/src/ObjCompiling/Techset/StateMap/Parsing/Matcher/StateMapExpressionMatchers.h @@ -1,7 +1,7 @@ #pragma once #include "Parsing/Simple/Expression/SimpleExpressionMatchers.h" -#include "StateMap/Parsing/StateMapParserState.h" +#include "Techset/StateMap/Parsing/StateMapParserState.h" #include diff --git a/src/ObjLoading/StateMap/Parsing/StateMapParser.cpp b/src/ObjCompiling/Techset/StateMap/Parsing/StateMapParser.cpp similarity index 100% rename from src/ObjLoading/StateMap/Parsing/StateMapParser.cpp rename to src/ObjCompiling/Techset/StateMap/Parsing/StateMapParser.cpp diff --git a/src/ObjLoading/StateMap/Parsing/StateMapParser.h b/src/ObjCompiling/Techset/StateMap/Parsing/StateMapParser.h similarity index 71% rename from src/ObjLoading/StateMap/Parsing/StateMapParser.h rename to src/ObjCompiling/Techset/StateMap/Parsing/StateMapParser.h index dad1bcca..559eee6b 100644 --- a/src/ObjLoading/StateMap/Parsing/StateMapParser.h +++ b/src/ObjCompiling/Techset/StateMap/Parsing/StateMapParser.h @@ -4,8 +4,6 @@ #include "Parsing/Simple/SimpleLexer.h" #include "Parsing/Simple/SimpleParserValue.h" #include "StateMapParserState.h" -#include "Techset/TechsetDefinition.h" -#include "Utils/ClassUtils.h" namespace state_map { @@ -16,7 +14,7 @@ namespace state_map public: StateMapParser(SimpleLexer* lexer, std::string stateMapName, const StateMapLayout& layout); - _NODISCARD std::unique_ptr GetStateMapDefinition() const; - _NODISCARD StateMapParserState* GetState() const; + [[nodiscard]] std::unique_ptr GetStateMapDefinition() const; + [[nodiscard]] StateMapParserState* GetState() const; }; } // namespace state_map diff --git a/src/ObjLoading/StateMap/Parsing/StateMapParserState.cpp b/src/ObjCompiling/Techset/StateMap/Parsing/StateMapParserState.cpp similarity index 100% rename from src/ObjLoading/StateMap/Parsing/StateMapParserState.cpp rename to src/ObjCompiling/Techset/StateMap/Parsing/StateMapParserState.cpp diff --git a/src/ObjLoading/StateMap/Parsing/StateMapParserState.h b/src/ObjCompiling/Techset/StateMap/Parsing/StateMapParserState.h similarity index 88% rename from src/ObjLoading/StateMap/Parsing/StateMapParserState.h rename to src/ObjCompiling/Techset/StateMap/Parsing/StateMapParserState.h index 260d4e66..f32c64e3 100644 --- a/src/ObjLoading/StateMap/Parsing/StateMapParserState.h +++ b/src/ObjCompiling/Techset/StateMap/Parsing/StateMapParserState.h @@ -1,7 +1,7 @@ #pragma once -#include "StateMap/StateMapDefinition.h" -#include "StateMap/StateMapLayout.h" +#include "Techset/StateMap/StateMapDefinition.h" +#include "Techset/StateMap/StateMapLayout.h" #include #include diff --git a/src/ObjLoading/StateMap/StateMapDefinition.cpp b/src/ObjCompiling/Techset/StateMap/StateMapDefinition.cpp similarity index 100% rename from src/ObjLoading/StateMap/StateMapDefinition.cpp rename to src/ObjCompiling/Techset/StateMap/StateMapDefinition.cpp diff --git a/src/ObjLoading/StateMap/StateMapDefinition.h b/src/ObjCompiling/Techset/StateMap/StateMapDefinition.h similarity index 100% rename from src/ObjLoading/StateMap/StateMapDefinition.h rename to src/ObjCompiling/Techset/StateMap/StateMapDefinition.h diff --git a/src/ObjLoading/StateMap/StateMapFromTechniqueExtractor.cpp b/src/ObjCompiling/Techset/StateMap/StateMapFromTechniqueExtractor.cpp similarity index 100% rename from src/ObjLoading/StateMap/StateMapFromTechniqueExtractor.cpp rename to src/ObjCompiling/Techset/StateMap/StateMapFromTechniqueExtractor.cpp diff --git a/src/ObjLoading/StateMap/StateMapFromTechniqueExtractor.h b/src/ObjCompiling/Techset/StateMap/StateMapFromTechniqueExtractor.h similarity index 100% rename from src/ObjLoading/StateMap/StateMapFromTechniqueExtractor.h rename to src/ObjCompiling/Techset/StateMap/StateMapFromTechniqueExtractor.h diff --git a/src/ObjLoading/StateMap/StateMapHandler.cpp b/src/ObjCompiling/Techset/StateMap/StateMapHandler.cpp similarity index 100% rename from src/ObjLoading/StateMap/StateMapHandler.cpp rename to src/ObjCompiling/Techset/StateMap/StateMapHandler.cpp diff --git a/src/ObjLoading/StateMap/StateMapHandler.h b/src/ObjCompiling/Techset/StateMap/StateMapHandler.h similarity index 81% rename from src/ObjLoading/StateMap/StateMapHandler.h rename to src/ObjCompiling/Techset/StateMap/StateMapHandler.h index 6c421376..1dec3b06 100644 --- a/src/ObjLoading/StateMap/StateMapHandler.h +++ b/src/ObjCompiling/Techset/StateMap/StateMapHandler.h @@ -1,8 +1,7 @@ #pragma once -#include "StateMap/StateMapDefinition.h" -#include "StateMap/StateMapLayout.h" -#include "Utils/ClassUtils.h" +#include "Techset/StateMap/StateMapDefinition.h" +#include "Techset/StateMap/StateMapLayout.h" #include #include @@ -13,7 +12,7 @@ namespace state_map { public: void AddValue(std::string key, std::string value); - _NODISCARD SimpleExpressionValue ValueByName(const std::string& name) const override; + [[nodiscard]] SimpleExpressionValue ValueByName(const std::string& name) const override; private: std::unordered_map m_vars; diff --git a/src/ObjLoading/StateMap/StateMapReader.cpp b/src/ObjCompiling/Techset/StateMap/StateMapReader.cpp similarity index 100% rename from src/ObjLoading/StateMap/StateMapReader.cpp rename to src/ObjCompiling/Techset/StateMap/StateMapReader.cpp diff --git a/src/ObjLoading/StateMap/StateMapReader.h b/src/ObjCompiling/Techset/StateMap/StateMapReader.h similarity index 94% rename from src/ObjLoading/StateMap/StateMapReader.h rename to src/ObjCompiling/Techset/StateMap/StateMapReader.h index 5e52b3da..f3c53161 100644 --- a/src/ObjLoading/StateMap/StateMapReader.h +++ b/src/ObjCompiling/Techset/StateMap/StateMapReader.h @@ -2,8 +2,8 @@ #include "Parsing/IParserLineStream.h" #include "Parsing/StateMapParserState.h" -#include "StateMap/StateMapLayout.h" #include "StateMapDefinition.h" +#include "Techset/StateMap/StateMapLayout.h" #include "Utils/ClassUtils.h" #include diff --git a/src/ObjLoading/Techset/TechniqueDefinitionAcceptor.cpp b/src/ObjCompiling/Techset/TechniqueDefinitionAcceptor.cpp similarity index 100% rename from src/ObjLoading/Techset/TechniqueDefinitionAcceptor.cpp rename to src/ObjCompiling/Techset/TechniqueDefinitionAcceptor.cpp diff --git a/src/ObjLoading/Techset/TechniqueDefinitionAcceptor.h b/src/ObjCompiling/Techset/TechniqueDefinitionAcceptor.h similarity index 100% rename from src/ObjLoading/Techset/TechniqueDefinitionAcceptor.h rename to src/ObjCompiling/Techset/TechniqueDefinitionAcceptor.h diff --git a/src/ObjLoading/Techset/TechniqueFileReader.cpp b/src/ObjCompiling/Techset/TechniqueFileReader.cpp similarity index 96% rename from src/ObjLoading/Techset/TechniqueFileReader.cpp rename to src/ObjCompiling/Techset/TechniqueFileReader.cpp index 71a40fbf..884b9b32 100644 --- a/src/ObjLoading/Techset/TechniqueFileReader.cpp +++ b/src/ObjCompiling/Techset/TechniqueFileReader.cpp @@ -3,7 +3,7 @@ #include "Parsing/Impl/CommentRemovingStreamProxy.h" #include "Parsing/Impl/ParserSingleInputStream.h" #include "Parsing/Simple/SimpleLexer.h" -#include "Parsing/TechniqueFileParser.h" +#include "Techset/Parsing/TechniqueFileParser.h" #include "Utils/Logging/Log.h" #include diff --git a/src/ObjLoading/Techset/TechniqueFileReader.h b/src/ObjCompiling/Techset/TechniqueFileReader.h similarity index 95% rename from src/ObjLoading/Techset/TechniqueFileReader.h rename to src/ObjCompiling/Techset/TechniqueFileReader.h index 2090304b..9f72828e 100644 --- a/src/ObjLoading/Techset/TechniqueFileReader.h +++ b/src/ObjCompiling/Techset/TechniqueFileReader.h @@ -2,7 +2,6 @@ #include "Parsing/IParserLineStream.h" #include "TechniqueDefinitionAcceptor.h" -#include "Utils/ClassUtils.h" #include #include diff --git a/src/ObjLoading/Techset/TechniqueStateMapCache.cpp b/src/ObjCompiling/Techset/TechniqueStateMapCache.cpp similarity index 100% rename from src/ObjLoading/Techset/TechniqueStateMapCache.cpp rename to src/ObjCompiling/Techset/TechniqueStateMapCache.cpp diff --git a/src/ObjLoading/Techset/TechniqueStateMapCache.h b/src/ObjCompiling/Techset/TechniqueStateMapCache.h similarity index 100% rename from src/ObjLoading/Techset/TechniqueStateMapCache.h rename to src/ObjCompiling/Techset/TechniqueStateMapCache.h