Skip to content

Commit 9f65281

Browse files
committed
Fix Unserialize => Deserialize
1 parent 548f240 commit 9f65281

File tree

11 files changed

+210
-210
lines changed

11 files changed

+210
-210
lines changed

include/NZSL/Ast/AstSerializer.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -170,13 +170,13 @@ namespace nzsl::Ast
170170
AbstractSerializer& m_serializer;
171171
};
172172

173-
class NZSL_API ShaderAstUnserializer final : public SerializerBase
173+
class NZSL_API ShaderAstDeserializer final : public SerializerBase
174174
{
175175
public:
176-
ShaderAstUnserializer(AbstractUnserializer& stream);
177-
~ShaderAstUnserializer() = default;
176+
ShaderAstDeserializer(AbstractDeserializer& stream);
177+
~ShaderAstDeserializer() = default;
178178

179-
ModulePtr Unserialize();
179+
ModulePtr Deserialize();
180180

181181
private:
182182
using SerializerBase::Serialize;
@@ -214,12 +214,12 @@ namespace nzsl::Ast
214214
void Value(std::uint64_t& val) override;
215215

216216
std::vector<std::shared_ptr<const std::string>> m_strings;
217-
AbstractUnserializer& m_unserializer;
217+
AbstractDeserializer& m_deserializer;
218218
std::uint32_t m_version;
219219
};
220220

221221
NZSL_API void SerializeShader(AbstractSerializer& serializer, const Module& shader);
222-
NZSL_API ModulePtr UnserializeShader(AbstractUnserializer& unserializer);
222+
NZSL_API ModulePtr DeserializeShader(AbstractDeserializer& deserializer);
223223
}
224224

225225
#include <NZSL/Ast/AstSerializer.inl>

include/NZSL/Ast/AstSerializer.inl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,8 @@ namespace nzsl::Ast
225225
{
226226
}
227227

228-
inline ShaderAstUnserializer::ShaderAstUnserializer(AbstractUnserializer& unserializer) :
229-
m_unserializer(unserializer)
228+
inline ShaderAstDeserializer::ShaderAstDeserializer(AbstractDeserializer& deserializer) :
229+
m_deserializer(deserializer)
230230
{
231231
}
232232
}

include/NZSL/Serializer.hpp

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -32,23 +32,23 @@ namespace nzsl
3232
virtual void Serialize(const std::string& value);
3333
};
3434

35-
class NZSL_API AbstractUnserializer
35+
class NZSL_API AbstractDeserializer
3636
{
3737
public:
38-
virtual ~AbstractUnserializer();
39-
40-
virtual void Unserialize(bool& value);
41-
virtual void Unserialize(double& value);
42-
virtual void Unserialize(float& value);
43-
virtual void Unserialize(std::int8_t& value);
44-
virtual void Unserialize(std::int16_t& value);
45-
virtual void Unserialize(std::int32_t& value);
46-
virtual void Unserialize(std::int64_t& value);
47-
virtual void Unserialize(std::uint8_t& value) = 0;
48-
virtual void Unserialize(std::uint16_t& value) = 0;
49-
virtual void Unserialize(std::uint32_t& value) = 0;
50-
virtual void Unserialize(std::uint64_t& value) = 0;
51-
virtual void Unserialize(std::string& value);
38+
virtual ~AbstractDeserializer();
39+
40+
virtual void Deserialize(bool& value);
41+
virtual void Deserialize(double& value);
42+
virtual void Deserialize(float& value);
43+
virtual void Deserialize(std::int8_t& value);
44+
virtual void Deserialize(std::int16_t& value);
45+
virtual void Deserialize(std::int32_t& value);
46+
virtual void Deserialize(std::int64_t& value);
47+
virtual void Deserialize(std::uint8_t& value) = 0;
48+
virtual void Deserialize(std::uint16_t& value) = 0;
49+
virtual void Deserialize(std::uint32_t& value) = 0;
50+
virtual void Deserialize(std::uint64_t& value) = 0;
51+
virtual void Deserialize(std::string& value);
5252
};
5353

5454
class NZSL_API Serializer : public AbstractSerializer
@@ -74,22 +74,22 @@ namespace nzsl
7474
std::vector<std::uint8_t> m_data;
7575
};
7676

77-
class NZSL_API Unserializer : public AbstractUnserializer
77+
class NZSL_API Deserializer : public AbstractDeserializer
7878
{
7979
public:
80-
inline Unserializer(const void* data, std::size_t dataSize);
81-
Unserializer(const Unserializer&) = default;
82-
Unserializer(Unserializer&&) noexcept = default;
83-
~Unserializer() = default;
84-
85-
using AbstractUnserializer::Unserialize;
86-
void Unserialize(std::uint8_t& value) override;
87-
void Unserialize(std::uint16_t& value) override;
88-
void Unserialize(std::uint32_t& value) override;
89-
void Unserialize(std::uint64_t& value) override;
90-
91-
Unserializer& operator=(const Unserializer&) = default;
92-
Unserializer& operator=(Unserializer&&) noexcept = default;
80+
inline Deserializer(const void* data, std::size_t dataSize);
81+
Deserializer(const Deserializer&) = default;
82+
Deserializer(Deserializer&&) noexcept = default;
83+
~Deserializer() = default;
84+
85+
using AbstractDeserializer::Deserialize;
86+
void Deserialize(std::uint8_t& value) override;
87+
void Deserialize(std::uint16_t& value) override;
88+
void Deserialize(std::uint32_t& value) override;
89+
void Deserialize(std::uint64_t& value) override;
90+
91+
Deserializer& operator=(const Deserializer&) = default;
92+
Deserializer& operator=(Deserializer&&) noexcept = default;
9393

9494
private:
9595
const std::uint8_t* m_ptr;

include/NZSL/Serializer.inl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace nzsl
1111
return m_data;
1212
}
1313

14-
inline Unserializer::Unserializer(const void* data, std::size_t dataSize)
14+
inline Deserializer::Deserializer(const void* data, std::size_t dataSize)
1515
{
1616
m_ptr = static_cast<const std::uint8_t*>(data);
1717
m_ptrEnd = m_ptr + dataSize;

0 commit comments

Comments
 (0)