feat: Support structs in value conversions

mycroes · Oct 21, 2024 · f7b0e1b · f7b0e1b
1 parent 980def2
commit f7b0e1b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/Sally7/ValueConversion/FromS7Conversions.cs b/Sally7/ValueConversion/FromS7Conversions.cs
@@ -9,7 +9,8 @@ internal static class FromS7Conversions
     {
         public static Delegate GetConverter<TValue>()
         {
-            if (typeof(TValue).IsPrimitive || typeof(TValue).IsEnum)
+            // Hack, will convert structs as numerical types of equal size as the struct.
+            if (typeof(TValue).IsValueType)
             {
                 return Unsafe.SizeOf<TValue>() switch
                 {
@@ -29,7 +30,8 @@ public static Delegate GetConverter<TValue>()
                 var elementType = typeof(TValue).GetElementType() ?? throw new Exception(
                     $"Type {typeof(TValue)} doesn't have an ElementType.");
 
-                if (elementType.IsPrimitive || elementType.IsEnum)
+                // Hack, will convert structs as numerical types of equal size as the struct.
+                if (elementType.IsValueType)
                 {
                     return ConversionHelper.SizeOf(elementType) switch
                     {

diff --git a/Sally7/ValueConversion/ToS7Conversions.cs b/Sally7/ValueConversion/ToS7Conversions.cs
@@ -10,7 +10,8 @@ internal static class ToS7Conversions
     {
         public static Delegate GetConverter<TValue>()
         {
-            if (typeof(TValue).IsPrimitive || typeof(TValue).IsEnum)
+            // Hack, will convert structs as numerical types of equal size as the struct.
+            if (typeof(TValue).IsValueType)
             {
                 return Unsafe.SizeOf<TValue>() switch
                 {
@@ -30,7 +31,8 @@ public static Delegate GetConverter<TValue>()
                 var elementType = typeof(TValue).GetElementType() ??
                     throw new Exception($"Type {typeof(TValue)} doesn't have an ElementType.");
 
-                if (elementType.IsPrimitive || elementType.IsEnum)
+                // Hack, will convert structs as numerical types of equal size as the struct.
+                if (elementType.IsValueType)
                 {
                     return ConversionHelper.SizeOf(elementType) switch
                     {