Introduce GenerateFreeStandingFunctionsClassName option (#1782)

* Introduce `GenerateFreeStandingFunctionsClassName` option

* Support CLI and fixes

Author: Saalvage

src/Generator/Generators/CLI/CLIHeaders.cs

@@ -219,7 +219,7 @@ public void GenerateFunctions(DeclarationContext decl)
         {
             PushBlock(BlockKind.FunctionsClass, decl);
 
-            WriteLine("public ref class {0}", TranslationUnit.FileNameWithoutExtension);
+            WriteLine("public ref class {0}", Options.GenerateFreeStandingFunctionsClassName(TranslationUnit));
             WriteLine("{");
             WriteLine("public:");
             Indent();

src/Generator/Generators/CLI/CLISources.cs

@@ -909,7 +909,7 @@ public void GenerateFunction(Function function, DeclarationContext @namespace)
             GenerateDeclarationCommon(function);
 
             var classSig = string.Format("{0}::{1}", QualifiedIdentifier(@namespace),
-                TranslationUnit.FileNameWithoutExtension);
+                Options.GenerateFreeStandingFunctionsClassName(TranslationUnit));
 
             Write("{0} {1}::{2}(", function.ReturnType, classSig,
                 function.Name);

src/Generator/Generators/CLI/CLITypePrinter.cs

@@ -329,7 +329,7 @@ public override TypePrinterResult VisitDeclaration(Declaration decl)
             var result = string.Join("::", names);
             var translationUnit = decl.Namespace as TranslationUnit;
             if (translationUnit != null && translationUnit.HasFunctions &&
-                rootNamespace == translationUnit.FileNameWithoutExtension)
+                rootNamespace == Options.GenerateFreeStandingFunctionsClassName(translationUnit))
                 return "::" + result;
             return result;
         }

src/Generator/Generators/CSharp/CSharpSources.cs

@@ -250,7 +250,7 @@ public virtual void GenerateNamespaceFunctionsAndVariables(DeclarationContext co
             if (!context.Functions.Any(f => f.IsGenerated) && !hasGlobalVariables)
                 return;
 
-            var parentName = SafeIdentifier(context.TranslationUnit.FileNameWithoutExtension);
+            var parentName = SafeIdentifier(Context.Options.GenerateFreeStandingFunctionsClassName(context.TranslationUnit));
             var isStruct = EnumerateClasses()
                 .ToList()
                 .FindAll(cls => cls.IsValueType && cls.Name == parentName && context.QualifiedLogicalName == cls.Namespace.QualifiedLogicalName)

src/Generator/Generators/CSharp/CSharpTypePrinter.cs

@@ -575,7 +575,7 @@ specialization.OriginalNamespace is Class &&
             }
 
             if (decl is Variable && !(decl.Namespace is Class))
