zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-03-07 05:23:02 +00:00
Code Activity

Merge pull request #701 from Laupetin/refactor/remove-class-utils

Browse Source 
refactor: remove old c++ version class utils macros
This commit is contained in:
Jan
2026-03-06 18:00:38 +01:00
committed by GitHub
parent 96766f8500 90d7f92ddd
commit 8e3327dd40
105 changed files with 244 additions and 429 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Linking/Linker.cpp
View File

@@ -7,7 +7,6 @@
#include "SearchPath/OutputPathFilesystem.h" #include "SearchPath/OutputPathFilesystem.h"
#include "SearchPath/SearchPaths.h" #include "SearchPath/SearchPaths.h"
#include "Utils/Logging/Log.h" #include "Utils/Logging/Log.h"
#include "Utils/ObjFileStream.h"
#include "Zone/AssetList/AssetList.h" #include "Zone/AssetList/AssetList.h"
#include "Zone/AssetList/AssetListReader.h" #include "Zone/AssetList/AssetListReader.h"
#include "Zone/Definition/ZoneDefinitionStream.h" #include "Zone/Definition/ZoneDefinitionStream.h"

10
src/ObjCommon/InfoString/InfoString.h
View File

@@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Obj/Gdt/GdtEntry.h" #include "Obj/Gdt/GdtEntry.h"
#include "Utils/ClassUtils.h"
#include <istream> #include <istream>
#include <string> #include <string>
@@ -16,14 +16,14 @@ class InfoString
std::vector<std::string> m_keys_by_insertion; std::vector<std::string> m_keys_by_insertion;
public: public:
_NODISCARD bool HasKey(const std::string& key) const; [[nodiscard]] bool HasKey(const std::string& key) const;
_NODISCARD const std::string& GetValueForKey(const std::string& key) const; [[nodiscard]] const std::string& GetValueForKey(const std::string& key) const;
const std::string& GetValueForKey(const std::string& key, bool* foundValue) const; const std::string& GetValueForKey(const std::string& key, bool* foundValue) const;
void SetValueForKey(const std::string& key, std::string value); void SetValueForKey(const std::string& key, std::string value);
void RemoveKey(const std::string& key); void RemoveKey(const std::string& key);
_NODISCARD std::string ToString() const; [[nodiscard]] std::string ToString() const;
_NODISCARD std::string ToString(const std::string& prefix) const; [[nodiscard]] std::string ToString(const std::string& prefix) const;
void ToGdtProperties(const std::string& prefix, GdtEntry& gdtEntry) const; void ToGdtProperties(const std::string& prefix, GdtEntry& gdtEntry) const;
bool FromStream(std::istream& stream); bool FromStream(std::istream& stream);

1
src/ObjCommon/SearchPath/ISearchPath.h
View File

@@ -1,7 +1,6 @@
#pragma once #pragma once
#include "SearchPathSearchOptions.h" #include "SearchPathSearchOptions.h"
#include "Utils/ClassUtils.h"
#include <cstdint> #include <cstdint>
#include <functional> #include <functional>

1
src/ObjCommon/SearchPath/SearchPathFilesystem.cpp
View File

@@ -1,7 +1,6 @@
#include "SearchPathFilesystem.h" #include "SearchPathFilesystem.h"
#include "Utils/Logging/Log.h" #include "Utils/Logging/Log.h"
#include "Utils/ObjFileStream.h"
#include <algorithm> #include <algorithm>
#include <filesystem> #include <filesystem>

3
src/ObjCommon/Sound/FlacDecoder.cpp
View File

@@ -1,7 +1,6 @@
#include "FlacDecoder.h" #include "FlacDecoder.h"
#include "Utils/Alignment.h" #include "Utils/Alignment.h"
#include "Utils/ClassUtils.h"
#include "Utils/Endianness.h" #include "Utils/Endianness.h"
#include "Utils/FileUtils.h" #include "Utils/FileUtils.h"
#include "Utils/Logging/Log.h" #include "Utils/Logging/Log.h"
@@ -42,7 +41,7 @@ namespace
{ {
} }
_NODISCARD char const* what() const noexcept override [[nodiscard]] char const* what() const noexcept override
{ {
return m_message.c_str(); return m_message.c_str();
} }

3
src/ObjCommon/StructuredDataDef/CommonStructuredDataDef.h
View File

@@ -2,7 +2,6 @@
#include "CommonStructuredDataEnum.h" #include "CommonStructuredDataEnum.h"
#include "CommonStructuredDataStruct.h" #include "CommonStructuredDataStruct.h"
#include "Utils/ClassUtils.h"
#include <memory> #include <memory>
#include <vector> #include <vector>
@@ -23,5 +22,5 @@ public:
CommonStructuredDataDef(); CommonStructuredDataDef();
explicit CommonStructuredDataDef(int version); explicit CommonStructuredDataDef(int version);
_NODISCARD uint32_t CalculateChecksum() const; [[nodiscard]] uint32_t CalculateChecksum() const;
}; };

5
src/ObjCommon/StructuredDataDef/CommonStructuredDataEnum.h
View File

@@ -1,5 +1,4 @@
#pragma once #pragma once
#include "Utils/ClassUtils.h"
#include <cstddef> #include <cstddef>
#include <cstdint> #include <cstdint>
@@ -25,8 +24,8 @@ struct CommonStructuredDataEnum
explicit CommonStructuredDataEnum(std::string name); explicit CommonStructuredDataEnum(std::string name);
CommonStructuredDataEnum(std::string name, int reservedEntryCount); CommonStructuredDataEnum(std::string name, int reservedEntryCount);
_NODISCARD size_t ElementCount() const; [[nodiscard]] size_t ElementCount() const;
_NODISCARD uint32_t CalculateChecksum(uint32_t initialValue) const; [[nodiscard]] uint32_t CalculateChecksum(uint32_t initialValue) const;
void SortEntriesByOffset(); void SortEntriesByOffset();
void SortEntriesByName(); void SortEntriesByName();

6
src/ObjCommon/StructuredDataDef/CommonStructuredDataTypes.h
View File

@@ -1,7 +1,5 @@
#pragma once #pragma once
#include "Utils/ClassUtils.h"
#include <cstddef> #include <cstddef>
enum class CommonStructuredDataTypeCategory enum class CommonStructuredDataTypeCategory
@@ -36,8 +34,8 @@ struct CommonStructuredDataType
explicit CommonStructuredDataType(CommonStructuredDataTypeCategory category); explicit CommonStructuredDataType(CommonStructuredDataTypeCategory category);
CommonStructuredDataType(CommonStructuredDataTypeCategory category, size_t extraInfo); CommonStructuredDataType(CommonStructuredDataTypeCategory category, size_t extraInfo);
_NODISCARD size_t GetAlignmentInBits() const; [[nodiscard]] size_t GetAlignmentInBits() const;
_NODISCARD size_t GetSizeInBits(const CommonStructuredDataDef& def) const; [[nodiscard]] size_t GetSizeInBits(const CommonStructuredDataDef& def) const;
friend bool operator<(const CommonStructuredDataType& lhs, const CommonStructuredDataType& rhs); friend bool operator<(const CommonStructuredDataType& lhs, const CommonStructuredDataType& rhs);
friend bool operator<=(const CommonStructuredDataType& lhs, const CommonStructuredDataType& rhs); friend bool operator<=(const CommonStructuredDataType& lhs, const CommonStructuredDataType& rhs);

14
src/ObjCommon/Utils/DistinctMapper.h
View File

@@ -1,7 +1,5 @@
#pragma once #pragma once
#include "Utils/ClassUtils.h"
#include <cstddef> #include <cstddef>
#include <map> #include <map>
#include <vector> #include <vector>
@@ -41,7 +39,7 @@ public:
return false; return false;
} }
_NODISCARD size_t GetDistinctPositionByInputPosition(const size_t inputPosition) const [[nodiscard]] size_t GetDistinctPositionByInputPosition(const size_t inputPosition) const
{ {
if (inputPosition >= m_distinct_position_by_input_position.size()) if (inputPosition >= m_distinct_position_by_input_position.size())
return 0; return 0;
@@ -49,7 +47,7 @@ public:
return m_distinct_position_by_input_position[inputPosition]; return m_distinct_position_by_input_position[inputPosition];
} }
_NODISCARD T GetDistinctValueByInputPosition(const size_t inputPosition) const [[nodiscard]] T GetDistinctValueByInputPosition(const size_t inputPosition) const
{ {
if (inputPosition >= m_distinct_values.size()) if (inputPosition >= m_distinct_values.size())
return T{}; return T{};
@@ -57,7 +55,7 @@ public:
return m_distinct_values[inputPosition]; return m_distinct_values[inputPosition];
} }
_NODISCARD size_t GetInputPositionByDistinctPosition(const size_t distinctPosition) const [[nodiscard]] size_t GetInputPositionByDistinctPosition(const size_t distinctPosition) const
{ {
if (distinctPosition >= m_input_position_by_distinct_position.size()) if (distinctPosition >= m_input_position_by_distinct_position.size())
return 0; return 0;
@@ -65,17 +63,17 @@ public:
return m_input_position_by_distinct_position[distinctPosition]; return m_input_position_by_distinct_position[distinctPosition];
} }
_NODISCARD const std::vector<T>& GetDistinctValues() const [[nodiscard]] const std::vector<T>& GetDistinctValues() const
{ {
return m_distinct_values; return m_distinct_values;
} }
_NODISCARD size_t GetInputValueCount() const [[nodiscard]] size_t GetInputValueCount() const
{ {
return m_input_entry_index; return m_input_entry_index;
} }
_NODISCARD size_t GetDistinctValueCount() const [[nodiscard]] size_t GetDistinctValueCount() const
{ {
return m_distinct_entry_index; return m_distinct_entry_index;
} }

103
src/ObjCommon/Utils/ObjFileStream.h
View File

@@ -1,103 +0,0 @@
// ReSharper disable CppHidingFunction
// ReSharper disable IdentifierTypo
// ReSharper disable CppInconsistentNaming
#pragma once
// #include <fstream>
//
// #include "ObjStream.h"
//
// template <class Elem, class Traits>
// class basic_fobjbuf final : public basic_objbuf<Elem, Traits>, public std::basic_filebuf<Elem, Traits>
// {
// public:
// using myfb = std::basic_filebuf<Elem, Traits>;
//
// explicit basic_fobjbuf(myfb* fb)
// {
// m_fb.swap(*fb);
// }
//
// _NODISCARD bool is_open() const override
// {
// return m_fb.is_open();
// }
//
// bool close() override
// {
// return m_fb.close();
// }
//
// private:
// myfb m_fb;
// };
//
// template <class Elem, class Traits>
// class basic_fobjstream final : public basic_objstream<Elem, Traits>
// {
// public:
// using mybase = basic_objstream<Elem, Traits>;
// using myfb = basic_fobjbuf<Elem, Traits>;
//
// using mybase::m_ob;
//
// explicit basic_fobjstream(std::fstream&& stream)
// : mybase(std::make_unique<myfb>(std::move(*stream.rdbuf())))
// {
// // reinterpret_cast<myfb*>(m_ob.get())->swapp(*stream.rdbuf());
// // reinterpret_cast<myfb*>(m_ob.get())->swap(*stream.rdbuf());
// }
//
// basic_fobjstream(const basic_fobjstream& other) = delete;
// basic_fobjstream(basic_fobjstream&& other) noexcept = default;
// basic_fobjstream& operator=(const basic_fobjstream& other) = delete;
// basic_fobjstream& operator=(basic_fobjstream&& other) noexcept = default;
// };
//
// template <class Elem, class Traits>
// class basic_ifobjstream final : public basic_iobjstream<Elem, Traits>
// {
// public:
// using mybase = basic_iobjstream<Elem, Traits>;
// using myfb = basic_fobjbuf<Elem, Traits>;
//
// using mybase::m_ob;
//
// explicit basic_ifobjstream(std::ifstream&& stream)
// : mybase(std::make_unique<myfb>(std::move(*stream.rdbuf())))
// {
// // reinterpret_cast<myfb*>(m_ob.get())->swapp(*stream.rdbuf());
// // m_ob->swapp(*stream.rdbuf());
// }
// ~basic_ifobjstream() = default;
//
// basic_ifobjstream(const basic_ifobjstream& other) = delete;
// basic_ifobjstream(basic_ifobjstream&& other) noexcept = default;
// basic_ifobjstream& operator=(const basic_ifobjstream& other) = delete;
// basic_ifobjstream& operator=(basic_ifobjstream&& other) noexcept = default;
// };
//
// template <class Elem, class Traits>
// class basic_ofobjstream final : public basic_oobjstream<Elem, Traits>
// {
// public:
// using mybase = basic_oobjstream<Elem, Traits>;
// using myfb = basic_fobjbuf<Elem, Traits>;
//
// using mybase::m_ob;
//
// explicit basic_ofobjstream(std::ofstream file)
// : mybase(std::make_unique<myfb>(file.rdbuf()))
// {
// }
//
// basic_ofobjstream(const basic_ofobjstream& other) = delete;
// basic_ofobjstream(basic_ofobjstream&& other) noexcept = default;
// basic_ofobjstream& operator=(const basic_ofobjstream& other) = delete;
// basic_ofobjstream& operator=(basic_ofobjstream&& other) noexcept = default;
// };
//
// using fobjbuf = basic_fobjbuf<char, std::char_traits<char>>;
// using fobjstream = basic_fobjstream<char, std::char_traits<char>>;
// using ifobjstream = basic_ifobjstream<char, std::char_traits<char>>;
// using ofobjstream = basic_ofobjstream<char, std::char_traits<char>>;

16
src/ObjCommon/Utils/ObjStream.h
View File

