Added merge and clone operation for metadata, fixed reference behavior for metadata, patches can now modify metadata.

Author: JunaMeinhold

HexaGen.Runtime/HexaGen.Runtime.csproj

@@ -11,7 +11,7 @@
 		<RepositoryUrl>https://github.com/JunaMeinhold/HexaGen</RepositoryUrl>
 
 		<AssemblyVersion>1.1.0</AssemblyVersion>
-		<PackageVersion>1.1.8</PackageVersion>
+		<PackageVersion>1.1.9</PackageVersion>
 		<Description>The C Runtime for all C Wrappers generated with the HexaGen Code Generator.</Description>
 		<Authors>Juna Meinhold</Authors>
 		<PackageProjectUrl>https://github.com/JunaMeinhold/HexaGen</PackageProjectUrl>

HexaGen.Runtime/LibraryLoader.cs

@@ -183,6 +183,37 @@ public static nint LoadLibrary()
             return handle;
         }
 
+        public delegate string LibraryNameCallback();
+
+        public delegate string LibraryExtensionCallback();
+
+        public static nint LoadLibrary(LibraryNameCallback libraryNameCallback, LibraryExtensionCallback? libraryExtensionCallback)
+        {
+            var libraryName = libraryNameCallback();
+
+            var extension = libraryExtensionCallback != null ? libraryExtensionCallback() : GetExtension([]);
+
+            if (!libraryName.EndsWith(extension, StringComparison.OrdinalIgnoreCase))
+            {
+                libraryName += extension;
+            }
+
+            var osPlatform = GetOSPlatform();
+            var architecture = GetArchitecture();
+            var libraryPath = GetNativeAssemblyPath(osPlatform, architecture, libraryName);
+
+            nint handle;
+
+            handle = NativeLibrary.Load(libraryPath);
+
+            if (handle == IntPtr.Zero)
+            {
+                throw new DllNotFoundException($"Unable to load library '{libraryName}'.");
+            }
+
+            return handle;
+        }
+
         private static string GetNativeAssemblyPath(string osPlatform, string architecture, string libraryName)
         {
 #if ANDROID

HexaGen/CsCodeGenerator.cs

@@ -12,6 +12,7 @@ public partial class CsCodeGenerator : BaseGenerator
         protected FunctionGenerator funcGen;
         protected PatchEngine patchEngine = new();
         protected ConfigComposer configComposer = new();
+        private CsCodeGeneratorMetadata? metadata;
 
         public static CsCodeGenerator Create(string configPath)
         {
@@ -268,8 +269,12 @@ public void LoadMetadata(string path)
 
         public CsCodeGeneratorMetadata GetMetadata()
         {
-            CsCodeGeneratorMetadata metadata = new();
-            metadata.CopyFrom(this);
+            if (metadata == null)
+            {
+                metadata = new();
+                metadata.CopyFrom(this);
+            }
+
             return metadata;
         }
 

HexaGen/HexaGen.csproj

@@ -7,7 +7,7 @@
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 
 		<AssemblyVersion>1.1.1</AssemblyVersion>
-		<PackageVersion>1.1.5</PackageVersion>
+		<PackageVersion>1.1.6</PackageVersion>
 		<Description></Description>
 		<PackageTags></PackageTags>
 		<Authors>Juna Meinhold</Authors>

HexaGen/Metadata/CsCodeGeneratorMetadata.cs

@@ -38,6 +38,41 @@ public void CopyFrom(CsCodeGenerator generator)
             VTableLength = generator.VTableLength;
         }
 
+        public void Merge(CsCodeGeneratorMetadata from, bool copyFnTableLen)
+        {
+            DefinedConstants.AddRange(from.DefinedConstants);
+            DefinedEnums.AddRange(from.DefinedEnums);
+            DefinedExtensions.AddRange(from.DefinedExtensions);
+            DefinedFunctions.AddRange(from.DefinedFunctions);
+            DefinedTypedefs.AddRange(from.DefinedTypedefs);
+            DefinedTypes.AddRange(from.DefinedTypes);
+            DefinedDelegates.AddRange(from.DefinedDelegates);
+            Copy(from.WrappedPointers, WrappedPointers);
+            if (copyFnTableLen)
+            {
+                VTableLength = from.VTableLength;
+            }
+        }
+
+        public CsCodeGeneratorMetadata Clone()
+        {
+            var clonedMetadata = new CsCodeGeneratorMetadata
+            {
+                Settings = Settings,
+                DefinedConstants = DefinedConstants.Select(constant => constant.Clone()).ToList(),
+                DefinedEnums = DefinedEnums.Select(enumItem => enumItem.Clone()).ToList(),
+                DefinedExtensions = new List<string>(DefinedExtensions),
+                DefinedFunctions = new List<string>(DefinedFunctions),
+                DefinedTypedefs = new List<string>(DefinedTypedefs),
+                DefinedTypes = new List<string>(DefinedTypes),
+                DefinedDelegates = new List<string>(DefinedDelegates),
+                WrappedPointers = new Dictionary<string, string>(WrappedPointers),
+                VTableLength = VTableLength
+            };
+
+            return clonedMetadata;
+        }
+
         public static void Copy<TKey, TValue>(Dictionary<TKey, TValue> source, Dictionary<TKey, TValue> destination) where TKey : notnull
         {
             foreach (var item in source)

HexaGen/Metadata/CsConstantMetadata.cs

@@ -43,5 +43,10 @@ public override string ToString()
         {
             return $"Constant: {CppName} = {CppValue}";
         }
+
+        public CsConstantMetadata Clone()
+        {
+            return new CsConstantMetadata(CppName, CppValue, Name, Value, Comment);
+        }
     }
 }

HexaGen/Metadata/CsEnumItemMetadata.cs

@@ -40,5 +40,10 @@ public override int GetHashCode()
         {
             return Identifier.GetHashCode();
         }
+
+        public CsEnumItemMetadata Clone()
+        {
+            return new CsEnumItemMetadata(CppName, CppValue, Name, Value, new List<string>(Attributes), Comment);
+        }
     }
 }

HexaGen/Metadata/CsEnumMetadata.cs

@@ -54,5 +54,11 @@ public override int GetHashCode()
         {
             return Identifier.GetHashCode();
         }
+
+        public CsEnumMetadata Clone()
+        {
+            return new CsEnumMetadata(CppName, Name, new List<string>(Attributes), Comment, BaseType, Items.Select(item => item.Clone()).ToList()
+            );
+        }
     }
 }