Removed GenerateConstructorsForStructs and LibraryImport from experimental settings.

Author: JunaMeinhold

HexaGen/CsCodeGeneratorConfig.cs

@@ -289,11 +289,6 @@ public static CsCodeGeneratorConfig Load(string file)
 
             if (!result.EnableExperimentalOptions)
             {
-                result.GenerateConstructorsForStructs = false;
-                if (result.UseFunctionTable)
-                {
-                    result.ImportType = ImportType.LibraryImport;
-                }
             }
 
             result.Save(file);
@@ -336,7 +331,7 @@ public static CsCodeGeneratorConfig Load(string file)
         public bool GenerateSizeOfStructs { get; set; } = false;
 
         /// <summary>
-        /// The generator will generate default constructors for all structs. (Default: <see langword="true"/>) (EXPERIMENTAL)
+        /// The generator will generate default constructors for all structs. (Default: <see langword="true"/>)
         /// </summary>
         public bool GenerateConstructorsForStructs { get; set; } = true;
 

HexaGen/FunctionGeneration/StringReturnGenStep.cs

@@ -9,6 +9,11 @@
     /// </summary>
     public class StringReturnGenStep : FunctionGenStep
     {
+        /// <summary>
+        /// Allows char** or byte**
+        /// </summary>
+        public bool AllowMultiPointer { get; set; }
+
         /// <summary>
         /// Determines whether the specified return type is allowed.
         /// </summary>
@@ -20,7 +25,30 @@ public class StringReturnGenStep : FunctionGenStep
         /// </returns>
         protected virtual bool AllowReturnType(CsFunctionOverload function, CsFunctionVariation variation, CsType returnType)
         {
-            return returnType.IsPointer && (returnType.PrimitiveType == CsPrimitiveType.Byte || returnType.PrimitiveType == CsPrimitiveType.Char);
+            if (!returnType.IsPointer || returnType.PrimitiveType != CsPrimitiveType.Byte && returnType.PrimitiveType != CsPrimitiveType.Char)
+            {
+                return false;
+            }
+
+            if (AllowMultiPointer)
+            {
+                return true;
+            }
+
+            int p = 0;
+            foreach (char c in returnType.Name)
+            {
+                if (c == '*')
+                {
+                    p++;
+                    if (p > 1)
+                    {
+                        return false;
+                    }
+                }
+            }
+
+            return true;
         }
 
         /// <summary>

HexaGen/HexaGen.csproj

@@ -7,7 +7,7 @@
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 
 		<AssemblyVersion>1.1.1</AssemblyVersion>
-		<PackageVersion>1.1.9-rc1</PackageVersion>
+		<PackageVersion>1.1.9-rc3</PackageVersion>
 		<Description></Description>
 		<PackageTags></PackageTags>
 		<Authors>Juna Meinhold</Authors>