@@ -2,8 +2,6 @@
// ReSharper disable IdentifierTypo // ReSharper disable IdentifierTypo
#pragma once #pragma once
#include "Utils/ClassUtils.h"
#include <cassert> #include <cassert>
#include <iostream> #include <iostream>
#include <memory> #include <memory>
@@ -12,7 +10,7 @@
template<class Elem, class Traits> class basic_objbuf : public std::basic_streambuf<Elem, Traits> template<class Elem, class Traits> class basic_objbuf : public std::basic_streambuf<Elem, Traits>
{ {
public: public:
_NODISCARD virtual bool is_open() const = 0; [[nodiscard]] virtual bool is_open() const = 0;
virtual bool close() = 0; virtual bool close() = 0;
}; };
@@ -62,12 +60,12 @@ public:
} }
// ReSharper disable once CppHidingFunction // ReSharper disable once CppHidingFunction
_NODISCARD myob* rdbuf() const [[nodiscard]] myob* rdbuf() const
{ {
return const_cast<myob*>(m_ob.get()); return const_cast<myob*>(m_ob.get());
} }
_NODISCARD bool is_open() const [[nodiscard]] bool is_open() const
{ {
return m_ob->is_open(); return m_ob->is_open();
} }
@@ -126,12 +124,12 @@ public:
} }
// ReSharper disable once CppHidingFunction // ReSharper disable once CppHidingFunction
_NODISCARD myob* rdbuf() const [[nodiscard]] myob* rdbuf() const
{ {
return const_cast<myob*>(m_ob.get()); return const_cast<myob*>(m_ob.get());
} }
_NODISCARD bool is_open() const [[nodiscard]] bool is_open() const
{ {
return m_ob->is_open(); return m_ob->is_open();
} }
@@ -190,12 +188,12 @@ public:
} }
// ReSharper disable once CppHidingFunction // ReSharper disable once CppHidingFunction
_NODISCARD myob* rdbuf() const [[nodiscard]] myob* rdbuf() const
{ {
return const_cast<myob*>(m_ob.get()); return const_cast<myob*>(m_ob.get());
} }
_NODISCARD bool is_open() const [[nodiscard]] bool is_open() const
{ {
return m_ob->is_open(); return m_ob->is_open();
} }

2
src/ObjCompiling/Game/IW4/Techset/CompilerTechsetIW4.cpp
View File

@@ -1041,7 +1041,7 @@ namespace
{ {
} }
_NODISCARD const LoadedTechnique* LoadMaterialTechnique(const std::string& techniqueName) const [[nodiscard]] const LoadedTechnique* LoadMaterialTechnique(const std::string& techniqueName) const
{ {
auto* technique = m_zone_state.FindLoadedTechnique(techniqueName); auto* technique = m_zone_state.FindLoadedTechnique(techniqueName);
if (technique) if (technique)

3
src/ObjLoading/Game/IW4/Menu/MenuConverterIW4.cpp
View File

@@ -11,7 +11,6 @@
#include "Parsing/Simple/Expression/SimpleExpressionBinaryOperation.h" #include "Parsing/Simple/Expression/SimpleExpressionBinaryOperation.h"
#include "Parsing/Simple/Expression/SimpleExpressionConditionalOperator.h" #include "Parsing/Simple/Expression/SimpleExpressionConditionalOperator.h"
#include "Parsing/Simple/Expression/SimpleExpressionUnaryOperation.h" #include "Parsing/Simple/Expression/SimpleExpressionUnaryOperation.h"
#include "Utils/ClassUtils.h"
#include "Utils/StringUtils.h" #include "Utils/StringUtils.h"
#include <cassert> #include <cassert>
@@ -409,7 +408,7 @@ namespace
} }
} }
_NODISCARD Statement_s* ConvertExpression(const ISimpleExpression* expression, const CommonMenuDef* menu, const CommonItemDef* item = nullptr) const [[nodiscard]] Statement_s* ConvertExpression(const ISimpleExpression* expression, const CommonMenuDef* menu, const CommonItemDef* item = nullptr) const
{ {
if (!expression) if (!expression)
return nullptr; return nullptr;

4
src/ObjLoading/Game/IW4/Weapon/InfoStringLoaderWeaponIW4.cpp
View File

@@ -59,7 +59,7 @@ namespace
return true; return true;
} }
_NODISCARD bool ConvertBounceSounds(const cspField_t& field, const std::string& value) const [[nodiscard]] bool ConvertBounceSounds(const cspField_t& field, const std::string& value) const
{ {
auto** bounceSound = reinterpret_cast<SndAliasCustom**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset); auto** bounceSound = reinterpret_cast<SndAliasCustom**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset);
if (value.empty()) if (value.empty())
@@ -81,7 +81,7 @@ namespace
return true; return true;
} }
_NODISCARD bool ConvertNotetrackMap(const cspField_t& field, const std::string& value, const char* mapName, const size_t keyAndValueCount) [[nodiscard]] bool ConvertNotetrackMap(const cspField_t& field, const std::string& value, const char* mapName, const size_t keyAndValueCount)
{ {
std::vector<std::array<std::string, 2>> pairs; std::vector<std::array<std::string, 2>> pairs;
if (!ParseAsArray(value, pairs)) if (!ParseAsArray(value, pairs))

7
src/ObjLoading/Game/IW5/Menu/MenuConverterIW5.cpp
View File

@@ -11,7 +11,6 @@
#include "Parsing/Simple/Expression/SimpleExpressionBinaryOperation.h" #include "Parsing/Simple/Expression/SimpleExpressionBinaryOperation.h"
#include "Parsing/Simple/Expression/SimpleExpressionConditionalOperator.h" #include "Parsing/Simple/Expression/SimpleExpressionConditionalOperator.h"
#include "Parsing/Simple/Expression/SimpleExpressionUnaryOperation.h" #include "Parsing/Simple/Expression/SimpleExpressionUnaryOperation.h"
#include "Utils/ClassUtils.h"
#include "Utils/StringUtils.h" #include "Utils/StringUtils.h"
#include <cassert> #include <cassert>
@@ -26,7 +25,7 @@ namespace
{ {
class MenuConverter final : public AbstractMenuConverter, public IMenuConverter class MenuConverter final : public AbstractMenuConverter, public IMenuConverter
{ {
_NODISCARD static rectDef_s ConvertRectDef(const CommonRect& rect) [[nodiscard]] static rectDef_s ConvertRectDef(const CommonRect& rect)
{ {
return rectDef_s{ return rectDef_s{
static_cast<float>(rect.x), static_cast<float>(rect.x),
@@ -38,7 +37,7 @@ namespace
}; };
} }
_NODISCARD static rectDef_s ConvertRectDefRelativeTo(const CommonRect& rect, const CommonRect& rectRelativeTo) [[nodiscard]] static rectDef_s ConvertRectDefRelativeTo(const CommonRect& rect, const CommonRect& rectRelativeTo)
{ {
return rectDef_s{ return rectDef_s{
static_cast<float>(rectRelativeTo.x + rect.x), static_cast<float>(rectRelativeTo.x + rect.x),
@@ -409,7 +408,7 @@ namespace
} }
} }
_NODISCARD Statement_s* ConvertExpression(const ISimpleExpression* expression, const CommonMenuDef* menu, const CommonItemDef* item = nullptr) const [[nodiscard]] Statement_s* ConvertExpression(const ISimpleExpression* expression, const CommonMenuDef* menu, const CommonItemDef* item = nullptr) const
{ {
if (!expression) if (!expression)
return nullptr; return nullptr;

12
src/ObjLoading/Game/T6/Weapon/WeaponInfoStringLoaderT6.cpp
View File

@@ -160,7 +160,7 @@ namespace
return true; return true;
} }
_NODISCARD bool ConvertBounceSounds(const cspField_t& field, const std::string& value) const [[nodiscard]] bool ConvertBounceSounds(const cspField_t& field, const std::string& value) const
{ {
auto*** bounceSound = reinterpret_cast<const char***>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset); auto*** bounceSound = reinterpret_cast<const char***>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset);
if (value.empty()) if (value.empty())
@@ -179,7 +179,7 @@ namespace
return true; return true;
} }
_NODISCARD bool ConvertNotetrackSoundMap(const cspField_t& field, const std::string& value) [[nodiscard]] bool ConvertNotetrackSoundMap(const cspField_t& field, const std::string& value)
{ {
std::vector<std::array<std::string, 2>> pairs; std::vector<std::array<std::string, 2>> pairs;
if (!ParseAsArray(value, pairs)) if (!ParseAsArray(value, pairs))
@@ -228,7 +228,7 @@ namespace
return true; return true;
} }
_NODISCARD bool ConvertWeaponCamo(const cspField_t& field, const std::string& value) [[nodiscard]] bool ConvertWeaponCamo(const cspField_t& field, const std::string& value)
{ {
if (value.empty()) if (value.empty())
{ {
@@ -250,7 +250,7 @@ namespace
return true; return true;
} }
_NODISCARD bool ConvertAttachments(const cspField_t& field, const std::string& value) [[nodiscard]] bool ConvertAttachments(const cspField_t& field, const std::string& value)
{ {
std::vector<std::string> valueArray; std::vector<std::string> valueArray;
if (!ParseAsArray(value, valueArray)) if (!ParseAsArray(value, valueArray))
@@ -295,13 +295,13 @@ namespace
return true; return true;
} }
_NODISCARD static bool HasMoreThanOneAttachmentSetInMask(const int mask) [[nodiscard]] static bool HasMoreThanOneAttachmentSetInMask(const int mask)
{ {
// Check if int has more than 1 bit set // Check if int has more than 1 bit set
return (mask & (mask - 1)) != 0; return (mask & (mask - 1)) != 0;
} }
_NODISCARD bool ConvertAttachmentUniques(const cspField_t& field, const std::string& value) [[nodiscard]] bool ConvertAttachmentUniques(const cspField_t& field, const std::string& value)
{ {
std::vector<std::string> valueArray; std::vector<std::string> valueArray;
if (!ParseAsArray(value, valueArray)) if (!ParseAsArray(value, valueArray))

17
src/ObjLoading/Gdt/AbstractGdtEntryReader.h
View File

@@ -1,7 +1,6 @@
#pragma once #pragma once
#include "Obj/Gdt/GdtEntry.h" #include "Obj/Gdt/GdtEntry.h"
#include "Utils/ClassUtils.h"
#include <exception> #include <exception>
@@ -9,7 +8,7 @@ class GdtReadingException : public std::exception
{ {
public: public:
explicit GdtReadingException(std::string message); explicit GdtReadingException(std::string message);
_NODISCARD const char* what() const noexcept override; [[nodiscard]] const char* what() const noexcept override;
private: private:
std::string m_message; std::string m_message;
@@ -41,13 +40,13 @@ class AbstractGdtEntryReader
protected: protected:
explicit AbstractGdtEntryReader(const GdtEntry& entry); explicit AbstractGdtEntryReader(const GdtEntry& entry);
_NODISCARD std::string ReadStringProperty(const std::string& propertyName, std::string defaultValue = std::string()) const; [[nodiscard]] std::string ReadStringProperty(const std::string& propertyName, std::string defaultValue = std::string()) const;
_NODISCARD bool ReadBoolProperty(const std::string& propertyName, bool defaultValue = false) const; [[nodiscard]] bool ReadBoolProperty(const std::string& propertyName, bool defaultValue = false) const;
_NODISCARD int ReadIntegerProperty(const std::string& propertyName, int defaultValue = 0) const; [[nodiscard]] int ReadIntegerProperty(const std::string& propertyName, int defaultValue = 0) const;
_NODISCARD float ReadFloatProperty(const std::string& propertyName, float defaultValue = 0.0f) const; [[nodiscard]] float ReadFloatProperty(const std::string& propertyName, float defaultValue = 0.0f) const;
_NODISCARD GdtVec2 ReadVec2Property(const std::string& propertyName, GdtVec2 defaultValue = {}) const; [[nodiscard]] GdtVec2 ReadVec2Property(const std::string& propertyName, GdtVec2 defaultValue = {}) const;
_NODISCARD GdtVec3 ReadVec3Property(const std::string& propertyName, GdtVec3 defaultValue = {}) const; [[nodiscard]] GdtVec3 ReadVec3Property(const std::string& propertyName, GdtVec3 defaultValue = {}) const;
_NODISCARD GdtVec4 ReadVec4Property(const std::string& propertyName, GdtVec4 defaultValue = {}) const; [[nodiscard]] GdtVec4 ReadVec4Property(const std::string& propertyName, GdtVec4 defaultValue = {}) const;
const GdtEntry& m_entry; const GdtEntry& m_entry;
}; };

1
src/ObjLoading/InfoString/InfoStringToStructConverterBase.h
View File

@@ -4,7 +4,6 @@
#include "Asset/AssetRegistration.h" #include "Asset/AssetRegistration.h"
#include "InfoString/InfoString.h" #include "InfoString/InfoString.h"
#include "Pool/XAssetInfo.h" #include "Pool/XAssetInfo.h"
#include "Utils/ClassUtils.h"
#include "Utils/Logging/Log.h" #include "Utils/Logging/Log.h"
#include "Utils/MemoryManager.h" #include "Utils/MemoryManager.h"
#include "Zone/ZoneScriptStrings.h" #include "Zone/ZoneScriptStrings.h"

3
src/ObjLoading/Menu/AbstractMenuConverter.h
View File

@@ -3,7 +3,6 @@
#include "Asset/AssetCreationContext.h" #include "Asset/AssetCreationContext.h"
#include "MenuConversionException.h" #include "MenuConversionException.h"
#include "SearchPath/ISearchPath.h" #include "SearchPath/ISearchPath.h"
#include "Utils/ClassUtils.h"
#include "Utils/MemoryManager.h" #include "Utils/MemoryManager.h"
namespace menu namespace menu
@@ -13,7 +12,7 @@ namespace menu
protected: protected:
AbstractMenuConverter(bool disableOptimizations, ISearchPath& searchPath, MemoryManager& memory, AssetCreationContext& context); AbstractMenuConverter(bool disableOptimizations, ISearchPath& searchPath, MemoryManager& memory, AssetCreationContext& context);
_NODISCARD const char* ConvertString(const std::string& str) const; [[nodiscard]] const char* ConvertString(const std::string& str) const;
static void PrintConversionExceptionDetails(const MenuConversionException& e); static void PrintConversionExceptionDetails(const MenuConversionException& e);
bool m_disable_optimizations; bool m_disable_optimizations;

2
src/ObjLoading/ObjContainer/IPak/IPakEntryReadStream.h
View File

@@ -99,7 +99,7 @@ public:
IPakEntryReadStream(std::istream& stream, IPakStreamManagerActions* streamManagerActions, uint8_t* chunkBuffer, int64_t startOffset, size_t entrySize); IPakEntryReadStream(std::istream& stream, IPakStreamManagerActions* streamManagerActions, uint8_t* chunkBuffer, int64_t startOffset, size_t entrySize);
~IPakEntryReadStream() override; ~IPakEntryReadStream() override;
_NODISCARD bool is_open() const override; [[nodiscard]] bool is_open() const override;
bool close() override; bool close() override;
protected: protected:

3
src/ObjLoading/ObjContainer/IPak/IPakStreamManager.h
View File

@@ -1,6 +1,5 @@
#pragma once #pragma once
#include "Utils/ClassUtils.h"
#include "Utils/ObjStream.h" #include "Utils/ObjStream.h"
#include <cstdint> #include <cstdint>
@@ -30,5 +29,5 @@ public:
IPakStreamManager& operator=(const IPakStreamManager& other) = delete; IPakStreamManager& operator=(const IPakStreamManager& other) = delete;
IPakStreamManager& operator=(IPakStreamManager&& other) noexcept = delete; IPakStreamManager& operator=(IPakStreamManager&& other) noexcept = delete;
_NODISCARD std::unique_ptr<iobjstream> OpenStream(int64_t startPosition, size_t length) const; [[nodiscard]] std::unique_ptr<iobjstream> OpenStream(int64_t startPosition, size_t length) const;
}; };

9
src/ObjLoading/ObjContainer/SoundBank/SoundBank.h
View File

@@ -4,7 +4,6 @@
#include "ObjContainer/ObjContainerRepository.h" #include "ObjContainer/ObjContainerRepository.h"
#include "ObjContainer/SoundBank/SoundBankTypes.h" #include "ObjContainer/SoundBank/SoundBankTypes.h"
#include "SearchPath/ISearchPath.h" #include "SearchPath/ISearchPath.h"
#include "Utils/ClassUtils.h"
#include "Utils/FileUtils.h" #include "Utils/FileUtils.h"
#include "Utils/ObjStream.h" #include "Utils/ObjStream.h"
#include "Zone/Zone.h" #include "Zone/Zone.h"
@@ -20,7 +19,7 @@ public:
SoundBankEntryInputStream(); SoundBankEntryInputStream();
SoundBankEntryInputStream(std::unique_ptr<std::istream> stream, SoundAssetBankEntry entry); SoundBankEntryInputStream(std::unique_ptr<std::istream> stream, SoundAssetBankEntry entry);
_NODISCARD bool IsOpen() const; [[nodiscard]] bool IsOpen() const;
}; };
class SoundBank final : public ObjContainerReferenceable class SoundBank final : public ObjContainerReferenceable
@@ -58,8 +57,8 @@ public:
std::string GetName() override; std::string GetName() override;
bool Initialize(); bool Initialize();
_NODISCARD const std::vector<std::string>& GetDependencies() const; [[nodiscard]] const std::vector<std::string>& GetDependencies() const;
_NODISCARD bool VerifyChecksum(const SoundAssetBankChecksum& checksum) const; [[nodiscard]] bool VerifyChecksum(const SoundAssetBankChecksum& checksum) const;
_NODISCARD SoundBankEntryInputStream GetEntryStream(unsigned int id) const; [[nodiscard]] SoundBankEntryInputStream GetEntryStream(unsigned int id) const;
}; };

4
src/ObjLoading/Parsing/Graph2D/Graph2DReader.cpp
View File

@@ -170,12 +170,12 @@ namespace graph2d
} }
public: public:
_NODISCARD GenericGraph2D& GetResult() const [[nodiscard]] GenericGraph2D& GetResult() const
{ {
return m_state->m_result; return m_state->m_result;
} }
_NODISCARD bool HasExpectedKnotCount() const [[nodiscard]] bool HasExpectedKnotCount() const
{ {
return GetExpectedKnotCount() == GetActualKnotCount(); return GetExpectedKnotCount() == GetActualKnotCount();
} }

