drinkingtea/jasper
drinkingtea/jasper
2
0
Fork 0
Code Issues 2 Pull Requests Actions Releases Activity

[jasper] Fixes for Olympic update

Browse Source
This commit is contained in:
Gary Talent 2025-04-17 20:20:08 -05:00
parent e2452ab433
commit 311a25e90d
4 changed files with 28 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jasper/modules/core/src/keel/keelmodule.cpp
View File

@ -25,7 +25,7 @@ class CoreModule: public keel::Module {
} }
[[nodiscard]] [[nodiscard]]
ox::Vector<const keel::BaseConverter*> converters() const noexcept override { ox::Vector<keel::Converter> converters() const noexcept override {
return { return {
}; };
} }

51
src/jasper/modules/world/src/keel/keelmodule.cpp
View File

@ -12,37 +12,34 @@
namespace jasper::world { namespace jasper::world {
static class: public keel::Module { static class: public keel::Module {
private:
WorldDocToWorldStaticConverter m_worldDocToWorldStaticConverter;
public: [[nodiscard]]
[[nodiscard]] ox::String id() const noexcept override {
ox::String id() const noexcept override { return ox::String("net.drinkingtea.jasper.world");
return ox::String("net.drinkingtea.jasper.world"); }
}
[[nodiscard]] [[nodiscard]]
ox::Vector<keel::TypeDescGenerator> types() const noexcept override { ox::Vector<keel::TypeDescGenerator> types() const noexcept override {
return { return {
keel::generateTypeDesc<WorldObjectSet>, keel::generateTypeDesc<WorldObjectSet>,
keel::generateTypeDesc<WorldDoc>, keel::generateTypeDesc<WorldDoc>,
keel::generateTypeDesc<WorldStatic>, keel::generateTypeDesc<WorldStatic>,
}; };
} }
[[nodiscard]] [[nodiscard]]
ox::Vector<keel::BaseConverter const*> converters() const noexcept override { ox::Vector<keel::Converter> converters() const noexcept final {
return { return {
&m_worldDocToWorldStaticConverter, keel::Converter::make<convertWorldDocToWorldStatic>(),
}; };
} }
[[nodiscard]] [[nodiscard]]
ox::Vector<keel::PackTransform> packTransforms() const noexcept override { ox::Vector<keel::PackTransform> packTransforms() const noexcept override {
return { return {
keel::transformRule<WorldDoc, WorldStatic>, keel::transformRule<WorldDoc, WorldStatic>,
}; };
} }
} mod; } mod;

4
src/jasper/modules/world/src/keel/typeconv.cpp
View File

@ -6,10 +6,10 @@
namespace jasper::world { namespace jasper::world {
ox::Error WorldDocToWorldStaticConverter::convert( ox::Error convertWorldDocToWorldStatic(
keel::Context &kctx, keel::Context &kctx,
WorldDoc &src, WorldDoc &src,
WorldStatic &dst) const noexcept { WorldStatic &dst) noexcept {
return WorldStaticLoader{kctx, dst, src}.loadWorldStatic(); return WorldStaticLoader{kctx, dst, src}.loadWorldStatic();
} }

4
src/jasper/modules/world/src/keel/typeconv.hpp
View File

@ -10,8 +10,6 @@
namespace jasper::world { namespace jasper::world {
class WorldDocToWorldStaticConverter: public keel::Converter<WorldDoc, WorldStatic> { ox::Error convertWorldDocToWorldStatic(keel::Context &kctx, WorldDoc &src, WorldStatic &dst) noexcept;
ox::Error convert(keel::Context&, WorldDoc &src, WorldStatic &dst) const noexcept final;
};
} }