Deukhoofd
/
CreatureLib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reset on initialization in ScriptAggregator, fixes segfault when calling Reset on an empty Aggregator.
continuous-integration/drone/push Build is passing Details 

Signed-off-by: Deukhoofd <Deukhoofd@gmail.com>
This commit is contained in:
Deukhoofd 2021-04-17 15:08:26 +02:00
parent 33f796eff8
commit 9f091308b0
Signed by: Deukhoofd
GPG Key ID: F63E044490819F6F
2 changed files with 57 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Battling/ScriptHandling/ScriptAggregator.hpp
View File

@ -33,16 +33,22 @@ namespace CreatureLib::Battling {
public: public:
ScriptAggregator() {}; ScriptAggregator() {};
explicit ScriptAggregator(const ArbUt::List<ScriptWrapper> &scripts) explicit ScriptAggregator(const ArbUt::List<ScriptWrapper> &scripts)
: _scripts(scripts.RawData()), _size(scripts.Count()){}; : _scripts(scripts.RawData()), _size(scripts.Count()) {
Reset();
};
inline void Reset() { inline void Reset() {
_index = 0; _index = 0;
if (_size > 0) {
if (_scripts[_index].IsSet()) { if (_scripts[_index].IsSet()) {
_setIndex = -1; _setIndex = -1;
} }
IncrementToNextNotNull(false); IncrementToNextNotNull(false);
} }
}
inline bool HasNext() { return _index < _size; } inline bool HasNext() { return _index < _size; }
std::optional<ArbUt::BorrowedPtr<BattleScript>> GetNextNotNull() { std::optional<ArbUt::BorrowedPtr<BattleScript>> GetNextNotNull() {

5
tests/BattleTests/ScriptTests/ScriptAggregatorTests.cpp
View File

@ -13,9 +13,11 @@ private:
public: public:
explicit TestScript(const ArbUt::StringView &name) : _name(name) {}; explicit TestScript(const ArbUt::StringView &name) : _name(name) {};
const ArbUt::StringView &GetName() const noexcept override { return _name; } const ArbUt::StringView &GetName() const noexcept override { return _name; }
void TestMethod(int &runCount) { runCount++; } void TestMethod(int &runCount) { runCount++; }
BattleScript *Clone() override { return new TestScript(_name); } BattleScript *Clone() override { return new TestScript(_name); }
}; };
@ -95,7 +97,8 @@ TEST_CASE("Script Aggregator properly iterates data of Script and Script Set.")
set.Add(script2); set.Add(script2);
set.Add(script3); set.Add(script3);
auto vec = auto vec =
ArbUt::List<ScriptWrapper>{ScriptWrapper::FromScript(reinterpret_cast<std::unique_ptr<BattleScript>*>(&script)), ArbUt::List<ScriptWrapper>{
ScriptWrapper::FromScript(reinterpret_cast<std::unique_ptr<BattleScript> *>(&script)),
ScriptWrapper::FromSet(&set)}; ScriptWrapper::FromSet(&set)};
auto aggr = ScriptAggregator(vec); auto aggr = ScriptAggregator(vec);
while (aggr.HasNext()) { while (aggr.HasNext()) {