2
src/ObjLoading/Parsing/Menu/Domain/EventHandler/CommonEventHandlerCondition.h
View File

@@ -20,6 +20,6 @@ namespace menu
std::unique_ptr<CommonEventHandlerSet> conditionElements, std::unique_ptr<CommonEventHandlerSet> conditionElements,
std::unique_ptr<CommonEventHandlerSet> elseElements); std::unique_ptr<CommonEventHandlerSet> elseElements);
_NODISCARD CommonEventHandlerElementType GetType() const override; [[nodiscard]] CommonEventHandlerElementType GetType() const override;
}; };
} // namespace menu } // namespace menu

2
src/ObjLoading/Parsing/Menu/Domain/EventHandler/CommonEventHandlerScript.h
View File

@@ -14,6 +14,6 @@ namespace menu
CommonEventHandlerScript(); CommonEventHandlerScript();
explicit CommonEventHandlerScript(std::string script); explicit CommonEventHandlerScript(std::string script);
_NODISCARD CommonEventHandlerElementType GetType() const override; [[nodiscard]] CommonEventHandlerElementType GetType() const override;
}; };
} // namespace menu } // namespace menu

3
src/ObjLoading/Parsing/Menu/Domain/EventHandler/CommonEventHandlerSetLocalVar.h
View File

@@ -1,4 +1,5 @@
#pragma once #pragma once
#include "ICommonEventHandlerElement.h" #include "ICommonEventHandlerElement.h"
#include "Parsing/Simple/Expression/ISimpleExpression.h" #include "Parsing/Simple/Expression/ISimpleExpression.h"
@@ -26,6 +27,6 @@ namespace menu
CommonEventHandlerSetLocalVar(); CommonEventHandlerSetLocalVar();
CommonEventHandlerSetLocalVar(SetLocalVarType type, std::string varName, std::unique_ptr<ISimpleExpression> value); CommonEventHandlerSetLocalVar(SetLocalVarType type, std::string varName, std::unique_ptr<ISimpleExpression> value);
_NODISCARD CommonEventHandlerElementType GetType() const override; [[nodiscard]] CommonEventHandlerElementType GetType() const override;
}; };
} // namespace menu } // namespace menu

4
src/ObjLoading/Parsing/Menu/Domain/EventHandler/ICommonEventHandlerElement.h
View File

@@ -1,7 +1,5 @@
#pragma once #pragma once
#include "Utils/ClassUtils.h"
namespace menu namespace menu
{ {
enum class CommonEventHandlerElementType enum class CommonEventHandlerElementType
@@ -23,6 +21,6 @@ namespace menu
ICommonEventHandlerElement& operator=(const ICommonEventHandlerElement& other) = default; ICommonEventHandlerElement& operator=(const ICommonEventHandlerElement& other) = default;
ICommonEventHandlerElement& operator=(ICommonEventHandlerElement&& other) noexcept = default; ICommonEventHandlerElement& operator=(ICommonEventHandlerElement&& other) noexcept = default;
_NODISCARD virtual CommonEventHandlerElementType GetType() const = 0; [[nodiscard]] virtual CommonEventHandlerElementType GetType() const = 0;
}; };
} // namespace menu } // namespace menu

9
src/ObjLoading/Parsing/Menu/Domain/Expression/CommonExpressionBaseFunctionCall.h
View File

@@ -1,4 +1,5 @@
#pragma once #pragma once
#include "Parsing/Simple/Expression/ISimpleExpression.h" #include "Parsing/Simple/Expression/ISimpleExpression.h"
#include <vector> #include <vector>
@@ -14,9 +15,9 @@ namespace menu
CommonExpressionBaseFunctionCall(std::string functionName, size_t functionIndex); CommonExpressionBaseFunctionCall(std::string functionName, size_t functionIndex);
_NODISCARD bool Equals(const ISimpleExpression* other) const override; [[nodiscard]] bool Equals(const ISimpleExpression* other) const override;
_NODISCARD bool IsStatic() const override; [[nodiscard]] bool IsStatic() const override;
_NODISCARD SimpleExpressionValue EvaluateStatic() const override; [[nodiscard]] SimpleExpressionValue EvaluateStatic() const override;
_NODISCARD SimpleExpressionValue EvaluateNonStatic(const ISimpleExpressionScopeValues* scopeValues) const override; [[nodiscard]] SimpleExpressionValue EvaluateNonStatic(const ISimpleExpressionScopeValues* scopeValues) const override;
}; };
} // namespace menu } // namespace menu

8
src/ObjLoading/Parsing/Menu/Domain/Expression/CommonExpressionCustomFunctionCall.h
View File

@@ -11,9 +11,9 @@ namespace menu
explicit CommonExpressionCustomFunctionCall(std::string functionName); explicit CommonExpressionCustomFunctionCall(std::string functionName);
_NODISCARD bool Equals(const ISimpleExpression* other) const override; [[nodiscard]] bool Equals(const ISimpleExpression* other) const override;
_NODISCARD bool IsStatic() const override; [[nodiscard]] bool IsStatic() const override;
_NODISCARD SimpleExpressionValue EvaluateStatic() const override; [[nodiscard]] SimpleExpressionValue EvaluateStatic() const override;
_NODISCARD SimpleExpressionValue EvaluateNonStatic(const ISimpleExpressionScopeValues* scopeValues) const override; [[nodiscard]] SimpleExpressionValue EvaluateNonStatic(const ISimpleExpressionScopeValues* scopeValues) const override;
}; };
} // namespace menu } // namespace menu

26
src/ObjLoading/Parsing/Menu/Matcher/MenuMatcherFactory.h
View File

@@ -23,21 +23,21 @@ namespace menu
public: public:
explicit MenuMatcherFactory(const IMatcherForLabelSupplier<SimpleParserValue>* labelSupplier); explicit MenuMatcherFactory(const IMatcherForLabelSupplier<SimpleParserValue>* labelSupplier);
_NODISCARD MatcherFactoryWrapper<SimpleParserValue> StringChain() const; [[nodiscard]] MatcherFactoryWrapper<SimpleParserValue> StringChain() const;
_NODISCARD MatcherFactoryWrapper<SimpleParserValue> Text() const; [[nodiscard]] MatcherFactoryWrapper<SimpleParserValue> Text() const;
_NODISCARD MatcherFactoryWrapper<SimpleParserValue> TextNoChain() const; [[nodiscard]] MatcherFactoryWrapper<SimpleParserValue> TextNoChain() const;
_NODISCARD MatcherFactoryWrapper<SimpleParserValue> Numeric() const; [[nodiscard]] MatcherFactoryWrapper<SimpleParserValue> Numeric() const;
_NODISCARD MatcherFactoryWrapper<SimpleParserValue> TextExpression() const; [[nodiscard]] MatcherFactoryWrapper<SimpleParserValue> TextExpression() const;
_NODISCARD MatcherFactoryWrapper<SimpleParserValue> IntExpression() const; [[nodiscard]] MatcherFactoryWrapper<SimpleParserValue> IntExpression() const;
_NODISCARD MatcherFactoryWrapper<SimpleParserValue> NumericExpression() const; [[nodiscard]] MatcherFactoryWrapper<SimpleParserValue> NumericExpression() const;
_NODISCARD static int TokenNumericIntValue(const SimpleParserValue& value); [[nodiscard]] static int TokenNumericIntValue(const SimpleParserValue& value);
_NODISCARD static double TokenNumericFloatingPointValue(const SimpleParserValue& value); [[nodiscard]] static double TokenNumericFloatingPointValue(const SimpleParserValue& value);
_NODISCARD static std::string& TokenTextValue(const SimpleParserValue& value); [[nodiscard]] static std::string& TokenTextValue(const SimpleParserValue& value);
_NODISCARD static std::string TokenTextExpressionValue(MenuFileParserState* state, SequenceResult<SimpleParserValue>& result); [[nodiscard]] static std::string TokenTextExpressionValue(MenuFileParserState* state, SequenceResult<SimpleParserValue>& result);
_NODISCARD static int TokenIntExpressionValue(MenuFileParserState* state, SequenceResult<SimpleParserValue>& result); [[nodiscard]] static int TokenIntExpressionValue(MenuFileParserState* state, SequenceResult<SimpleParserValue>& result);
_NODISCARD static double TokenNumericExpressionValue(MenuFileParserState* state, SequenceResult<SimpleParserValue>& result); [[nodiscard]] static double TokenNumericExpressionValue(MenuFileParserState* state, SequenceResult<SimpleParserValue>& result);
}; };
} // namespace menu } // namespace menu

3
src/ObjLoading/Parsing/Menu/MenuFileParser.h
View File

