zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-03-16 01:43:04 +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

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

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

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

@@ -1,7 +1,6 @@
#pragma once
#include "TokenPos.h"
#include "Utils/ClassUtils.h"
class IParserValue
{
@@ -15,6 +14,6 @@ public:
IParserValue& operator=(const IParserValue& other) = default;
IParserValue& operator=(IParserValue&& other) noexcept = default;
_NODISCARD virtual bool IsEof() const = 0;
_NODISCARD virtual const TokenPos& GetPos() const = 0;
[[nodiscard]] virtual bool IsEof() 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/IParserLineStream.h"
#include "Parsing/ParsingException.h"
#include "Utils/ClassUtils.h"
#include "Utils/StringUtils.h"
#include <cassert>

4
src/Parser/Parsing/Impl/CommentRemovingStreamProxy.h
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;
};

12
src/Parser/Parsing/Impl/IncludingStreamProxy.h
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;
};

11
src/Parser/Parsing/Impl/PackDefinitionStreamProxy.h
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;
};

4
src/Parser/Parsing/Impl/ParserFilesystemStream.h
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;
};

4
src/Parser/Parsing/Impl/ParserMultiInputStream.h
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

4
src/Parser/Parsing/Impl/ParserSingleInputStream.h
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;
};

4
src/Parser/Parsing/Impl/SkipUntilFirstNonEmptyProxy.h
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;

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

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

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

@@ -2,7 +2,6 @@
#include "AbstractMatcher.h"
#include "Parsing/IParserValue.h"
#include "Utils/ClassUtils.h"
#include <cassert>
@@ -19,7 +18,7 @@ public:
IMatcherForLabelSupplier& operator=(const IMatcherForLabelSupplier& other) = 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>

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

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

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

@@ -1,7 +1,6 @@
#pragma once
#include "TokenPos.h"
#include "Utils/ClassUtils.h"
#include <exception>
#include <string>
@@ -15,8 +14,8 @@ class ParsingException final : public std::exception
public:
ParsingException(TokenPos position, std::string message);
_NODISCARD TokenPos Position() const;
_NODISCARD const std::string& Message() const;
_NODISCARD std::string FullMessage() const;
_NODISCARD char const* what() const noexcept override;
[[nodiscard]] TokenPos Position() const;
[[nodiscard]] const std::string& Message() const;
[[nodiscard]] std::string FullMessage() const;
[[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/MatcherLabel.h"
#include "SequenceResult.h"
#include "Utils/ClassUtils.h"
#include <cassert>
#include <unordered_map>
@@ -59,7 +58,7 @@ public:
AbstractSequence& operator=(const AbstractSequence& other) = 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)
return m_entry.get();
@@ -72,7 +71,7 @@ public:
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)
return false;

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

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

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

