Skip to content

code gen for class generation #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 5, 2025
Merged

code gen for class generation #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dc638f2
code gen based class creation for deserialisation
Angel-foxxo Jun 3, 2025
31c3bd1
this should make it work in nuget?
Angel-foxxo Jun 3, 2025
952570a
remove debug output
Angel-foxxo Jun 3, 2025
628abd9
fix some things + nuget stuff
Angel-foxxo Jun 4, 2025
e75ca55
Version 0.9-beta
kristiker Jun 5, 2025
14a7064
`dotnet format`
kristiker Jun 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Datamodel.NET.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Datamodel.NET", "Datamodel.
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests", "Tests\Tests.csproj", "{4C928D60-5E48-4C0D-9C7E-C75D9734CD58}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ElementFactoryGenerator", "ElementFactoryGenerator\ElementFactoryGenerator.csproj", "{FE0CDDEB-F817-0758-1DFC-A472CC81F0F3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -25,6 +27,12 @@ Global
{4C928D60-5E48-4C0D-9C7E-C75D9734CD58}.Documentation|Any CPU.Build.0 = Debug|Any CPU
{4C928D60-5E48-4C0D-9C7E-C75D9734CD58}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4C928D60-5E48-4C0D-9C7E-C75D9734CD58}.Release|Any CPU.Build.0 = Release|Any CPU
{FE0CDDEB-F817-0758-1DFC-A472CC81F0F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FE0CDDEB-F817-0758-1DFC-A472CC81F0F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FE0CDDEB-F817-0758-1DFC-A472CC81F0F3}.Documentation|Any CPU.ActiveCfg = Release|Any CPU
{FE0CDDEB-F817-0758-1DFC-A472CC81F0F3}.Documentation|Any CPU.Build.0 = Release|Any CPU
{FE0CDDEB-F817-0758-1DFC-A472CC81F0F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FE0CDDEB-F817-0758-1DFC-A472CC81F0F3}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
8 changes: 4 additions & 4 deletions Datamodel.NET/Arrays.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,8 @@ internal set
if (elem.Owner == null)
{
var importedElement = OwnerDatamodel.ImportElement(elem, Datamodel.ImportRecursionMode.Stubs, Datamodel.ImportOverwriteMode.Stubs);
if(importedElement is not null)

if (importedElement is not null)
{
Inner[i] = importedElement;
}
Expand All @@ -201,8 +201,8 @@ protected override void Insert_Internal(int index, Element item)
if (item.Owner == null)
{
var importedElement = OwnerDatamodel.ImportElement(item, Datamodel.ImportRecursionMode.Recursive, Datamodel.ImportOverwriteMode.Stubs);
if(importedElement is not null)

if (importedElement is not null)
{
item = importedElement;
}
Expand Down
14 changes: 7 additions & 7 deletions Datamodel.NET/AttributeList.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ private ICollection<Attribute> GetPropertyBasedAttributes(bool useSerializationN
var result = new List<Attribute>();
foreach (DictionaryEntry entry in PropertyInfos)
{
if(entry.Value is null)
if (entry.Value is null)
{
throw new InvalidDataException("Property value can not be null");
}
Expand Down Expand Up @@ -135,7 +135,7 @@ public void Add(string key, object? value)
{
var attrib = Inner[key];

if(attrib is null)
if (attrib is null)
{
return null;
}
Expand Down Expand Up @@ -269,7 +269,7 @@ public virtual object? this[string name]
{
// were actually fine with this being null, it will just set the value to null
// but need to check so the type check doesn't fail if it is null
if(value != null)
if (value != null)
{
var valueType = value.GetType();

Expand Down Expand Up @@ -307,7 +307,7 @@ public virtual object? this[string name]

return;
}

Attribute? old_attr;
Attribute? new_attr;
int old_index = -1;
Expand Down Expand Up @@ -343,7 +343,7 @@ public AttrKVP this[int index]
{
var attr = (Attribute?)Inner[index];

if(attr is null)
if (attr is null)
{
throw new InvalidOperationException($"attribute at index {index} doesn't exist");
}
Expand All @@ -367,7 +367,7 @@ public void RemoveAt(int index)
{
attr = (Attribute?)Inner[index];

if(attr is not null)
if (attr is not null)
{
attr.Owner = null;
Inner.RemoveAt(index);
Expand Down Expand Up @@ -571,7 +571,7 @@ public static ValueComparer Default

public new bool Equals(object? x, object? y)
{
if(x is null || y is null)
if (x is null || y is null)
{
return false;
}
Expand Down
193 changes: 108 additions & 85 deletions Datamodel.NET/Codecs/Binary.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
using System.Numerics;
using System.IO;
using System.Diagnostics;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Threading;

namespace Datamodel.Codecs
{
Expand Down Expand Up @@ -249,96 +249,116 @@
encoder.Encode();
}

float[] ReadVector(int dim, BinaryReader reader)
private static readonly Dictionary<RuntimeTypeHandle, int> TypeMap = new Dictionary<RuntimeTypeHandle, int>
{
var output = new float[dim];
foreach (int i in Enumerable.Range(0, dim))
output[i] = reader.ReadSingle();
return output;
{ typeof(Element).TypeHandle, 0 },
{ typeof(int).TypeHandle, 1 },
{ typeof(float).TypeHandle, 2 },
{ typeof(bool).TypeHandle, 3 },
{ typeof(string).TypeHandle, 4 },
{ typeof(byte[]).TypeHandle, 5 },
{ typeof(TimeSpan).TypeHandle, 6 },
{ typeof(Color).TypeHandle, 7 },
{ typeof(Vector2).TypeHandle, 8 },
{ typeof(Vector3).TypeHandle, 9 },
{ typeof(QAngle).TypeHandle, 10 },
{ typeof(Vector4).TypeHandle, 11 },
{ typeof(Quaternion).TypeHandle, 12 },
{ typeof(Matrix4x4).TypeHandle, 13 },
{ typeof(byte).TypeHandle, 14 },
{ typeof(UInt64).TypeHandle, 15 }
};

[MethodImpl(MethodImplOptions.AggressiveInlining)]
object? ReadValue(Datamodel dm, int typeIndex, bool raw_string, BinaryReader reader)
{
return typeIndex switch
{
0 => ReadElement(dm, reader),
1 => reader.ReadInt32(),
2 => reader.ReadSingle(),
3 => reader.ReadBoolean(),
4 => raw_string ? ReadString_Raw(reader) : StringDict!.ReadString(reader),
5 => reader.ReadBytes(reader.ReadInt32()),
6 => TimeSpan.FromTicks(reader.ReadInt32() * (TimeSpan.TicksPerSecond / DatamodelTicksPerSecond)),
7 => ReadColor(reader),
8 => ReadVector2(reader),
9 => ReadVector3(reader),
10 => ReadQAngle(reader),
11 => ReadVector4(reader),
12 => ReadQuaternion(reader),
13 => ReadMatrix4x4(reader),
14 => reader.ReadByte(),
15 => reader.ReadUInt64(),
_ => throw new ArgumentException("Cannot read value of type")
};
}

object? ReadValue(Datamodel dm, Type? type, bool raw_string, BinaryReader reader)
// Specialized methods to avoid repeated vector allocations
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private object? ReadElement(Datamodel dm, BinaryReader reader)
{
if (type == typeof(Element))
var index = reader.ReadInt32();
return index switch
{
var index = reader.ReadInt32();
if (index == -1)
return null;
else if (index == -2)
{
var id = new Guid(ReadString_Raw(reader)); // yes, it's in ASCII!
return dm.AllElements[id] ?? new Element(dm, id);
}
else
return dm.AllElements[index];
}
if (type == typeof(int))
return reader.ReadInt32();
if (type == typeof(float))
return reader.ReadSingle();
if (type == typeof(bool))
return reader.ReadBoolean();
if (type == typeof(string))
return raw_string ? ReadString_Raw(reader) : StringDict!.ReadString(reader);

if (type == typeof(byte[]))
return reader.ReadBytes(reader.ReadInt32());
if (type == typeof(TimeSpan))
return TimeSpan.FromTicks(reader.ReadInt32() * (TimeSpan.TicksPerSecond / DatamodelTicksPerSecond));
-1 => null,
-2 => dm.AllElements[new Guid(StringDict.ReadString(reader))] ?? new Element(dm, new Guid(StringDict.ReadString(reader))),

Check warning on line 305 in Datamodel.NET/Codecs/Binary.cs

View workflow job for this annotation

GitHub Actions / build 

Dereference of a possibly null reference.
_ => dm.AllElements[index]
};
}

if (type == typeof(Color))
{
var rgba = reader.ReadBytes(4);
return Color.FromBytes(rgba);
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static Color ReadColor(BinaryReader reader)
{
var rgba = reader.ReadBytes(4);
return Color.FromBytes(rgba);
}

if (type == typeof(Vector2))
{
var ords = ReadVector(2, reader);
return new Vector2(ords[0], ords[1]);
}
if (type == typeof(Vector3))
{
var ords = ReadVector(3, reader);
return new Vector3(ords[0], ords[1], ords[2]);
}
if (type == typeof(QAngle))
{
var ords = ReadVector(3, reader);
return new QAngle(ords[0], ords[1], ords[2]);
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static Vector2 ReadVector2(BinaryReader reader)
{
return new Vector2(reader.ReadSingle(), reader.ReadSingle());
}

if (type == typeof(Vector4))
{
var ords = ReadVector(4, reader);
return new Vector4(ords[0], ords[1], ords[2], ords[3]);
}
if (type == typeof(Quaternion))
{
var ords = ReadVector(4, reader);
return new Quaternion(ords[0], ords[1], ords[2], ords[3]);
}
if (type == typeof(Matrix4x4))
{
var ords = ReadVector(4 * 4, reader);
return new Matrix4x4(
ords[0], ords[1], ords[2], ords[3],
ords[4], ords[5], ords[6], ords[7],
ords[8], ords[9], ords[10], ords[11],
ords[12], ords[13], ords[14], ords[15]);
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static Vector3 ReadVector3(BinaryReader reader)
{
return new Vector3(reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle());
}

if (type == typeof(byte))
return reader.ReadByte();
if (type == typeof(UInt64))
return reader.ReadUInt64();
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static QAngle ReadQAngle(BinaryReader reader)
{
return new QAngle(reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle());
}

throw new ArgumentException(type == null ? "No type provided to GetValue()" : "Cannot read value of type " + type.Name);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static Vector4 ReadVector4(BinaryReader reader)
{
return new Vector4(reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle());
}

[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static Quaternion ReadQuaternion(BinaryReader reader)
{
return new Quaternion(reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle());
}

[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static Matrix4x4 ReadMatrix4x4(BinaryReader reader)
{
// Read all 16 floats directly without intermediate array
return new Matrix4x4(
reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle(),
reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle(),
reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle(),
reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle());
}

public Datamodel Decode(string encoding, int encoding_version, string format, int format_version, Stream stream, DeferredMode defer_mode, ReflectionParams reflectionParams)
{
var types = CodecUtilities.GetReflectionTypes(reflectionParams);
var elementFactoryTypes = CodecUtilities.GetIElementFactoryClasses();
var elementFactory = (IElementFactory)Activator.CreateInstance(elementFactoryTypes.First());

Check warning on line 361 in Datamodel.NET/Codecs/Binary.cs

View workflow job for this annotation

GitHub Actions / build 

Converting null literal or possible null value to non-nullable type.

Check warning on line 361 in Datamodel.NET/Codecs/Binary.cs

View workflow job for this annotation

GitHub Actions / build 

Possible null reference argument for parameter 'type' in 'object? Activator.CreateInstance(Type type)'.

stream.Seek(0, SeekOrigin.Begin);
while (true)
Expand All @@ -349,7 +369,8 @@
var dm = new Datamodel(format, format_version);

EncodingVersion = encoding_version;
Reader = new BinaryReader(stream, Datamodel.TextEncoding);

Reader = new BinaryReader(stream);

if (EncodingVersion >= 9)
{
Expand Down Expand Up @@ -377,13 +398,14 @@
var id_bits = Reader.ReadBytes(16);
var id = new Guid(BitConverter.IsLittleEndian ? id_bits : id_bits.Reverse().ToArray());

if (!CodecUtilities.TryConstructCustomElement(types, dm, type, name, id, out _))
if (!CodecUtilities.TryConstructCustomElement(elementFactory, reflectionParams, dm, type, name, id, out _))

Check warning on line 401 in Datamodel.NET/Codecs/Binary.cs

View workflow job for this annotation

GitHub Actions / build 

Possible null reference argument for parameter 'elementFactory' in 'bool CodecUtilities.TryConstructCustomElement(IElementFactory elementFactory, ReflectionParams reflectionParams, Datamodel dataModel, string elem_class, string elem_name, Guid elem_id, out Element? elem)'.
{
// note: constructing an element, adds it to the datamodel.AllElements
_ = new Element(dm, name, id, type);
}
}


// read attributes (or not, if we're deferred)
foreach (var elem in dm.AllElements.ToArray())
{
Expand Down Expand Up @@ -414,12 +436,12 @@

public object? DeferredDecodeAttribute(Datamodel dm, long offset)
{
if(Reader is null)
if (Reader is null)
{
throw new InvalidDataException("Tried to read a deferred attribute but the reader is invalid");
}

Reader.BaseStream.Seek(offset, SeekOrigin.Begin);
Reader.BaseStream.Seek((int)offset, SeekOrigin.Begin);
return DecodeAttribute(dm, false, Reader);
}

Expand All @@ -428,15 +450,16 @@
var types = IdToType(reader.ReadByte());

if (types.Item2 == null)
return ReadValue(dm, types.Item1, EncodingVersion < 4 || prefix, reader);
return ReadValue(dm, TypeMap[types.Item1.TypeHandle], EncodingVersion < 4 || prefix, reader);
else
{
var count = reader.ReadInt32();
var inner_type = types.Item2;
var array = CodecUtilities.MakeList(inner_type, count);

var typeId = TypeMap[inner_type.TypeHandle];
foreach (var x in Enumerable.Range(0, count))
array.Add(ReadValue(dm, inner_type, true, reader));
array.Add(ReadValue(dm, typeId, true, reader));

return array;
}
Expand All @@ -449,7 +472,7 @@
int count = 1;
Type? type = types.Item1;

if(type is null)
if (type is null)
{
throw new InvalidDataException("Failed to match id to type");
}
Expand Down Expand Up @@ -554,7 +577,7 @@

int CountChildren(Element? elem, HashSet<Element> counter)
{
if(elem is null)
if (elem is null)
{
return 0;
}
Expand Down
Loading
Loading