@@ -5,7 +5,6 @@
#include "Parsing/Impl/AbstractParser.h" #include "Parsing/Impl/AbstractParser.h"
#include "Parsing/Simple/SimpleLexer.h" #include "Parsing/Simple/SimpleLexer.h"
#include "Parsing/Simple/SimpleParserValue.h" #include "Parsing/Simple/SimpleParserValue.h"
#include "Utils/ClassUtils.h"
namespace menu namespace menu
{ {
@@ -28,6 +27,6 @@ namespace menu
public: public:
MenuFileParser(SimpleLexer* lexer, FeatureLevel featureLevel, bool permissiveMode); MenuFileParser(SimpleLexer* lexer, FeatureLevel featureLevel, bool permissiveMode);
MenuFileParser(SimpleLexer* lexer, FeatureLevel featureLevel, bool permissiveMode, const MenuAssetZoneState* zoneState); MenuFileParser(SimpleLexer* lexer, FeatureLevel featureLevel, bool permissiveMode, const MenuAssetZoneState* zoneState);
_NODISCARD MenuFileParserState* GetState() const; [[nodiscard]] MenuFileParserState* GetState() const;
}; };
} // namespace menu } // namespace menu

20
src/ObjLoading/Parsing/Menu/Sequence/EventHandlerSetScopeSequences.cpp
View File

@@ -31,7 +31,7 @@ namespace menu
{ {
} }
_NODISCARD MatcherFactoryWrapper<SimpleParserValue> ScriptStrictNumeric() const [[nodiscard]] MatcherFactoryWrapper<SimpleParserValue> ScriptStrictNumeric() const
{ {
return And({ return And({
MatcherFactoryWrapper<SimpleParserValue>(std::make_unique<MenuMatcherScriptNumeric>()) MatcherFactoryWrapper<SimpleParserValue>(std::make_unique<MenuMatcherScriptNumeric>())
@@ -64,7 +64,7 @@ namespace menu
}); });
} }
_NODISCARD MatcherFactoryWrapper<SimpleParserValue> ScriptNumeric() const [[nodiscard]] MatcherFactoryWrapper<SimpleParserValue> ScriptNumeric() const
{ {
return Or({ return Or({
ScriptStrictNumeric(), ScriptStrictNumeric(),
@@ -81,7 +81,7 @@ namespace menu
}); });
} }
_NODISCARD MatcherFactoryWrapper<SimpleParserValue> ScriptStrictInt() const [[nodiscard]] MatcherFactoryWrapper<SimpleParserValue> ScriptStrictInt() const
{ {
return And({ return And({
MatcherFactoryWrapper<SimpleParserValue>(std::make_unique<MenuMatcherScriptInt>()) MatcherFactoryWrapper<SimpleParserValue>(std::make_unique<MenuMatcherScriptInt>())
@@ -100,7 +100,7 @@ namespace menu
}); });
} }
_NODISCARD MatcherFactoryWrapper<SimpleParserValue> ScriptChar(const char c) const [[nodiscard]] MatcherFactoryWrapper<SimpleParserValue> ScriptChar(const char c) const
{ {
return Or({ return Or({
Char(c), Char(c),
@@ -118,7 +118,7 @@ namespace menu
}); });
} }
_NODISCARD MatcherFactoryWrapper<SimpleParserValue> ScriptInt() const [[nodiscard]] MatcherFactoryWrapper<SimpleParserValue> ScriptInt() const
{ {
return Or({ return Or({
ScriptStrictInt(), ScriptStrictInt(),
@@ -136,7 +136,7 @@ namespace menu
}); });
} }
_NODISCARD MatcherFactoryWrapper<SimpleParserValue> ScriptText() const [[nodiscard]] MatcherFactoryWrapper<SimpleParserValue> ScriptText() const
{ {
return Or({ return Or({
Type(SimpleParserValueType::STRING), Type(SimpleParserValueType::STRING),
@@ -154,12 +154,12 @@ namespace menu
}); });
} }
_NODISCARD MatcherFactoryWrapper<SimpleParserValue> ScriptKeyword(std::string keyword) const [[nodiscard]] MatcherFactoryWrapper<SimpleParserValue> ScriptKeyword(std::string keyword) const
{ {
return KeywordIgnoreCase(std::move(keyword)); return KeywordIgnoreCase(std::move(keyword));
} }
_NODISCARD MatcherFactoryWrapper<SimpleParserValue> ScriptColor() const [[nodiscard]] MatcherFactoryWrapper<SimpleParserValue> ScriptColor() const
{ {
return And({ return And({
ScriptStrictNumeric(), ScriptStrictNumeric(),
@@ -169,7 +169,7 @@ namespace menu
}); });
} }
_NODISCARD MatcherFactoryWrapper<SimpleParserValue> ScriptLocalVarIntOrLiteral() const [[nodiscard]] MatcherFactoryWrapper<SimpleParserValue> ScriptLocalVarIntOrLiteral() const
{ {
return Or({ return Or({
And({ And({
@@ -182,7 +182,7 @@ namespace menu
}); });
} }
_NODISCARD MatcherFactoryWrapper<SimpleParserValue> ScriptLocalVarBoolOrLiteral() const [[nodiscard]] MatcherFactoryWrapper<SimpleParserValue> ScriptLocalVarBoolOrLiteral() const
{ {
return Or({ return Or({
And({ And({

2
src/ObjLoading/SearchPath/IWD.cpp
View File

@@ -56,7 +56,7 @@ namespace
IwdFile& operator=(const IwdFile& other) = default; IwdFile& operator=(const IwdFile& other) = default;
IwdFile& operator=(IwdFile&& other) noexcept = default; IwdFile& operator=(IwdFile&& other) noexcept = default;
_NODISCARD bool is_open() const override [[nodiscard]] bool is_open() const override
{ {
return m_open; return m_open;
} }

3
src/ObjLoading/StructuredDataDef/Parsing/StructuredDataDefParser.h
View File

@@ -5,7 +5,6 @@
#include "Parsing/Simple/SimpleParserValue.h" #include "Parsing/Simple/SimpleParserValue.h"
#include "StructuredDataDef/CommonStructuredDataDef.h" #include "StructuredDataDef/CommonStructuredDataDef.h"
#include "StructuredDataDefParserState.h" #include "StructuredDataDefParserState.h"
#include "Utils/ClassUtils.h"
namespace sdd namespace sdd
{ {
@@ -24,6 +23,6 @@ namespace sdd
public: public:
explicit StructuredDataDefParser(SimpleLexer* lexer); explicit StructuredDataDefParser(SimpleLexer* lexer);
_NODISCARD std::vector<std::unique_ptr<CommonStructuredDataDef>> GetDefs() const; [[nodiscard]] std::vector<std::unique_ptr<CommonStructuredDataDef>> GetDefs() const;
}; };
} // namespace sdd } // namespace sdd

3
src/ObjLoading/StructuredDataDef/Parsing/StructuredDataDefSizeCalculator.cpp
View File

@@ -1,7 +1,6 @@
#include "StructuredDataDefSizeCalculator.h" #include "StructuredDataDefSizeCalculator.h"
#include "Utils/Alignment.h" #include "Utils/Alignment.h"
#include "Utils/ClassUtils.h"
#include <cassert> #include <cassert>
#include <sstream> #include <sstream>
@@ -32,7 +31,7 @@ class StructuredDataDefSizeCalculatorInternal
std::vector<bool> m_indexed_array_calculated; std::vector<bool> m_indexed_array_calculated;
std::vector<bool> m_enumed_array_calculated; std::vector<bool> m_enumed_array_calculated;
_NORETURN void ThrowCircularDependencyException(const size_t structIndex) const [[noreturn]] void ThrowCircularDependencyException(const size_t structIndex) const
{ {
assert(structIndex < m_def.m_structs.size()); assert(structIndex < m_def.m_structs.size());

5
src/ObjLoading/StructuredDataDef/Parsing/StructuredDataDefSizeCalculator.h
View File

@@ -1,7 +1,6 @@
#pragma once #pragma once
#include "StructuredDataDef/CommonStructuredDataDef.h" #include "StructuredDataDef/CommonStructuredDataDef.h"
#include "Utils/ClassUtils.h"
#include <exception> #include <exception>
#include <string> #include <string>
@@ -15,8 +14,8 @@ namespace sdd
public: public:
explicit SizeCalculationException(std::string message); explicit SizeCalculationException(std::string message);
_NODISCARD const std::string& Message() const; [[nodiscard]] const std::string& Message() const;
_NODISCARD char const* what() const noexcept override; [[nodiscard]] char const* what() const noexcept override;
}; };
class StructuredDataDefSizeCalculator class StructuredDataDefSizeCalculator

1
src/ObjWriting/Material/AbstractMaterialConstantZoneState.cpp
View File

@@ -6,6 +6,7 @@
#include "Utils/Logging/Log.h" #include "Utils/Logging/Log.h"
#include <chrono> #include <chrono>
#include <utility>
namespace namespace
{ {

8
src/Parser/Parsing/IParserLineStream.h
View File

@@ -1,7 +1,5 @@
#pragma once #pragma once
#include "Utils/ClassUtils.h"
#include <functional> #include <functional>
#include <memory> #include <memory>
#include <string> #include <string>
@@ -16,7 +14,7 @@ public:
ParserLine(); ParserLine();
ParserLine(std::shared_ptr<std::string> filename, int lineNumber, std::string line); ParserLine(std::shared_ptr<std::string> filename, int lineNumber, std::string line);
_NODISCARD bool IsEof() const; [[nodiscard]] bool IsEof() const;
}; };
class IParserLineStream class IParserLineStream
@@ -33,6 +31,6 @@ public:
virtual ParserLine NextLine() = 0; virtual ParserLine NextLine() = 0;
virtual bool IncludeFile(const std::string& filename) = 0; virtual bool IncludeFile(const std::string& filename) = 0;
virtual void PopCurrentFile() = 0; virtual void PopCurrentFile() = 0;
_NODISCARD virtual bool IsOpen() const = 0; [[nodiscard]] virtual bool IsOpen() const = 0;
_NODISCARD virtual bool Eof() const = 0; [[nodiscard]] virtual bool Eof() const = 0;
}; };

5
src/Parser/Parsing/IParserValue.h
View File

@@ -1,7 +1,6 @@
#pragma once #pragma once
#include "TokenPos.h" #include "TokenPos.h"
#include "Utils/ClassUtils.h"
class IParserValue class IParserValue
{ {
@@ -15,6 +14,6 @@ public:
IParserValue& operator=(const IParserValue& other) = default; IParserValue& operator=(const IParserValue& other) = default;
IParserValue& operator=(IParserValue&& other) noexcept = default; IParserValue& operator=(IParserValue&& other) noexcept = default;
_NODISCARD virtual bool IsEof() const = 0; [[nodiscard]] virtual bool IsEof() const = 0;
_NODISCARD virtual const TokenPos& GetPos() const = 0; [[nodiscard]] virtual const TokenPos& GetPos() const = 0;
}; };

1
src/Parser/Parsing/Impl/AbstractLexer.h
View File

@@ -3,7 +3,6 @@
#include "Parsing/ILexer.h" #include "Parsing/ILexer.h"
#include "Parsing/IParserLineStream.h" #include "Parsing/IParserLineStream.h"
#include "Parsing/ParsingException.h" #include "Parsing/ParsingException.h"
#include "Utils/ClassUtils.h"
#include "Utils/StringUtils.h" #include "Utils/StringUtils.h"
#include <cassert> #include <cassert>

4
src/Parser/Parsing/Impl/CommentRemovingStreamProxy.h
View File

@@ -14,6 +14,6 @@ public:
ParserLine NextLine() override; ParserLine NextLine() override;
bool IncludeFile(const std::string& filename) override; bool IncludeFile(const std::string& filename) override;
void PopCurrentFile() override; void PopCurrentFile() override;
_NODISCARD bool IsOpen() const override; [[nodiscard]] bool IsOpen() const override;
_NODISCARD bool Eof() const override; [[nodiscard]] bool Eof() const override;
}; };

12
src/Parser/Parsing/Impl/IncludingStreamProxy.h
View File

@@ -15,11 +15,11 @@ class IncludingStreamProxy final : public AbstractDirectiveStreamProxy
IParserLineStream* const m_stream; IParserLineStream* const m_stream;
std::set<std::string> m_included_files; std::set<std::string> m_included_files;
_NODISCARD static bool [[nodiscard]] static bool
ExtractIncludeFilename(const ParserLine& line, size_t includeDirectivePosition, size_t& filenameStartPosition, size_t& filenameEndPosition); ExtractIncludeFilename(const ParserLine& line, size_t includeDirectivePosition, size_t& filenameStartPosition, size_t& filenameEndPosition);
_NODISCARD bool MatchIncludeDirective(const ParserLine& line, size_t directiveStartPos, size_t directiveEndPos) const; [[nodiscard]] bool MatchIncludeDirective(const ParserLine& line, size_t directiveStartPos, size_t directiveEndPos) const;
_NODISCARD bool MatchPragmaOnceDirective(const ParserLine& line, size_t directiveStartPos, size_t directiveEndPos); [[nodiscard]] bool MatchPragmaOnceDirective(const ParserLine& line, size_t directiveStartPos, size_t directiveEndPos);
_NODISCARD bool MatchDirectives(const ParserLine& line); [[nodiscard]] bool MatchDirectives(const ParserLine& line);
public: public:
explicit IncludingStreamProxy(IParserLineStream* stream); explicit IncludingStreamProxy(IParserLineStream* stream);
@@ -27,6 +27,6 @@ public:
ParserLine NextLine() override; ParserLine NextLine() override;
bool IncludeFile(const std::string& filename) override; bool IncludeFile(const std::string& filename) override;
void PopCurrentFile() override; void PopCurrentFile() override;
_NODISCARD bool IsOpen() const override; [[nodiscard]] bool IsOpen() const override;
_NODISCARD bool Eof() const override; [[nodiscard]] bool Eof() const override;
}; };

11
src/Parser/Parsing/Impl/PackDefinitionStreamProxy.h
View File

@@ -3,7 +3,6 @@
#include "AbstractDirectiveStreamProxy.h" #include "AbstractDirectiveStreamProxy.h"
#include "Parsing/IPackValueSupplier.h" #include "Parsing/IPackValueSupplier.h"
#include "Parsing/IParserLineStream.h" #include "Parsing/IParserLineStream.h"
#include "Utils/ClassUtils.h"
#include <stack> #include <stack>
@@ -21,8 +20,8 @@ private:
IParserLineStream* const m_stream; IParserLineStream* const m_stream;
std::stack<int> m_current_pack; std::stack<int> m_current_pack;
_NODISCARD bool MatchPackDirective(const ParserLine& line, size_t directiveStartPosition, size_t directiveEndPosition); [[nodiscard]] bool MatchPackDirective(const ParserLine& line, size_t directiveStartPosition, size_t directiveEndPosition);
_NODISCARD bool MatchDirectives(const ParserLine& line); [[nodiscard]] bool MatchDirectives(const ParserLine& line);
public: public:
explicit PackDefinitionStreamProxy(IParserLineStream* stream); explicit PackDefinitionStreamProxy(IParserLineStream* stream);
@@ -30,8 +29,8 @@ public:
ParserLine NextLine() override; ParserLine NextLine() override;
bool IncludeFile(const std::string& filename) override; bool IncludeFile(const std::string& filename) override;
void PopCurrentFile() override; void PopCurrentFile() override;
_NODISCARD bool IsOpen() const override; [[nodiscard]] bool IsOpen() const override;
_NODISCARD bool Eof() const override; [[nodiscard]] bool Eof() const override;
_NODISCARD int GetCurrentPack() const override; [[nodiscard]] int GetCurrentPack() const override;
}; };

4
src/Parser/Parsing/Impl/ParserFilesystemStream.h
View File

@@ -25,6 +25,6 @@ public:
ParserLine NextLine() override; ParserLine NextLine() override;
bool IncludeFile(const std::string& filename) override; bool IncludeFile(const std::string& filename) override;
void PopCurrentFile() override; void PopCurrentFile() override;
_NODISCARD bool IsOpen() const override; [[nodiscard]] bool IsOpen() const override;
_NODISCARD bool Eof() const override; [[nodiscard]] bool Eof() const override;
}; };

4
src/Parser/Parsing/Impl/ParserMultiInputStream.h
View File

@@ -24,8 +24,8 @@ public:
ParserLine NextLine() override; ParserLine NextLine() override;
bool IncludeFile(const std::string& filename) override; bool IncludeFile(const std::string& filename) override;
void PopCurrentFile() override; void PopCurrentFile() override;
_NODISCARD bool IsOpen() const override; [[nodiscard]] bool IsOpen() const override;
_NODISCARD bool Eof() const override; [[nodiscard]] bool Eof() const override;
private: private:
class FileInfo class FileInfo

4
src/Parser/Parsing/Impl/ParserSingleInputStream.h
View File

@@ -17,6 +17,6 @@ public:
ParserLine NextLine() override; ParserLine NextLine() override;
bool IncludeFile(const std::string& filename) override; bool IncludeFile(const std::string& filename) override;
void PopCurrentFile() override; void PopCurrentFile() override;
_NODISCARD bool IsOpen() const override; [[nodiscard]] bool IsOpen() const override;
_NODISCARD bool Eof() const override; [[nodiscard]] bool Eof() const override;
}; };

4
src/Parser/Parsing/Impl/SkipUntilFirstNonEmptyProxy.h
View File

@@ -10,8 +10,8 @@ public:
ParserLine NextLine() override; ParserLine NextLine() override;
bool IncludeFile(const std::string& filename) override; bool IncludeFile(const std::string& filename) override;
void PopCurrentFile() override; void PopCurrentFile() override;
_NODISCARD bool IsOpen() const override; [[nodiscard]] bool IsOpen() const override;
_NODISCARD bool Eof() const override; [[nodiscard]] bool Eof() const override;
private: private:
IParserLineStream* const m_stream; IParserLineStream* const m_stream;

1
src/Parser/Parsing/Matcher/MatcherAnd.h
View File

@@ -2,6 +2,7 @@
#include "AbstractMatcher.h" #include "AbstractMatcher.h"
#include "Parsing/IParserValue.h" #include "Parsing/IParserValue.h"
#include "Utils/ClassUtils.h"
#include <iterator> #include <iterator>
#include <memory> #include <memory>

3
src/Parser/Parsing/Matcher/MatcherLabel.h
View File

@@ -2,7 +2,6 @@
#include "AbstractMatcher.h" #include "AbstractMatcher.h"
#include "Parsing/IParserValue.h" #include "Parsing/IParserValue.h"
#include "Utils/ClassUtils.h"
#include <cassert> #include <cassert>
@@ -19,7 +18,7 @@ public:
IMatcherForLabelSupplier& operator=(const IMatcherForLabelSupplier& other) = default; IMatcherForLabelSupplier& operator=(const IMatcherForLabelSupplier& other) = default;
IMatcherForLabelSupplier& operator=(IMatcherForLabelSupplier&& other) noexcept = default; IMatcherForLabelSupplier& operator=(IMatcherForLabelSupplier&& other) noexcept = default;
_NODISCARD virtual AbstractMatcher<TokenType>* GetMatcherForLabel(int label) const = 0; [[nodiscard]] virtual AbstractMatcher<TokenType>* GetMatcherForLabel(int label) const = 0;
}; };
template<typename TokenType> class MatcherLabel final : public AbstractMatcher<TokenType> template<typename TokenType> class MatcherLabel final : public AbstractMatcher<TokenType>

