Simplifying the code.

Author: jcant0n

WebGPUGen/WebGPUGen/CsCodeGenerator.cs

@@ -5,7 +5,6 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using System.Reflection.Metadata;
 
 namespace WebGPUGen
 {
@@ -77,11 +76,7 @@ private void GenerateDelegates(CppCompilation compilation, string outputPath)
         {
             Debug.WriteLine("Generating Delegates...");
 
-            var delegates = compilation.Typedefs
-                .Where(t => t.TypeKind == CppTypeKind.Typedef
-                       && t.ElementType is CppPointerType
-                       && ((CppPointerType)t.ElementType).ElementType.TypeKind == CppTypeKind.Function)
-                .ToList();
+            var delegates = Helpers.delegates;
 
             using (StreamWriter file = File.CreateText(Path.Combine(outputPath, "Delegates.cs")))
             {

WebGPUGen/WebGPUGen/Helpers.cs

@@ -1,10 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net.Mime;
-using System.Reflection.Metadata;
 using System.Text;
-using System.Threading.Tasks;
 using CppAst;
 
 namespace WebGPUGen
@@ -40,7 +37,7 @@ public static string ConvertToCSharpType(CppType type, bool isPointer = false)
 
             if (type is CppQualifiedType qualifiedType)
             {
-                return GetCsTypeName(qualifiedType.ElementType, isPointer);
+                return ConvertToCSharpType(qualifiedType.ElementType, isPointer);
             }
 
             if (type is CppEnum enumType)
@@ -77,13 +74,13 @@ public static string ConvertToCSharpType(CppType type, bool isPointer = false)
 
             if (type is CppArrayType arrayType)
             {
-                return GetCsTypeName(arrayType.ElementType, isPointer);
+                return ConvertToCSharpType(arrayType.ElementType, isPointer);
             }
 
             return string.Empty;
         }
 
-        public static object GetParametersSignature(CppFunction command, bool useTypes = true)
+        public static string GetParametersSignature(CppFunction command, bool useTypes = true)
         {
             StringBuilder signature = new StringBuilder();
             foreach (var parameter in command.Parameters)
@@ -168,79 +165,11 @@ private static string GetCsTypeName(CppPointerType pointerType)
                 {
                     return GetCsTypeName(primitiveType, true);
                 }
-                else if (qualifiedType.ElementType is CppClass @classType)
-                {
-                    return GetCsTypeName(@classType, true);
-                }
-                else if (qualifiedType.ElementType is CppPointerType subPointerType)
-                {
-                    return GetCsTypeName(subPointerType, true) + "*";
-                }
-                else if (qualifiedType.ElementType is CppTypedef typedef)
-                {
-                    return GetCsTypeName(typedef, true);
-                }
-                else if (qualifiedType.ElementType is CppEnum @enum)
-                {
-                    return GetCsTypeName(@enum, true);
-                }
 
-                return GetCsTypeName(qualifiedType.ElementType, true);
+                return ConvertToCSharpType(qualifiedType.ElementType, true);
             }
 
-            return GetCsTypeName(pointerType.ElementType, true);
-        }
-
-        private static string GetCsTypeName(CppType type, bool isPointer = false)
-        {
-            if (type is CppPrimitiveType primitiveType)
-            {
-                return GetCsTypeName(primitiveType, isPointer);
-            }
-
-            if (type is CppQualifiedType qualifiedType)
-            {
-                return GetCsTypeName(qualifiedType.ElementType, isPointer);
-            }
-
-            if (type is CppEnum enumType)
-            {
-                var enumCsName = GetCsCleanName(enumType.Name);
-                if (isPointer)
-                    return enumCsName + "*";
-
-                return enumCsName;
-            }
-
-            if (type is CppTypedef typedef)
-            {
-                var typeDefCsName = GetCsCleanName(typedef.Name);
-                if (isPointer)
-                    return typeDefCsName + "*";
-
-                return typeDefCsName;
-            }
-
-            if (type is CppClass @class)
-            {
-                var className = GetCsCleanName(@class.Name);
-                if (isPointer)
-                    return className + "*";
-
-                return className;
-            }
-
-            if (type is CppPointerType pointerType)
-            {
-                return GetCsTypeName(pointerType);
-            }
-
-            if (type is CppArrayType arrayType)
-            {
-                return GetCsTypeName(arrayType.ElementType, isPointer);
-            }
-
-            return string.Empty;
+            return ConvertToCSharpType(pointerType.ElementType, true);
         }
 
         private static string GetCsCleanName(string name)
@@ -258,7 +187,7 @@ private static string GetCsCleanName(string name)
 
             if (name.Contains("Flags"))
             {
-                return name.Remove(name.Count() - 5);
+                return name.Remove(name.Length - 5);
             }
 
             return name;
@@ -274,7 +203,7 @@ public static string GetConstantType(string value)
             else if (value.EndsWith("F", StringComparison.OrdinalIgnoreCase))
                 constType = "float";
             else if (uint.TryParse(value, out _) || value.StartsWith("0x"))
-                constType = "float";
+                constType = "uint";
             return constType;
         }