@@ -1,7 +1,5 @@
#pragma once
#include "Utils/ClassUtils.h"
#include <string>
class SimpleExpressionValue;
@@ -18,7 +16,7 @@ public:
ISimpleExpressionScopeValues& operator=(const ISimpleExpressionScopeValues& other) = 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
@@ -33,10 +31,10 @@ public:
ISimpleExpression& operator=(const ISimpleExpression& other) = default;
ISimpleExpression& operator=(ISimpleExpression&& other) noexcept = default;
_NODISCARD virtual bool Equals(const ISimpleExpression* other) const = 0;
_NODISCARD virtual bool IsStatic() const = 0;
_NODISCARD virtual SimpleExpressionValue EvaluateStatic() const = 0;
_NODISCARD virtual SimpleExpressionValue EvaluateNonStatic(const ISimpleExpressionScopeValues* scopeValues) const = 0;
[[nodiscard]] virtual bool Equals(const ISimpleExpression* other) const = 0;
[[nodiscard]] virtual bool IsStatic() const = 0;
[[nodiscard]] virtual SimpleExpressionValue EvaluateStatic() const = 0;
[[nodiscard]] virtual SimpleExpressionValue EvaluateNonStatic(const ISimpleExpressionScopeValues* scopeValues) const = 0;
};
// 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> operand2);
_NODISCARD bool Operand1NeedsParenthesis() const;
_NODISCARD bool Operand2NeedsParenthesis() const;
[[nodiscard]] bool Operand1NeedsParenthesis() const;
[[nodiscard]] bool Operand2NeedsParenthesis() const;
_NODISCARD bool Equals(const ISimpleExpression* other) const override;
_NODISCARD bool IsStatic() const override;
_NODISCARD SimpleExpressionValue EvaluateStatic() const override;
_NODISCARD SimpleExpressionValue EvaluateNonStatic(const ISimpleExpressionScopeValues* scopeValues) const override;
[[nodiscard]] bool Equals(const ISimpleExpression* other) const override;
[[nodiscard]] bool IsStatic() const override;
[[nodiscard]] SimpleExpressionValue EvaluateStatic() 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
#include "ISimpleExpression.h"
class SimpleExpressionConditionalOperator final : public ISimpleExpression
@@ -8,10 +9,10 @@ public:
std::unique_ptr<ISimpleExpression> m_true_value;
std::unique_ptr<ISimpleExpression> m_false_value;
_NODISCARD bool Equals(const ISimpleExpression* other) const override;
_NODISCARD bool IsStatic() const override;
_NODISCARD SimpleExpressionValue EvaluateStatic() const override;
_NODISCARD SimpleExpressionValue EvaluateNonStatic(const ISimpleExpressionScopeValues* scopeValues) const override;
[[nodiscard]] bool Equals(const ISimpleExpression* other) const override;
[[nodiscard]] bool IsStatic() const override;
[[nodiscard]] SimpleExpressionValue EvaluateStatic() const override;
[[nodiscard]] SimpleExpressionValue EvaluateNonStatic(const ISimpleExpressionScopeValues* scopeValues) const override;
SimpleExpressionConditionalOperator();
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 "SimpleExpressionBinaryOperation.h"
#include "SimpleExpressionUnaryOperation.h"
#include "Utils/ClassUtils.h"
#include <Parsing/Simple/SimpleLexer.h>
#include <memory>
@@ -47,8 +46,8 @@ protected:
virtual std::unique_ptr<matcher_t> ParseOperandExtension(const supplier_t* labelSupplier) const;
virtual std::unique_ptr<ISimpleExpression> ProcessOperandExtension(SequenceResult<SimpleParserValue>& result) const;
_NODISCARD virtual std::vector<const SimpleExpressionUnaryOperationType*> EnabledUnaryOperations() const;
_NODISCARD virtual std::vector<const SimpleExpressionBinaryOperationType*> EnabledBinaryOperations() const;
[[nodiscard]] virtual std::vector<const SimpleExpressionUnaryOperationType*> EnabledUnaryOperations() const;
[[nodiscard]] virtual std::vector<const SimpleExpressionBinaryOperationType*> EnabledBinaryOperations() const;
private:
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);
_NODISCARD bool Equals(const ISimpleExpression* other) const override;
_NODISCARD bool IsStatic() const override;
_NODISCARD SimpleExpressionValue EvaluateStatic() const override;
_NODISCARD SimpleExpressionValue EvaluateNonStatic(const ISimpleExpressionScopeValues* scopeValues) const override;
[[nodiscard]] bool Equals(const ISimpleExpression* other) const override;
[[nodiscard]] bool IsStatic() const override;
[[nodiscard]] SimpleExpressionValue EvaluateStatic() 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);
_NODISCARD bool OperandNeedsParenthesis() const;
[[nodiscard]] bool OperandNeedsParenthesis() const;
_NODISCARD bool Equals(const ISimpleExpression* other) const override;
_NODISCARD bool IsStatic() const override;
_NODISCARD SimpleExpressionValue EvaluateStatic() const override;
_NODISCARD SimpleExpressionValue EvaluateNonStatic(const ISimpleExpressionScopeValues* scopeValues) const override;
[[nodiscard]] bool Equals(const ISimpleExpression* other) const override;
[[nodiscard]] bool IsStatic() const override;
[[nodiscard]] SimpleExpressionValue EvaluateStatic() 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
#include "ISimpleExpression.h"
#include "Utils/ClassUtils.h"
#include <memory>
#include <string>
@@ -31,9 +30,9 @@ public:
explicit SimpleExpressionValue(double doubleValue);
explicit SimpleExpressionValue(int intValue);
_NODISCARD bool Equals(const ISimpleExpression* other) const override;
_NODISCARD bool IsStatic() const override;
_NODISCARD SimpleExpressionValue EvaluateStatic() const override;
_NODISCARD SimpleExpressionValue EvaluateNonStatic(const ISimpleExpressionScopeValues* scopeValues) const override;
_NODISCARD bool IsTruthy() const;
[[nodiscard]] bool Equals(const ISimpleExpression* other) const override;
[[nodiscard]] bool IsStatic() const override;
[[nodiscard]] SimpleExpressionValue EvaluateStatic() const override;
[[nodiscard]] SimpleExpressionValue EvaluateNonStatic(const ISimpleExpressionScopeValues* scopeValues) const override;
[[nodiscard]] bool IsTruthy() const;
};

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

@@ -3,7 +3,6 @@
#include "Expression/SimpleExpressionMatchers.h"
#include "Matcher/SimpleMatcherFactory.h"
#include "Parsing/Impl/AbstractParser.h"
#include "Utils/ClassUtils.h"
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);
}

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

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