1
src/Parser/Parsing/Matcher/MatcherOr.h
View File

@@ -2,6 +2,7 @@
#include "AbstractMatcher.h" #include "AbstractMatcher.h"
#include "Parsing/IParserValue.h" #include "Parsing/IParserValue.h"
#include "Utils/ClassUtils.h"
#include <iterator> #include <iterator>
#include <memory> #include <memory>

9
src/Parser/Parsing/ParsingException.h
View File

@@ -1,7 +1,6 @@
#pragma once #pragma once
#include "TokenPos.h" #include "TokenPos.h"
#include "Utils/ClassUtils.h"
#include <exception> #include <exception>
#include <string> #include <string>
@@ -15,8 +14,8 @@ class ParsingException final : public std::exception
public: public:
ParsingException(TokenPos position, std::string message); ParsingException(TokenPos position, std::string message);
_NODISCARD TokenPos Position() const; [[nodiscard]] TokenPos Position() const;
_NODISCARD const std::string& Message() const; [[nodiscard]] const std::string& Message() const;
_NODISCARD std::string FullMessage() const; [[nodiscard]] std::string FullMessage() const;
_NODISCARD char const* what() const noexcept override; [[nodiscard]] char const* what() const noexcept override;
}; };

5
src/Parser/Parsing/Sequence/AbstractSequence.h
View File

@@ -4,7 +4,6 @@
#include "Parsing/Matcher/MatcherAnd.h" #include "Parsing/Matcher/MatcherAnd.h"
#include "Parsing/Matcher/MatcherLabel.h" #include "Parsing/Matcher/MatcherLabel.h"
#include "SequenceResult.h" #include "SequenceResult.h"
#include "Utils/ClassUtils.h"
#include <cassert> #include <cassert>
#include <unordered_map> #include <unordered_map>
@@ -59,7 +58,7 @@ public:
AbstractSequence& operator=(const AbstractSequence& other) = default; AbstractSequence& operator=(const AbstractSequence& other) = default;
AbstractSequence& operator=(AbstractSequence&& other) noexcept = default; AbstractSequence& operator=(AbstractSequence&& other) noexcept = default;
_NODISCARD matcher_t* GetMatcherForLabel(const int label) const override [[nodiscard]] matcher_t* GetMatcherForLabel(const int label) const override
{ {
if (label == 0) if (label == 0)
return m_entry.get(); return m_entry.get();
@@ -72,7 +71,7 @@ public:
return nullptr; return nullptr;
} }
_NODISCARD bool MatchSequence(ILexer<TokenType>* lexer, ParserState* state, unsigned& consumedTokenCount) const [[nodiscard]] bool MatchSequence(ILexer<TokenType>* lexer, ParserState* state, unsigned& consumedTokenCount) const
{ {
if (!m_entry) if (!m_entry)
return false; return false;

5
src/Parser/Parsing/Sequence/SequenceResult.h
View File

@@ -3,7 +3,6 @@
#include "Parsing/Matcher/AbstractMatcher.h" #include "Parsing/Matcher/AbstractMatcher.h"
#include "Parsing/Matcher/MatcherResult.h" #include "Parsing/Matcher/MatcherResult.h"
#include "Parsing/ParsingException.h" #include "Parsing/ParsingException.h"
#include "Utils/ClassUtils.h"
#include <concepts> #include <concepts>
#include <unordered_map> #include <unordered_map>
@@ -41,7 +40,7 @@ public:
} }
} }
_NODISCARD int PeekTag() const [[nodiscard]] int PeekTag() const
{ {
if (m_tag_offset < m_tags.size()) if (m_tag_offset < m_tags.size())
return m_tags[m_tag_offset]; return m_tags[m_tag_offset];
@@ -72,7 +71,7 @@ public:
return AbstractMatcher<TokenType>::NO_ID; return AbstractMatcher<TokenType>::NO_ID;
} }
_NODISCARD bool HasNextCapture(int captureId) [[nodiscard]] bool HasNextCapture(int captureId)
{ {
auto foundEntry = m_captures.find(captureId); auto foundEntry = m_captures.find(captureId);

12
src/Parser/Parsing/Simple/Expression/ISimpleExpression.h
View File

@@ -1,7 +1,5 @@
#pragma once #pragma once
#include "Utils/ClassUtils.h"
#include <string> #include <string>
class SimpleExpressionValue; class SimpleExpressionValue;
@@ -18,7 +16,7 @@ public:
ISimpleExpressionScopeValues& operator=(const ISimpleExpressionScopeValues& other) = default; ISimpleExpressionScopeValues& operator=(const ISimpleExpressionScopeValues& other) = default;
ISimpleExpressionScopeValues& operator=(ISimpleExpressionScopeValues&& other) noexcept = default; ISimpleExpressionScopeValues& operator=(ISimpleExpressionScopeValues&& other) noexcept = default;
_NODISCARD virtual SimpleExpressionValue ValueByName(const std::string& name) const = 0; [[nodiscard]] virtual SimpleExpressionValue ValueByName(const std::string& name) const = 0;
}; };
class ISimpleExpression class ISimpleExpression
@@ -33,10 +31,10 @@ public:
ISimpleExpression& operator=(const ISimpleExpression& other) = default; ISimpleExpression& operator=(const ISimpleExpression& other) = default;
ISimpleExpression& operator=(ISimpleExpression&& other) noexcept = default; ISimpleExpression& operator=(ISimpleExpression&& other) noexcept = default;
_NODISCARD virtual bool Equals(const ISimpleExpression* other) const = 0; [[nodiscard]] virtual bool Equals(const ISimpleExpression* other) const = 0;
_NODISCARD virtual bool IsStatic() const = 0; [[nodiscard]] virtual bool IsStatic() const = 0;
_NODISCARD virtual SimpleExpressionValue EvaluateStatic() const = 0; [[nodiscard]] virtual SimpleExpressionValue EvaluateStatic() const = 0;
_NODISCARD virtual SimpleExpressionValue EvaluateNonStatic(const ISimpleExpressionScopeValues* scopeValues) const = 0; [[nodiscard]] virtual SimpleExpressionValue EvaluateNonStatic(const ISimpleExpressionScopeValues* scopeValues) const = 0;
}; };
// Include SimpleExpressionValue after definition to avoid "base class not defined" // Include SimpleExpressionValue after definition to avoid "base class not defined"

12
src/Parser/Parsing/Simple/Expression/SimpleExpressionBinaryOperation.h
View File

@@ -93,11 +93,11 @@ public:
std::unique_ptr<ISimpleExpression> operand1, std::unique_ptr<ISimpleExpression> operand1,
std::unique_ptr<ISimpleExpression> operand2); std::unique_ptr<ISimpleExpression> operand2);
_NODISCARD bool Operand1NeedsParenthesis() const; [[nodiscard]] bool Operand1NeedsParenthesis() const;
_NODISCARD bool Operand2NeedsParenthesis() const; [[nodiscard]] bool Operand2NeedsParenthesis() const;
_NODISCARD bool Equals(const ISimpleExpression* other) const override; [[nodiscard]] bool Equals(const ISimpleExpression* other) const override;
_NODISCARD bool IsStatic() const override; [[nodiscard]] bool IsStatic() const override;
_NODISCARD SimpleExpressionValue EvaluateStatic() const override; [[nodiscard]] SimpleExpressionValue EvaluateStatic() const override;
_NODISCARD SimpleExpressionValue EvaluateNonStatic(const ISimpleExpressionScopeValues* scopeValues) const override; [[nodiscard]] SimpleExpressionValue EvaluateNonStatic(const ISimpleExpressionScopeValues* scopeValues) const override;
}; };

9
src/Parser/Parsing/Simple/Expression/SimpleExpressionConditionalOperator.h
View File

