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

chore: replace all usages of removed ClassUtils macros

Browse Source
This commit is contained in:
Jan Laupetin
2026-03-05 22:31:07 +00:00
parent bc16febfe2
commit 90d7f92ddd
104 changed files with 244 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Parser/Parsing/Impl/AbstractLexer.h
-1
View File
@@ -3,7 +3,6 @@
#include "Parsing/ILexer.h"
#include "Parsing/IParserLineStream.h"
#include "Parsing/ParsingException.h"
#include "Utils/ClassUtils.h"
#include "Utils/StringUtils.h"
#include <cassert>
src/Parser/Parsing/Impl/CommentRemovingStreamProxy.h
+2 -2
View File
@@ -14,6 +14,6 @@ public:
ParserLine NextLine() override;
bool IncludeFile(const std::string& filename) override;
void PopCurrentFile() override;
_NODISCARD bool IsOpen() const override;
_NODISCARD bool Eof() const override;
[[nodiscard]] bool IsOpen() const override;
[[nodiscard]] bool Eof() const override;
};
src/Parser/Parsing/Impl/IncludingStreamProxy.h
+6 -6
View File
@@ -15,11 +15,11 @@ class IncludingStreamProxy final : public AbstractDirectiveStreamProxy
IParserLineStream* const m_stream;
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);
_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 MatchDirectives(const ParserLine& line);
[[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 MatchDirectives(const ParserLine& line);
public:
explicit IncludingStreamProxy(IParserLineStream* stream);
@@ -27,6 +27,6 @@ public:
ParserLine NextLine() override;
bool IncludeFile(const std::string& filename) override;
void PopCurrentFile() override;
_NODISCARD bool IsOpen() const override;
_NODISCARD bool Eof() const override;
[[nodiscard]] bool IsOpen() const override;
[[nodiscard]] bool Eof() const override;
};
src/Parser/Parsing/Impl/PackDefinitionStreamProxy.h
+5 -6
View File
@@ -3,7 +3,6 @@
#include "AbstractDirectiveStreamProxy.h"
#include "Parsing/IPackValueSupplier.h"
#include "Parsing/IParserLineStream.h"
#include "Utils/ClassUtils.h"
#include <stack>
@@ -21,8 +20,8 @@ private:
IParserLineStream* const m_stream;
std::stack<int> m_current_pack;
_NODISCARD bool MatchPackDirective(const ParserLine& line, size_t directiveStartPosition, size_t directiveEndPosition);
_NODISCARD bool MatchDirectives(const ParserLine& line);
[[nodiscard]] bool MatchPackDirective(const ParserLine& line, size_t directiveStartPosition, size_t directiveEndPosition);
[[nodiscard]] bool MatchDirectives(const ParserLine& line);
public:
explicit PackDefinitionStreamProxy(IParserLineStream* stream);
@@ -30,8 +29,8 @@ public:
ParserLine NextLine() override;
bool IncludeFile(const std::string& filename) override;
void PopCurrentFile() override;
_NODISCARD bool IsOpen() const override;
_NODISCARD bool Eof() const override;
[[nodiscard]] bool IsOpen() const override;
[[nodiscard]] bool Eof() const override;
_NODISCARD int GetCurrentPack() const override;
[[nodiscard]] int GetCurrentPack() const override;
};
src/Parser/Parsing/Impl/ParserFilesystemStream.h
+2 -2
View File
@@ -25,6 +25,6 @@ public:
ParserLine NextLine() override;
bool IncludeFile(const std::string& filename) override;
void PopCurrentFile() override;
_NODISCARD bool IsOpen() const override;
_NODISCARD bool Eof() const override;
[[nodiscard]] bool IsOpen() const override;
[[nodiscard]] bool Eof() const override;
};
src/Parser/Parsing/Impl/ParserMultiInputStream.h
+2 -2
View File
@@ -24,8 +24,8 @@ public:
ParserLine NextLine() override;
bool IncludeFile(const std::string& filename) override;
void PopCurrentFile() override;
_NODISCARD bool IsOpen() const override;
_NODISCARD bool Eof() const override;
[[nodiscard]] bool IsOpen() const override;
[[nodiscard]] bool Eof() const override;
private:
class FileInfo
src/Parser/Parsing/Impl/ParserSingleInputStream.h
+2 -2
View File
@@ -17,6 +17,6 @@ public:
ParserLine NextLine() override;
bool IncludeFile(const std::string& filename) override;
void PopCurrentFile() override;
_NODISCARD bool IsOpen() const override;
_NODISCARD bool Eof() const override;
[[nodiscard]] bool IsOpen() const override;
[[nodiscard]] bool Eof() const override;
};
src/Parser/Parsing/Impl/SkipUntilFirstNonEmptyProxy.h
+2 -2
View File
@@ -10,8 +10,8 @@ public:
ParserLine NextLine() override;
bool IncludeFile(const std::string& filename) override;
void PopCurrentFile() override;
_NODISCARD bool IsOpen() const override;
_NODISCARD bool Eof() const override;
[[nodiscard]] bool IsOpen() const override;
[[nodiscard]] bool Eof() const override;
private:
IParserLineStream* const m_stream;