-                names.Push(decl.TranslationUnit.FileNameWithoutExtension);
+                names.Push(Options.GenerateFreeStandingFunctionsClassName(decl.TranslationUnit));
 
             while (!(ctx is TranslationUnit))
             {

src/Generator/Options.cs

@@ -172,6 +172,12 @@ public bool DoAllModulesHaveLibraries() =>
         public string IncludePrefix;
         public Func<TranslationUnit, string> GenerateName;
 
+        /// <summary>
+        /// By default the classes in which free standing functions are contained are named like the header they are in
+        /// this options allows you to customize this behavior.
+        /// </summary>
+        public Func<TranslationUnit, string> GenerateFreeStandingFunctionsClassName = tu => tu.FileNameWithoutExtension;
+
         /// <summary>
         /// Set this option to the kind of comments that you want generated
         /// in the source code. This overrides the default kind set by the

src/Generator/Passes/MoveFunctionToClassPass.cs

@@ -57,7 +57,8 @@ private Class FindClassToMoveFunctionTo(Function function)
             }
             else
             {
-                string name = (function.Namespace as TranslationUnit)?.FileNameWithoutExtension ??
+                var tu = function.Namespace as TranslationUnit;
+                string name = tu != null ? Options.GenerateFreeStandingFunctionsClassName(tu) :
                     function.Namespace.Name;
                 @class = ASTContext.FindClass(
                     name, ignoreCase: true).FirstOrDefault(

tests/dotnet/CLI/CLI.Gen.cs

@@ -68,6 +68,7 @@ public override void Setup(Driver driver)
         {
             driver.Options.GenerateFinalizers = true;
             driver.Options.GenerateObjectOverrides = true;
+            driver.Options.GenerateFreeStandingFunctionsClassName = tu => tu.FileNameWithoutExtension + "Cool";
             base.Setup(driver);
         }
 

tests/dotnet/CLI/CLI.Tests.cs

@@ -78,7 +78,7 @@ public void TestMultipleConstantArraysParamsTestMethod()
         byte[] bytes2 = Encoding.ASCII.GetBytes("TestMulti2");
         sbyte[] sbytes2 = Array.ConvertAll(bytes2, q => Convert.ToSByte(q));
 
-        string s = CLI.CLI.MultipleConstantArraysParamsTestMethod(sbytes, sbytes2);
+        string s = CLI.CLICool.MultipleConstantArraysParamsTestMethod(sbytes, sbytes2);
         Assert.AreEqual("TestMultiTestMulti2", s);
     }
 
@@ -88,7 +88,7 @@ public void TestMultipleConstantArraysParamsTestMethodLongerSourceArray()
         byte[] bytes = Encoding.ASCII.GetBytes("TestMultipleConstantArraysParamsTestMethodLongerSourceArray");
         sbyte[] sbytes = Array.ConvertAll(bytes, q => Convert.ToSByte(q));
 
-        Assert.Throws<InvalidOperationException>(() => CLI.CLI.MultipleConstantArraysParamsTestMethod(sbytes, new sbyte[] { }));
+        Assert.Throws<InvalidOperationException>(() => CLI.CLICool.MultipleConstantArraysParamsTestMethod(sbytes, new sbyte[] { }));
     }
 
     [Test]
@@ -110,7 +110,7 @@ public void TestStructWithNestedUnionTestMethod()
             Assert.AreEqual(10, val.NestedUnion.SzText.Length);
             Assert.AreEqual("TestUnions", val.NestedUnion.SzText);
 
-            string ret = CLI.CLI.StructWithNestedUnionTestMethod(val);
+            string ret = CLI.CLICool.StructWithNestedUnionTestMethod(val);
 
             Assert.AreEqual("TestUnions", ret);
         }
@@ -146,7 +146,7 @@ public void TestUnionWithNestedStructTestMethod()
             Assert.AreEqual(10, unionWithNestedStruct.NestedStruct.SzText.Length);
             Assert.AreEqual("TestUnions", unionWithNestedStruct.NestedStruct.SzText);
 
-            string ret = CLI.CLI.UnionWithNestedStructTestMethod(unionWithNestedStruct);
+            string ret = CLI.CLICool.UnionWithNestedStructTestMethod(unionWithNestedStruct);
 
             Assert.AreEqual("TestUnions", ret);
         }
@@ -172,7 +172,7 @@ public void TestUnionWithNestedStructArrayTestMethod()
 
                 Assert.AreEqual(2, unionWithNestedStructArray.NestedStructs.Length);
 
-                string ret = CLI.CLI.UnionWithNestedStructArrayTestMethod(unionWithNestedStructArray);
+                string ret = CLI.CLICool.UnionWithNestedStructArrayTestMethod(unionWithNestedStructArray);
 
                 Assert.AreEqual("TestUnion1TestUnion2", ret);
             }

tests/dotnet/CSharp/CSharp.Gen.cs

@@ -26,6 +26,8 @@ public override void Setup(Driver driver)
 
             driver.ParserOptions.UnityBuild = true;
             driver.ParserOptions.AddSupportedFunctionTemplates("FunctionTemplate");
+
+            driver.Options.GenerateFreeStandingFunctionsClassName = t => t.FileNameWithoutExtension + "Cool";
         }
 
         public override void SetupPasses(Driver driver)