@@ -1,4 +1,5 @@
#pragma once #pragma once
#include "ISimpleExpression.h" #include "ISimpleExpression.h"
class SimpleExpressionConditionalOperator final : public ISimpleExpression class SimpleExpressionConditionalOperator final : public ISimpleExpression
@@ -8,10 +9,10 @@ public:
std::unique_ptr<ISimpleExpression> m_true_value; std::unique_ptr<ISimpleExpression> m_true_value;
std::unique_ptr<ISimpleExpression> m_false_value; std::unique_ptr<ISimpleExpression> m_false_value;
_NODISCARD bool Equals(const ISimpleExpression* other) const override; [[nodiscard]] bool Equals(const ISimpleExpression* other) const override;
_NODISCARD bool IsStatic() const override; [[nodiscard]] bool IsStatic() const override;
_NODISCARD SimpleExpressionValue EvaluateStatic() const override; [[nodiscard]] SimpleExpressionValue EvaluateStatic() const override;
_NODISCARD SimpleExpressionValue EvaluateNonStatic(const ISimpleExpressionScopeValues* scopeValues) const override; [[nodiscard]] SimpleExpressionValue EvaluateNonStatic(const ISimpleExpressionScopeValues* scopeValues) const override;
SimpleExpressionConditionalOperator(); SimpleExpressionConditionalOperator();
SimpleExpressionConditionalOperator(std::unique_ptr<ISimpleExpression> condition, SimpleExpressionConditionalOperator(std::unique_ptr<ISimpleExpression> condition,

5
src/Parser/Parsing/Simple/Expression/SimpleExpressionMatchers.h
View File

@@ -7,7 +7,6 @@
#include "Parsing/Simple/SimpleParserValue.h" #include "Parsing/Simple/SimpleParserValue.h"
#include "SimpleExpressionBinaryOperation.h" #include "SimpleExpressionBinaryOperation.h"
#include "SimpleExpressionUnaryOperation.h" #include "SimpleExpressionUnaryOperation.h"
#include "Utils/ClassUtils.h"
#include <Parsing/Simple/SimpleLexer.h> #include <Parsing/Simple/SimpleLexer.h>
#include <memory> #include <memory>
@@ -47,8 +46,8 @@ protected:
virtual std::unique_ptr<matcher_t> ParseOperandExtension(const supplier_t* labelSupplier) const; virtual std::unique_ptr<matcher_t> ParseOperandExtension(const supplier_t* labelSupplier) const;
virtual std::unique_ptr<ISimpleExpression> ProcessOperandExtension(SequenceResult<SimpleParserValue>& result) const; virtual std::unique_ptr<ISimpleExpression> ProcessOperandExtension(SequenceResult<SimpleParserValue>& result) const;
_NODISCARD virtual std::vector<const SimpleExpressionUnaryOperationType*> EnabledUnaryOperations() const; [[nodiscard]] virtual std::vector<const SimpleExpressionUnaryOperationType*> EnabledUnaryOperations() const;
_NODISCARD virtual std::vector<const SimpleExpressionBinaryOperationType*> EnabledBinaryOperations() const; [[nodiscard]] virtual std::vector<const SimpleExpressionBinaryOperationType*> EnabledBinaryOperations() const;
private: private:
std::unique_ptr<matcher_t> ParseBinaryOperationType(const supplier_t* labelSupplier) const; std::unique_ptr<matcher_t> ParseBinaryOperationType(const supplier_t* labelSupplier) const;

8
src/Parser/Parsing/Simple/Expression/SimpleExpressionScopeValue.h
View File

@@ -12,8 +12,8 @@ public:
explicit SimpleExpressionScopeValue(std::string valueName); explicit SimpleExpressionScopeValue(std::string valueName);
_NODISCARD bool Equals(const ISimpleExpression* other) const override; [[nodiscard]] bool Equals(const ISimpleExpression* other) const override;
_NODISCARD bool IsStatic() const override; [[nodiscard]] bool IsStatic() const override;
_NODISCARD SimpleExpressionValue EvaluateStatic() const override; [[nodiscard]] SimpleExpressionValue EvaluateStatic() const override;
_NODISCARD SimpleExpressionValue EvaluateNonStatic(const ISimpleExpressionScopeValues* scopeValues) const override; [[nodiscard]] SimpleExpressionValue EvaluateNonStatic(const ISimpleExpressionScopeValues* scopeValues) const override;
}; };

10
src/Parser/Parsing/Simple/Expression/SimpleExpressionUnaryOperation.h
View File

@@ -44,10 +44,10 @@ public:
SimpleExpressionUnaryOperation(const SimpleExpressionUnaryOperationType* operationType, std::unique_ptr<ISimpleExpression> operand); SimpleExpressionUnaryOperation(const SimpleExpressionUnaryOperationType* operationType, std::unique_ptr<ISimpleExpression> operand);
_NODISCARD bool OperandNeedsParenthesis() const; [[nodiscard]] bool OperandNeedsParenthesis() const;
_NODISCARD bool Equals(const ISimpleExpression* other) const override; [[nodiscard]] bool Equals(const ISimpleExpression* other) const override;
_NODISCARD bool IsStatic() const override; [[nodiscard]] bool IsStatic() const override;
_NODISCARD SimpleExpressionValue EvaluateStatic() const override; [[nodiscard]] SimpleExpressionValue EvaluateStatic() const override;
_NODISCARD SimpleExpressionValue EvaluateNonStatic(const ISimpleExpressionScopeValues* scopeValues) const override; [[nodiscard]] SimpleExpressionValue EvaluateNonStatic(const ISimpleExpressionScopeValues* scopeValues) const override;
}; };

11
src/Parser/Parsing/Simple/Expression/SimpleExpressionValue.h
View File

@@ -1,7 +1,6 @@
#pragma once #pragma once
#include "ISimpleExpression.h" #include "ISimpleExpression.h"
#include "Utils/ClassUtils.h"
#include <memory> #include <memory>
#include <string> #include <string>
@@ -31,9 +30,9 @@ public:
explicit SimpleExpressionValue(double doubleValue); explicit SimpleExpressionValue(double doubleValue);
explicit SimpleExpressionValue(int intValue); explicit SimpleExpressionValue(int intValue);
_NODISCARD bool Equals(const ISimpleExpression* other) const override; [[nodiscard]] bool Equals(const ISimpleExpression* other) const override;
_NODISCARD bool IsStatic() const override; [[nodiscard]] bool IsStatic() const override;
_NODISCARD SimpleExpressionValue EvaluateStatic() const override; [[nodiscard]] SimpleExpressionValue EvaluateStatic() const override;
_NODISCARD SimpleExpressionValue EvaluateNonStatic(const ISimpleExpressionScopeValues* scopeValues) const override; [[nodiscard]] SimpleExpressionValue EvaluateNonStatic(const ISimpleExpressionScopeValues* scopeValues) const override;
_NODISCARD bool IsTruthy() const; [[nodiscard]] bool IsTruthy() const;
}; };

3
src/Parser/Parsing/Simple/SimpleExpressionInterpreter.cpp
View File

@@ -3,7 +3,6 @@
#include "Expression/SimpleExpressionMatchers.h" #include "Expression/SimpleExpressionMatchers.h"
#include "Matcher/SimpleMatcherFactory.h" #include "Matcher/SimpleMatcherFactory.h"
#include "Parsing/Impl/AbstractParser.h" #include "Parsing/Impl/AbstractParser.h"
#include "Utils/ClassUtils.h"
class SimpleExpressionInterpreterParserState class SimpleExpressionInterpreterParserState
{ {
@@ -39,7 +38,7 @@ public:
{ {
} }
_NODISCARD std::unique_ptr<ISimpleExpression> GetParsedExpression() const [[nodiscard]] std::unique_ptr<ISimpleExpression> GetParsedExpression() const
{ {
return std::move(m_state->m_expression); return std::move(m_state->m_expression);
} }

19
src/Parser/Parsing/Simple/SimpleParserValue.h
View File

@@ -2,7 +2,6 @@
#include "Parsing/IParserValue.h" #include "Parsing/IParserValue.h"
#include "Parsing/TokenPos.h" #include "Parsing/TokenPos.h"
#include "Utils/ClassUtils.h"
#include <string> #include <string>
@@ -66,14 +65,14 @@ public:
SimpleParserValue& operator=(const SimpleParserValue& other) = delete; SimpleParserValue& operator=(const SimpleParserValue& other) = delete;
SimpleParserValue& operator=(SimpleParserValue&& other) noexcept; SimpleParserValue& operator=(SimpleParserValue&& other) noexcept;
_NODISCARD bool IsEof() const override; [[nodiscard]] bool IsEof() const override;
_NODISCARD const TokenPos& GetPos() const override; [[nodiscard]] const TokenPos& GetPos() const override;
_NODISCARD char CharacterValue() const; [[nodiscard]] char CharacterValue() const;
_NODISCARD int MultiCharacterValue() const; [[nodiscard]] int MultiCharacterValue() const;
_NODISCARD int IntegerValue() const; [[nodiscard]] int IntegerValue() const;
_NODISCARD double FloatingPointValue() const; [[nodiscard]] double FloatingPointValue() const;
_NODISCARD std::string& StringValue() const; [[nodiscard]] std::string& StringValue() const;
_NODISCARD std::string& IdentifierValue() const; [[nodiscard]] std::string& IdentifierValue() const;
_NODISCARD size_t IdentifierHash() const; [[nodiscard]] size_t IdentifierHash() const;
}; };

2
src/RawTemplater/RawTemplater.cpp
View File

@@ -17,7 +17,7 @@ class RawTemplater::Impl
bool m_write_build_log; bool m_write_build_log;
std::ofstream m_build_log_file; std::ofstream m_build_log_file;
_NODISCARD bool GenerateCode(const std::string& filename) [[nodiscard]] bool GenerateCode(const std::string& filename)
{ {
std::ifstream file(filename, std::ios::in | std::ios::binary); std::ifstream file(filename, std::ios::in | std::ios::binary);
if (!file.is_open()) if (!file.is_open())

4
src/RawTemplater/Templating/DirectiveEscapeStreamProxy.h
View File

@@ -11,8 +11,8 @@ namespace templating
ParserLine NextLine() override; ParserLine NextLine() override;
bool IncludeFile(const std::string& filename) override; bool IncludeFile(const std::string& filename) override;
void PopCurrentFile() override; void PopCurrentFile() override;
_NODISCARD bool IsOpen() const override; [[nodiscard]] bool IsOpen() const override;
_NODISCARD bool Eof() const override; [[nodiscard]] bool Eof() const override;
private: private:
IParserLineStream* const m_stream; IParserLineStream* const m_stream;

9
src/RawTemplater/Templating/SetDefineStreamProxy.h
View File

@@ -2,7 +2,6 @@
#include "Parsing/Impl/AbstractDirectiveStreamProxy.h" #include "Parsing/Impl/AbstractDirectiveStreamProxy.h"
#include "Parsing/Impl/DefinesStreamProxy.h" #include "Parsing/Impl/DefinesStreamProxy.h"
#include "Utils/ClassUtils.h"
namespace templating namespace templating
{ {
@@ -16,14 +15,14 @@ namespace templating
ParserLine NextLine() override; ParserLine NextLine() override;
bool IncludeFile(const std::string& filename) override; bool IncludeFile(const std::string& filename) override;
void PopCurrentFile() override; void PopCurrentFile() override;
_NODISCARD bool IsOpen() const override; [[nodiscard]] bool IsOpen() const override;
_NODISCARD bool Eof() const override; [[nodiscard]] bool Eof() const override;
private: private:
static constexpr const char* SET_DIRECTIVE = "set"; static constexpr const char* SET_DIRECTIVE = "set";
_NODISCARD bool MatchSetDirective(const ParserLine& line, size_t directiveStartPosition, size_t directiveEndPosition) const; [[nodiscard]] bool MatchSetDirective(const ParserLine& line, size_t directiveStartPosition, size_t directiveEndPosition) const;
_NODISCARD bool MatchDirectives(const ParserLine& line) const; [[nodiscard]] bool MatchDirectives(const ParserLine& line) const;
IParserLineStream* const m_stream; IParserLineStream* const m_stream;
DefinesStreamProxy* m_defines_proxy; DefinesStreamProxy* m_defines_proxy;

15
src/RawTemplater/Templating/Templater.cpp
View File

@@ -7,7 +7,6 @@
#include "Parsing/ParsingException.h" #include "Parsing/ParsingException.h"
#include "SetDefineStreamProxy.h" #include "SetDefineStreamProxy.h"
#include "TemplatingStreamProxy.h" #include "TemplatingStreamProxy.h"
#include "Utils/ClassUtils.h"
#include "Utils/FileUtils.h" #include "Utils/FileUtils.h"
#include "Utils/Logging/Log.h" #include "Utils/Logging/Log.h"
@@ -75,8 +74,8 @@ namespace templating
virtual const std::string& GetName() = 0; virtual const std::string& GetName() = 0;
virtual void Advance() = 0; virtual void Advance() = 0;
virtual void Apply(DefinesStreamProxy* definesProxy) = 0; virtual void Apply(DefinesStreamProxy* definesProxy) = 0;
_NODISCARD virtual bool IsFinished() const = 0; [[nodiscard]] virtual bool IsFinished() const = 0;
_NODISCARD virtual TemplatingVariationType GetVariationType() const = 0; [[nodiscard]] virtual TemplatingVariationType GetVariationType() const = 0;
}; };
class SwitchVariation final : public ITemplatingVariation class SwitchVariation final : public ITemplatingVariation
@@ -108,12 +107,12 @@ namespace templating
definesProxy->AddDefine(DefinesStreamProxy::Define(m_name, "1")); definesProxy->AddDefine(DefinesStreamProxy::Define(m_name, "1"));
} }
_NODISCARD bool IsFinished() const override [[nodiscard]] bool IsFinished() const override
{ {
return m_finished; return m_finished;
} }
_NODISCARD TemplatingVariationType GetVariationType() const override [[nodiscard]] TemplatingVariationType GetVariationType() const override
{ {
return TemplatingVariationType::SWITCH; return TemplatingVariationType::SWITCH;
} }
@@ -149,12 +148,12 @@ namespace templating
definesProxy->AddDefine(DefinesStreamProxy::Define(m_name, m_values[m_value_offset])); definesProxy->AddDefine(DefinesStreamProxy::Define(m_name, m_values[m_value_offset]));
} }
_NODISCARD bool IsFinished() const override [[nodiscard]] bool IsFinished() const override
{ {
return m_value_offset >= m_values.size(); return m_value_offset >= m_values.size();
} }
_NODISCARD TemplatingVariationType GetVariationType() const override [[nodiscard]] TemplatingVariationType GetVariationType() const override
{ {
return TemplatingVariationType::OPTIONS; return TemplatingVariationType::OPTIONS;
} }
@@ -280,7 +279,7 @@ namespace templating
} }
} }
_NODISCARD bool HasActiveVariations() const [[nodiscard]] bool HasActiveVariations() const
{ {
return !m_active_variations.empty(); return !m_active_variations.empty();
} }

