include cleanup

This commit is contained in:
Asuro
2025-03-30 20:17:32 +02:00
parent 052fc2cc07
commit 6d170be57a
28 changed files with 173 additions and 379 deletions

View File

@@ -9,7 +9,7 @@
#include <winnt.h>
#define WIN32_LEAN_AND_MEAN
#include "Windows.h"
#include "Windows.h" // IWYU pragma: keep
namespace WriteTemplates
{
@@ -17,7 +17,7 @@ namespace WriteTemplates
R"END(#pragma once
#include <cstdint>
namespace Generated
namespace Gen
{
struct Serializer;
struct Deserializer;
@@ -25,7 +25,7 @@ namespace Generated
constexpr char FileCppStart[] = R"END(#include "Def.h"
#include "Generated.h"
namespace Generated
namespace Gen
{
)END";
@@ -171,9 +171,9 @@ void CppFileWriter::PrintTypeName(char* buf,
{
if (type.FieldKind == Def::EFieldType::Native)
{
if (int32_t(type.Native) < Generated::KnownType::EntryCount)
if (int32_t(type.Native) < Gen::KnownType::EntryCount)
{
bx::strCopy(buf, bufSize, Generated::KnownType::CName[size_t(type.Native)]);
bx::strCopy(buf, bufSize, Gen::KnownType::CName[size_t(type.Native)]);
}
else
{
@@ -201,7 +201,7 @@ void CppFileWriter::WriteEnums(const Def::DefinitionFile& definitions)
e.Name,
e.EntryCount,
e.Hash,
Generated::KnownType::CName[(int32_t)e.EnumType.Native]);
Gen::KnownType::CName[(int32_t)e.EnumType.Native]);
for (int32_t entryIdx = 0; entryIdx < e.EntryCount; ++entryIdx)
{
Write(WriteTemplates::EnumField1, e.EntryNames[entryIdx]);

View File

@@ -4,7 +4,7 @@
template bool Save<T>(const T* obj, uint32_t count, Serializer& serializer); \
template bool Load<T>(T * obj, uint32_t count, Deserializer & serializer);
namespace Generated
namespace Gen
{
template <typename T> bool Save(const T* obj, uint32_t count, Serializer& serializer)
{
@@ -38,4 +38,4 @@ namespace Generated
INST(double)
INST(bool)
INST(char)
} // namespace Generated
} // namespace Gen

View File

@@ -10,7 +10,7 @@
#define LOG_ERROR(...)
#endif
namespace Generated
namespace Gen
{
struct EmbeddedTypeDef
{
@@ -122,4 +122,4 @@ namespace Generated
template <typename T> bool Save(const T* obj, uint32_t count, Serializer& serializer);
template <typename T> bool Load(T* obj, uint32_t count, Deserializer& serializer);
} // namespace Generated
} // namespace Gen

View File

@@ -1,7 +1,7 @@
#include "Def.h"
#include "Generated.h"
namespace Generated
namespace Gen
{
bool Save(const KnownType::Enum* obj, uint32_t count, Serializer& serializer)
{

View File

@@ -1,7 +1,7 @@
#pragma once
#include <cstdint>
namespace Generated
namespace Gen
{
struct Serializer;
struct Deserializer;

View File

@@ -348,12 +348,12 @@ Parser::Result Parser::ReadTypeToken()
Parser::Result Parser::ReadNativeFieldType(Def::FieldType& FieldT)
{
Result Res = OK;
for (int32_t i = 0; i < Generated::KnownType::EntryCount; ++i)
for (int32_t i = 0; i < Gen::KnownType::EntryCount; ++i)
{
if (CmpAdvance(Generated::KnownType::EntryNames[i], Res, true) && Res == OK)
if (CmpAdvance(Gen::KnownType::EntryNames[i], Res, true) && Res == OK)
{
FieldT.FieldKind = Def::EFieldType::Native;
FieldT.Native = Generated::KnownType::Enum(i);
FieldT.Native = Gen::KnownType::Enum(i);
return OK;
}
}

View File

@@ -16,7 +16,7 @@ namespace Def
struct FieldType
{
EFieldType FieldKind = EFieldType::Native;
Generated::KnownType::Enum Native = Generated::KnownType::Enum::i32;
Gen::KnownType::Enum Native = Gen::KnownType::Enum::i32;
uint16_t TypeIdx = UINT16_MAX;
};