Skip to content

Commit

Permalink
upgrade. add generic way for read enum
Browse files Browse the repository at this point in the history
  • Loading branch information
@alec1o
alec1o committed May 20, 2024
1 parent f8876d7 commit 3f62c1e
Show file tree
Hide file tree
Showing 4 changed files with 104 additions and 24 deletions.
20 changes: 15 additions & 5 deletions src/extension/Primitive.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Numerics;

Expand Down Expand Up @@ -113,7 +114,16 @@ internal static byte[] ToPrimitive<T>(this T value)

internal static (T Value, bool IsError) FromPrimitive<T>(Primitive primitive)
{
var type = typeof(T);
var result = FromPrimitive(typeof(T), primitive);
return ((T)result.Value, result.IsError);
}

internal static (object Value, bool IsError) FromPrimitive(Type type, Primitive primitive)
{
if (type == null || primitive == null)
{
return (default, true);
}

object value = null;

Expand Down Expand Up @@ -158,7 +168,7 @@ internal static (T Value, bool IsError) FromPrimitive<T>(Primitive primitive)
}
else if (type.IsEnum)
{
value = primitive.Get.Enum<T>();
value = primitive.Get.Enum(type);
}
// 8 bytes (3)
else if (type == typeof(long))
Expand Down Expand Up @@ -195,11 +205,11 @@ internal static (T Value, bool IsError) FromPrimitive<T>(Primitive primitive)
{
value = primitive.Get.Bytes();
}
else if (type == typeof(T[]))
else if (type.IsArray)
{
// TODO: array
}
else if (type == typeof(List<T>))
else if (type == typeof(object))
{
// TODO: list
}
Expand All @@ -214,7 +224,7 @@ internal static (T Value, bool IsError) FromPrimitive<T>(Primitive primitive)

if (primitive.IsValid)
{
return ((T)value, value == null);
return (value, value == null);
}
else
{
Expand Down
3 changes: 2 additions & 1 deletion src/src/interfance/IPrimitiveGet.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@ public interface IPrimitiveGet
short Short();
ushort UShort();

// 4 bytes (4)
// 4 bytes (4) + (1) Overhead
int Int();
uint UInt();
float Float();
T Enum<T>();
object Enum(Type type);

// 8 bytes (4)
long Long();
Expand Down
78 changes: 71 additions & 7 deletions src/src/partials/PrimitiveGet.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System.IO;
using System.Linq;
using System.Numerics;
using System.Reflection;
using System.Text;

namespace Byter
Expand Down Expand Up @@ -210,22 +211,27 @@ public float Float()
}

public T Enum<T>()
{
return (T)Enum(typeof(T));
}

public object Enum(Type type)
{
try
{
if (!typeof(T).IsEnum) throw new InvalidOperationException();
if (!type.IsEnum) throw new InvalidOperationException();

if (!IsValidPrefix(Prefix.Enum)) throw new InvalidDataException();

int value = BitConverter.ToInt32(VaultArray, Position);

Position += sizeof(int);

return (T)(object)value;
return value;
}
catch
{
return SetError<T>();
return SetError<object>();
}
}

Expand Down Expand Up @@ -353,7 +359,65 @@ public string String()

public T Class<T>()
{
throw new NotImplementedException();
try
{
if (!IsValidPrefix(Prefix.Class)) throw new InvalidDataException();

int objectCount = BitConverter.ToInt32(VaultArray, Position);
Position += sizeof(int);

int collectionBuffer = BitConverter.ToInt32(VaultArray, Position);
Position += sizeof(int);

if
(
// objects count lower than zero
objectCount < 0 ||
// buffer size lower than zero
collectionBuffer < 0 ||
// if zero objects count is zero, buffer size must be zero too
(objectCount == 0 && collectionBuffer != 0) ||
// if have object(s), the buffer size must not be zero
(objectCount != 0 && collectionBuffer == 0)
)
{
throw new InvalidConstraintException();
}

if (objectCount > 0 && collectionBuffer > 0)
{
var primitive = new Primitive(Vault.GetRange(Position, collectionBuffer).ToArray());

PropertyInfo[] props = typeof(T).GetProperties();

if (props.Length <= 0) return default;

T obj = Activator.CreateInstance<T>();

/*foreach (var prop in props)
{
if (prop.CanRead && prop.CanWrite)
{
var result = PrimitiveExtension.FromPrimitive<object>(prop.PropertyType, primitive);
if (result.IsError)
{
throw new InvalidDataException();
}
prop.SetValue(obj, result.Value);
}
}*/

return obj;
}

return default;
}
catch
{
return SetError<T>();
}
}

public T Struct<T>()
Expand Down Expand Up @@ -402,7 +466,7 @@ public T[] Array<T>()
{
throw new InvalidDataException();
}

list.Add(result.Value);
}
}
Expand All @@ -414,7 +478,7 @@ public T[] Array<T>()
return SetError<T[]>();
}
}

public List<T> List<T>()
{
try
Expand Down Expand Up @@ -456,7 +520,7 @@ public List<T> List<T>()
{
throw new InvalidDataException();
}

list.Add(result.Value);
}
}
Expand Down
27 changes: 16 additions & 11 deletions test/primitive/ReadAndWrite.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,11 @@ public float Float()
return Terminate<float>(ref primitive);
}

public object Enum(Type type)
{
throw new NotImplementedException();
}

[Fact] // DONE
public long Long()
{
Expand Down Expand Up @@ -396,23 +401,23 @@ public void _Class()
Assert.NotNull(class1);
Assert.NotNull(class2);

primitive.Add.Class(class1);
//primitive.Add.Class(class1);
primitive.Add.Class(class2);

var myClass1 = primitive.Get.Class<Airplane>();
//var myClass1 = primitive.Get.Class<Airplane>();
var myClass2 = primitive.Get.Class<Machine>();

Assert.True(primitive.IsValid);
Assert.NotNull(myClass1);
Assert.NotNull(myClass2);
// Assert.NotNull(myClass1);
// Assert.NotNull(myClass2);
{
Assert.Equal(class1.Name, myClass1.Name);
Assert.Equal(class1.Random, myClass1.Random);
Assert.Equal(class1.Info.Name, myClass1.Info.Name);
Assert.Equal(class1.Info.Year, myClass1.Info.Year);
Assert.Equal(class1.Info.IsAirplane, myClass1.Info.IsAirplane);
Assert.Equal(class1.Info.Mode, myClass1.Info.Mode);
Assert.Equal(class1.Info.Machine.Name, myClass1.Info.Machine.Name);
// Assert.Equal(class1.Name, myClass1.Name);
// Assert.Equal(class1.Random, myClass1.Random);
// Assert.Equal(class1.Info.Name, myClass1.Info.Name);
// Assert.Equal(class1.Info.Year, myClass1.Info.Year);
// Assert.Equal(class1.Info.IsAirplane, myClass1.Info.IsAirplane);
// Assert.Equal(class1.Info.Mode, myClass1.Info.Mode);
// Assert.Equal(class1.Info.Machine.Name, myClass1.Info.Machine.Name);
}
{
Assert.Equal(class2.Name, myClass2.Name);
Expand Down

0 comments on commit 3f62c1e

Please sign in to comment.