4
src/RawTemplater/Templating/Templater.h
View File

@@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Parsing/IParserLineStream.h" #include "Parsing/IParserLineStream.h"
#include "Utils/ClassUtils.h"
#include <string> #include <string>
@@ -12,7 +12,7 @@ namespace templating
Templater(std::istream& stream, std::string fileName); Templater(std::istream& stream, std::string fileName);
void SetBuildLogFile(std::ostream* buildLogFile); void SetBuildLogFile(std::ostream* buildLogFile);
_NODISCARD bool TemplateToDirectory(const std::string& outputDirectory) const; [[nodiscard]] bool TemplateToDirectory(const std::string& outputDirectory) const;
private: private:
std::istream& m_stream; std::istream& m_stream;

15
src/RawTemplater/Templating/TemplatingStreamProxy.h
View File

@@ -2,7 +2,6 @@
#include "Parsing/Impl/AbstractDirectiveStreamProxy.h" #include "Parsing/Impl/AbstractDirectiveStreamProxy.h"
#include "Parsing/Impl/DefinesStreamProxy.h" #include "Parsing/Impl/DefinesStreamProxy.h"
#include "Utils/ClassUtils.h"
namespace templating namespace templating
{ {
@@ -34,8 +33,8 @@ namespace templating
ParserLine NextLine() override; ParserLine NextLine() override;
bool IncludeFile(const std::string& filename) override; bool IncludeFile(const std::string& filename) override;
void PopCurrentFile() override; void PopCurrentFile() override;
_NODISCARD bool IsOpen() const override; [[nodiscard]] bool IsOpen() const override;
_NODISCARD bool Eof() const override; [[nodiscard]] bool Eof() const override;
private: private:
static constexpr const char* SWITCH_DIRECTIVE = "switch"; static constexpr const char* SWITCH_DIRECTIVE = "switch";
@@ -43,11 +42,11 @@ namespace templating
static constexpr const char* FILENAME_DIRECTIVE = "filename"; static constexpr const char* FILENAME_DIRECTIVE = "filename";
static constexpr const char* SKIP_DIRECTIVE = "skip"; static constexpr const char* SKIP_DIRECTIVE = "skip";
_NODISCARD bool MatchSwitchDirective(const ParserLine& line, size_t directiveStartPosition, size_t directiveEndPosition) const; [[nodiscard]] bool MatchSwitchDirective(const ParserLine& line, size_t directiveStartPosition, size_t directiveEndPosition) const;
_NODISCARD bool MatchOptionsDirective(const ParserLine& line, size_t directiveStartPosition, size_t directiveEndPosition) const; [[nodiscard]] bool MatchOptionsDirective(const ParserLine& line, size_t directiveStartPosition, size_t directiveEndPosition) const;
_NODISCARD bool MatchFilenameDirective(const ParserLine& line, size_t directiveStartPosition, size_t directiveEndPosition) const; [[nodiscard]] bool MatchFilenameDirective(const ParserLine& line, size_t directiveStartPosition, size_t directiveEndPosition) const;
_NODISCARD bool MatchSkipDirective(const ParserLine& line, size_t directiveStartPosition, size_t directiveEndPosition) const; [[nodiscard]] bool MatchSkipDirective(const ParserLine& line, size_t directiveStartPosition, size_t directiveEndPosition) const;
_NODISCARD bool MatchDirectives(const ParserLine& line) const; [[nodiscard]] bool MatchDirectives(const ParserLine& line) const;
IParserLineStream* const m_stream; IParserLineStream* const m_stream;
ITemplaterControl* const m_templater_control; ITemplaterControl* const m_templater_control;

1
src/Unlinking/Unlinker.cpp
View File

@@ -9,7 +9,6 @@
#include "UnlinkerArgs.h" #include "UnlinkerArgs.h"
#include "UnlinkerPaths.h" #include "UnlinkerPaths.h"
#include "Utils/Logging/Log.h" #include "Utils/Logging/Log.h"
#include "Utils/ObjFileStream.h"
#include "Zone/AssetNameResolver.h" #include "Zone/AssetNameResolver.h"
#include "Zone/Definition/ZoneDefWriter.h" #include "Zone/Definition/ZoneDefWriter.h"
#include "ZoneLoading.h" #include "ZoneLoading.h"

24
src/Utils/Utils/ClassUtils.h
View File

@@ -4,30 +4,6 @@
#define STR(x) #x #define STR(x) #x
#if defined(_MSVC_LANG)
#define _CPP_VERSION _MSVC_LANG
#elif defined(__cplusplus)
#define _CPP_VERSION __cplusplus
#else
#define _CPP_VERSION 0
#endif
#ifdef _NODISCARD
#undef _NODISCARD
#endif
#ifdef _NORETURN
#undef _NORETURN
#endif
#if _CPP_VERSION >= 201703L
#define _NODISCARD [[nodiscard]]
#define _NORETURN [[noreturn]]
#else
#define _NODISCARD
#define _NORETURN
#endif
template<class T> struct Movable template<class T> struct Movable
{ {
mutable T m_val; mutable T m_val;

1
src/ZoneCodeGeneratorLib/Domain/Definition/DataDefinition.h
View File

@@ -1,5 +1,4 @@
#pragma once #pragma once
#include "Utils/ClassUtils.h"
#include <string> #include <string>

1
src/ZoneCodeGeneratorLib/Domain/Definition/TypeDeclaration.h
View File

@@ -2,7 +2,6 @@
#include "DataDefinition.h" #include "DataDefinition.h"
#include "DeclarationModifier.h" #include "DeclarationModifier.h"
#include "Utils/ClassUtils.h"
#include <memory> #include <memory>
#include <vector> #include <vector>

1
src/ZoneCodeGeneratorLib/Domain/Definition/Variable.h
View File

@@ -1,7 +1,6 @@
#pragma once #pragma once
#include "TypeDeclaration.h" #include "TypeDeclaration.h"
#include "Utils/ClassUtils.h"
#include <memory> #include <memory>
#include <string> #include <string>

1
src/ZoneCodeGeneratorLib/Domain/Evaluation/Operation.h
View File

@@ -2,7 +2,6 @@
#include "IEvaluation.h" #include "IEvaluation.h"
#include "OperationType.h" #include "OperationType.h"
#include "Utils/ClassUtils.h"
#include <memory> #include <memory>

1
src/ZoneCodeGeneratorLib/Parsing/Commands/Impl/CommandsParserValue.h
View File

@@ -3,7 +3,6 @@
#include "Domain/Evaluation/OperationType.h" #include "Domain/Evaluation/OperationType.h"
#include "Parsing/IParserValue.h" #include "Parsing/IParserValue.h"
#include "Parsing/TokenPos.h" #include "Parsing/TokenPos.h"
#include "Utils/ClassUtils.h"
#include <string> #include <string>

1
src/ZoneCodeGeneratorLib/Parsing/Commands/Sequence/SequenceBlock.h
View File

@@ -1,7 +1,6 @@
#pragma once #pragma once
#include "Parsing/Commands/Impl/CommandsParser.h" #include "Parsing/Commands/Impl/CommandsParser.h"
#include "Utils/ClassUtils.h"
#include <unordered_map> #include <unordered_map>

1
src/ZoneCodeGeneratorLib/Parsing/Header/Block/HeaderBlockEnum.h
View File

@@ -5,7 +5,6 @@
#include "IHeaderBlock.h" #include "IHeaderBlock.h"
#include "IHeaderBlockNameHolder.h" #include "IHeaderBlockNameHolder.h"
#include "IHeaderBlockVariableDefining.h" #include "IHeaderBlockVariableDefining.h"
#include "Utils/ClassUtils.h"
#include <memory> #include <memory>
#include <string> #include <string>

3
src/ZoneCodeGeneratorLib/Parsing/Header/Impl/HeaderParserState.h
View File

@@ -7,7 +7,6 @@
#include "Parsing/Header/Block/IHeaderBlock.h" #include "Parsing/Header/Block/IHeaderBlock.h"
#include "Parsing/IPackValueSupplier.h" #include "Parsing/IPackValueSupplier.h"
#include "Persistence/IDataRepository.h" #include "Persistence/IDataRepository.h"
#include "Utils/ClassUtils.h"
#include "Utils/NamespaceBuilder.h" #include "Utils/NamespaceBuilder.h"
#include <memory> #include <memory>
@@ -23,7 +22,7 @@ class HeaderParserState
public: public:
explicit HeaderParserState(const IPackValueSupplier* packValueSupplier); explicit HeaderParserState(const IPackValueSupplier* packValueSupplier);
_NODISCARD IHeaderBlock* GetBlock() const; [[nodiscard]] IHeaderBlock* GetBlock() const;
void PushBlock(std::unique_ptr<IHeaderBlock> block); void PushBlock(std::unique_ptr<IHeaderBlock> block);
void PopBlock(); void PopBlock();

1
src/ZoneCodeGeneratorLib/Parsing/Header/Impl/HeaderParserValue.h
View File

@@ -2,7 +2,6 @@
#include "Parsing/IParserValue.h" #include "Parsing/IParserValue.h"
#include "Parsing/TokenPos.h" #include "Parsing/TokenPos.h"
#include "Utils/ClassUtils.h"
#include <string> #include <string>

1
src/ZoneCodeGeneratorLib/Persistence/IDataRepository.h
View File

@@ -7,7 +7,6 @@
#include "Domain/Environment/Architecture.h" #include "Domain/Environment/Architecture.h"
#include "Domain/FastFile/FastFileBlock.h" #include "Domain/FastFile/FastFileBlock.h"
#include "Domain/Information/StructureInformation.h" #include "Domain/Information/StructureInformation.h"
#include "Utils/ClassUtils.h"
#include <vector> #include <vector>

4
src/ZoneCodeGeneratorLib/Utils/NamespaceBuilder.h
View File

@@ -1,7 +1,5 @@
#pragma once #pragma once
#include "Utils/ClassUtils.h"
#include <string> #include <string>
#include <vector> #include <vector>
@@ -12,7 +10,7 @@ class NamespaceBuilder
public: public:
static std::string Combine(const std::string& _namespace, const std::string& name); static std::string Combine(const std::string& _namespace, const std::string& name);
_NODISCARD bool IsEmpty() const; [[nodiscard]] bool IsEmpty() const;
void Push(std::string element); void Push(std::string element);
void Pop(); void Pop();
std::string ToString(); std::string ToString();

2
src/ZoneCodeGeneratorLib/ZoneCodeGenerator.cpp
View File

@@ -81,7 +81,7 @@ private:
prettyPrinter.PrintAll(); prettyPrinter.PrintAll();
} }
_NODISCARD bool GenerateCode() const [[nodiscard]] bool GenerateCode() const
{ {
CodeGenerator codeGenerator(&m_args); CodeGenerator codeGenerator(&m_args);
return codeGenerator.GenerateCode(m_repository.get()); return codeGenerator.GenerateCode(m_repository.get());

10
src/ZoneCommon/Zone/Definition/Parsing/Matcher/ZoneDefinitionMatcherFactory.h
View File

@@ -10,9 +10,9 @@ class ZoneDefinitionMatcherFactory final : public AbstractMatcherFactory<ZoneDef
public: public:
explicit ZoneDefinitionMatcherFactory(const IMatcherForLabelSupplier<ZoneDefinitionParserValue>* labelSupplier); explicit ZoneDefinitionMatcherFactory(const IMatcherForLabelSupplier<ZoneDefinitionParserValue>* labelSupplier);
_NODISCARD MatcherFactoryWrapper<ZoneDefinitionParserValue> Type(ZoneDefinitionParserValueType type) const; [[nodiscard]] MatcherFactoryWrapper<ZoneDefinitionParserValue> Type(ZoneDefinitionParserValueType type) const;
_NODISCARD MatcherFactoryWrapper<ZoneDefinitionParserValue> Keyword(std::string keyword) const; [[nodiscard]] MatcherFactoryWrapper<ZoneDefinitionParserValue> Keyword(std::string keyword) const;
_NODISCARD MatcherFactoryWrapper<ZoneDefinitionParserValue> Field() const; [[nodiscard]] MatcherFactoryWrapper<ZoneDefinitionParserValue> Field() const;
_NODISCARD MatcherFactoryWrapper<ZoneDefinitionParserValue> String() const; [[nodiscard]] MatcherFactoryWrapper<ZoneDefinitionParserValue> String() const;
_NODISCARD MatcherFactoryWrapper<ZoneDefinitionParserValue> Char(char c) const; [[nodiscard]] MatcherFactoryWrapper<ZoneDefinitionParserValue> Char(char c) const;
}; };

13
src/ZoneCommon/Zone/Definition/Parsing/ZoneDefinitionParserValue.h
View File

@@ -2,7 +2,6 @@
#include "Parsing/IParserValue.h" #include "Parsing/IParserValue.h"
#include "Parsing/TokenPos.h" #include "Parsing/TokenPos.h"
#include "Utils/ClassUtils.h"
#include <string> #include <string>
@@ -49,11 +48,11 @@ public:
ZoneDefinitionParserValue& operator=(const ZoneDefinitionParserValue& other) = delete; ZoneDefinitionParserValue& operator=(const ZoneDefinitionParserValue& other) = delete;
ZoneDefinitionParserValue& operator=(ZoneDefinitionParserValue&& other) noexcept; ZoneDefinitionParserValue& operator=(ZoneDefinitionParserValue&& other) noexcept;
_NODISCARD bool IsEof() const override; [[nodiscard]] bool IsEof() const override;
_NODISCARD const TokenPos& GetPos() const override; [[nodiscard]] const TokenPos& GetPos() const override;
_NODISCARD char CharacterValue() const; [[nodiscard]] char CharacterValue() const;
_NODISCARD std::string& StringValue() const; [[nodiscard]] std::string& StringValue() const;
_NODISCARD std::string& FieldValue() const; [[nodiscard]] std::string& FieldValue() const;
_NODISCARD size_t FieldHash() const; [[nodiscard]] size_t FieldHash() const;
}; };

5
src/ZoneCommon/Zone/XChunk/XChunkException.h
View File

@@ -1,5 +1,4 @@
#pragma once #pragma once
#include "Utils/ClassUtils.h"
#include <exception> #include <exception>
#include <string> #include <string>
@@ -11,6 +10,6 @@ class XChunkException final : public std::exception
public: public:
explicit XChunkException(std::string message); explicit XChunkException(std::string message);
_NODISCARD char const* what() const noexcept override; [[nodiscard]] char const* what() const noexcept override;
_NODISCARD const std::string& Message() const; [[nodiscard]] const std::string& Message() const;
}; };

21
src/ZoneCommon/Zone/ZoneScriptStrings.h
View File

@@ -1,6 +1,5 @@
#pragma once #pragma once
#include "Utils/ClassUtils.h"
#include "Zone/ZoneTypes.h" #include "Zone/ZoneTypes.h"
#include <cstddef> #include <cstddef>
@@ -24,16 +23,16 @@ public:
void AddScriptString(const std::string& value); void AddScriptString(const std::string& value);
scr_string_t AddOrGetScriptString(const char* value); scr_string_t AddOrGetScriptString(const char* value);
scr_string_t AddOrGetScriptString(const std::string& value); scr_string_t AddOrGetScriptString(const std::string& value);
_NODISCARD scr_string_t GetScriptString(const char* value) const; [[nodiscard]] scr_string_t GetScriptString(const char* value) const;
_NODISCARD scr_string_t GetScriptString(const std::string& value) const; [[nodiscard]] scr_string_t GetScriptString(const std::string& value) const;
_NODISCARD size_t Count() const; [[nodiscard]] size_t Count() const;
_NODISCARD bool Empty() const; [[nodiscard]] bool Empty() const;
_NODISCARD const char* CValue(size_t index) const; [[nodiscard]] const char* CValue(size_t index) const;
_NODISCARD const std::string& Value(size_t index) const; [[nodiscard]] const std::string& Value(size_t index) const;
_NODISCARD const std::string& Value(size_t index, bool& isNull) const; [[nodiscard]] const std::string& Value(size_t index, bool& isNull) const;
_NODISCARD const std::string& operator[](size_t index) const; [[nodiscard]] const std::string& operator[](size_t index) const;
_NODISCARD std::vector<std::string>::const_iterator begin() const; [[nodiscard]] std::vector<std::string>::const_iterator begin() const;
_NODISCARD std::vector<std::string>::const_iterator end() const; [[nodiscard]] std::vector<std::string>::const_iterator end() const;
}; };

1
src/ZoneLoading/Game/T6/ZoneLoaderFactoryT6.cpp
View File

@@ -16,6 +16,7 @@
#include "Loading/Steps/StepVerifyFileName.h" #include "Loading/Steps/StepVerifyFileName.h"
#include "Loading/Steps/StepVerifyMagic.h" #include "Loading/Steps/StepVerifyMagic.h"
#include "Loading/Steps/StepVerifySignature.h" #include "Loading/Steps/StepVerifySignature.h"
#include "Utils/ClassUtils.h"
#include "Utils/Endianness.h" #include "Utils/Endianness.h"
#include "Utils/Logging/Log.h" #include "Utils/Logging/Log.h"
#include "Zone/XChunk/XChunkProcessorInflate.h" #include "Zone/XChunk/XChunkProcessorInflate.h"

1
src/ZoneLoading/ZoneLoading.cpp
View File

@@ -2,7 +2,6 @@
#include "Loading/IZoneLoaderFactory.h" #include "Loading/IZoneLoaderFactory.h"
#include "Loading/ZoneLoader.h" #include "Loading/ZoneLoader.h"
#include "Utils/ObjFileStream.h"
#include <filesystem> #include <filesystem>
#include <format> #include <format>

1
src/ZoneWriting/Game/IW3/ZoneWriterFactoryIW3.cpp
View File

@@ -4,6 +4,7 @@
#include "Game/IW3/GameIW3.h" #include "Game/IW3/GameIW3.h"
#include "Game/IW3/IW3.h" #include "Game/IW3/IW3.h"
#include "Game/IW3/ZoneConstantsIW3.h" #include "Game/IW3/ZoneConstantsIW3.h"
#include "Utils/ClassUtils.h"
#include "Writing/Processor/OutputProcessorDeflate.h" #include "Writing/Processor/OutputProcessorDeflate.h"
#include "Writing/Steps/StepAddOutputProcessor.h" #include "Writing/Steps/StepAddOutputProcessor.h"
#include "Writing/Steps/StepWriteXBlockSizes.h" #include "Writing/Steps/StepWriteXBlockSizes.h"

1
src/ZoneWriting/Game/IW4/ZoneWriterFactoryIW4.cpp
View File

@@ -4,6 +4,7 @@
#include "Game/IW4/GameIW4.h" #include "Game/IW4/GameIW4.h"
#include "Game/IW4/IW4.h" #include "Game/IW4/IW4.h"
#include "Game/IW4/ZoneConstantsIW4.h" #include "Game/IW4/ZoneConstantsIW4.h"
#include "Utils/ClassUtils.h"
#include "Writing/Processor/OutputProcessorDeflate.h" #include "Writing/Processor/OutputProcessorDeflate.h"
#include "Writing/Steps/StepAddOutputProcessor.h" #include "Writing/Steps/StepAddOutputProcessor.h"
#include "Writing/Steps/StepWriteTimestamp.h" #include "Writing/Steps/StepWriteTimestamp.h"

1
src/ZoneWriting/Game/IW5/ZoneWriterFactoryIW5.cpp
View File

@@ -4,6 +4,7 @@
#include "Game/IW5/GameIW5.h" #include "Game/IW5/GameIW5.h"
#include "Game/IW5/IW5.h" #include "Game/IW5/IW5.h"
#include "Game/IW5/ZoneConstantsIW5.h" #include "Game/IW5/ZoneConstantsIW5.h"
#include "Utils/ClassUtils.h"
#include "Writing/Processor/OutputProcessorDeflate.h" #include "Writing/Processor/OutputProcessorDeflate.h"
#include "Writing/Steps/StepAddOutputProcessor.h" #include "Writing/Steps/StepAddOutputProcessor.h"
#include "Writing/Steps/StepWriteTimestamp.h" #include "Writing/Steps/StepWriteTimestamp.h"

1
src/ZoneWriting/Game/T5/ZoneWriterFactoryT5.cpp
View File

@@ -4,6 +4,7 @@
#include "Game/T5/GameT5.h" #include "Game/T5/GameT5.h"
#include "Game/T5/T5.h" #include "Game/T5/T5.h"
#include "Game/T5/ZoneConstantsT5.h" #include "Game/T5/ZoneConstantsT5.h"
#include "Utils/ClassUtils.h"
#include "Writing/Processor/OutputProcessorDeflate.h" #include "Writing/Processor/OutputProcessorDeflate.h"
#include "Writing/Steps/StepAddOutputProcessor.h" #include "Writing/Steps/StepAddOutputProcessor.h"
#include "Writing/Steps/StepWriteXBlockSizes.h" #include "Writing/Steps/StepWriteXBlockSizes.h"

1
src/ZoneWriting/Game/T6/ZoneWriterFactoryT6.cpp
View File

@@ -4,6 +4,7 @@
#include "Game/T6/GameT6.h" #include "Game/T6/GameT6.h"
#include "Game/T6/T6.h" #include "Game/T6/T6.h"
#include "Game/T6/ZoneConstantsT6.h" #include "Game/T6/ZoneConstantsT6.h"
#include "Utils/ClassUtils.h"
#include "Utils/ICapturedDataProvider.h" #include "Utils/ICapturedDataProvider.h"
#include "Writing/Processor/OutputProcessorXChunks.h" #include "Writing/Processor/OutputProcessorXChunks.h"
#include "Writing/Steps/StepAddOutputProcessor.h" #include "Writing/Steps/StepAddOutputProcessor.h"

1
src/ZoneWriting/Writing/Processor/OutputProcessorDeflate.cpp
View File

@@ -1,6 +1,5 @@
#include "OutputProcessorDeflate.h" #include "OutputProcessorDeflate.h"
#include "Utils/ClassUtils.h"
#include "Writing/WritingException.h" #include "Writing/WritingException.h"
#include <cstdint> #include <cstdint>

5
src/ZoneWriting/Writing/WritingException.h
View File

@@ -1,5 +1,4 @@
#pragma once #pragma once
#include "Utils/ClassUtils.h"
#include <exception> #include <exception>
#include <string> #include <string>
@@ -11,6 +10,6 @@ class WritingException final : public std::exception
public: public:
explicit WritingException(std::string message); explicit WritingException(std::string message);
_NODISCARD char const* what() const noexcept override; [[nodiscard]] char const* what() const noexcept override;
_NODISCARD const std::string& Message() const; [[nodiscard]] const std::string& Message() const;
}; };

1
test/ObjLoadingTests/Parsing/Menu/Sequence/EventHandlerSetScopeSequencesTests.cpp
View File

@@ -2,7 +2,6 @@
#include "Parsing/Menu/Domain/EventHandler/CommonEventHandlerSetLocalVar.h" #include "Parsing/Menu/Domain/EventHandler/CommonEventHandlerSetLocalVar.h"
#include "Parsing/Menu/Sequence/EventHandlerSetScopeSequences.h" #include "Parsing/Menu/Sequence/EventHandlerSetScopeSequences.h"
#include "Parsing/Mock/MockLexer.h" #include "Parsing/Mock/MockLexer.h"
#include "Utils/ClassUtils.h"
#include <catch2/catch_test_macros.hpp> #include <catch2/catch_test_macros.hpp>
#include <catch2/generators/catch_generators.hpp> #include <catch2/generators/catch_generators.hpp>

1
test/ObjLoadingTests/Parsing/Menu/Sequence/ItemScopeSequencesTests.cpp
View File

@@ -1,6 +1,5 @@
#include "Parsing/Menu/Sequence/ItemScopeSequences.h" #include "Parsing/Menu/Sequence/ItemScopeSequences.h"
#include "Parsing/Mock/MockLexer.h" #include "Parsing/Mock/MockLexer.h"
#include "Utils/ClassUtils.h"
#include <catch2/catch_test_macros.hpp> #include <catch2/catch_test_macros.hpp>
#include <catch2/generators/catch_generators.hpp> #include <catch2/generators/catch_generators.hpp>

4
test/ParserTestUtils/Parsing/Mock/MockLexer.h
View File

@@ -55,12 +55,12 @@ public:
return !m_tokens.empty() && m_pop_count < m_tokens.size() ? m_tokens[m_pop_count].GetPos() : m_eof.GetPos(); return !m_tokens.empty() && m_pop_count < m_tokens.size() ? m_tokens[m_pop_count].GetPos() : m_eof.GetPos();
} }
_NODISCARD size_t GetPopCount() const [[nodiscard]] size_t GetPopCount() const
{ {
return m_pop_count; return m_pop_count;
} }
_NODISCARD ParserLine GetLineForPos(const TokenPos& pos) const override [[nodiscard]] ParserLine GetLineForPos(const TokenPos& pos) const override
{ {
return ParserLine(); return ParserLine();
} }

3
test/ParserTestUtils/Parsing/Mock/MockPackValueSupplier.h
View File

@@ -1,10 +1,9 @@
#pragma once #pragma once
#include "Parsing/IPackValueSupplier.h" #include "Parsing/IPackValueSupplier.h"
#include "Utils/ClassUtils.h"
class MockPackValueSupplier final : public IPackValueSupplier class MockPackValueSupplier final : public IPackValueSupplier
{ {
public: public:
_NODISCARD int GetCurrentPack() const override; [[nodiscard]] int GetCurrentPack() const override;
}; };

4
test/ParserTestUtils/Parsing/Mock/MockParserLineStream.h
View File

@@ -31,6 +31,6 @@ public:
ParserLine NextLine() override; ParserLine NextLine() override;
bool IncludeFile(const std::string& filename) override; bool IncludeFile(const std::string& filename) override;
void PopCurrentFile() override; void PopCurrentFile() override;
_NODISCARD bool IsOpen() const override; [[nodiscard]] bool IsOpen() const override;
_NODISCARD bool Eof() const override; [[nodiscard]] bool Eof() const override;
}; };

Some files were not shown because too many files have changed in this diff Show More