allow more than 16 arguments #110

neuecc · neuecc · commit 1e1229aa8175 · 2024-06-12T12:35:05.000+09:00
diff --git a/sandbox/GeneratorSandbox/Program.cs b/sandbox/GeneratorSandbox/Program.cs
@@ -1,17 +1,39 @@
 ﻿using ConsoleAppFramework;
 
-var app = ConsoleApp.Create();
 
-app.Add("aaa", () =>
-{
-});
+var t = new Test();
 
+var app = ConsoleApp.Create();
 
+app.Add("foo", t.Handle);
 
+app.Run(args);
 
-app.Add("aabcdefg", int (int x, string y) =>
-{
-    return default!;
-});
 
-app.Run(args);
+public partial class Test
+{
+    public void Handle(
+        bool a1,
+        bool a2,
+        bool a3,
+        bool a4,
+        bool a5,
+        bool a6,
+        bool a7,
+        bool a8,
+        bool a9,
+        bool a10,
+        bool a11,
+        bool a12,
+        bool a13,
+        bool a14,
+        bool a15,
+        bool a16,
+        bool a17,
+        bool a18,
+        bool a19
+    )
+    {
+        Console.Write("ok");
+    }
+}
diff --git a/src/ConsoleAppFramework/Command.cs b/src/ConsoleAppFramework/Command.cs
@@ -10,8 +10,7 @@ public enum MethodKind
 
 public enum DelegateBuildType
 {
-    MakeDelegateWhenHasDefaultValue,
-    OnlyActionFunc,
+    MakeCustomDelegateWhenHasDefaultValueOrTooLarge,
     None
 }
 
@@ -31,25 +30,30 @@ public record class Command
     public required EquatableArray<FilterInfo> Filters { get; init; }
     public bool HasFilter => Filters.Length != 0;
 
-    public string? BuildDelegateSignature(out string? delegateType)
+    // return is delegateType(Name).
+    public string? BuildDelegateSignature(string customDelegateTypeName, out string? customDelegateDefinition)
     {
-        if (DelegateBuildType == DelegateBuildType.MakeDelegateWhenHasDefaultValue)
-        {
-            if (MethodKind == MethodKind.Lambda && Parameters.Any(x => x.HasDefaultValue || x.IsParams))
-            {
-                delegateType = BuildDelegateType("RunCommand");
-                return "RunCommand";
-            }
-        }
-
-        delegateType = null;
+        customDelegateDefinition = null;
 
         if (DelegateBuildType == DelegateBuildType.None)
         {
             return null;
         }
 
-        if (MethodKind == MethodKind.FunctionPointer) return BuildFunctionPointerDelegateSignature();
+        if (MethodKind == MethodKind.FunctionPointer)
+        {
+            customDelegateDefinition = null;
+            return BuildFunctionPointerDelegateSignature();
+        }
+
+        if (DelegateBuildType == DelegateBuildType.MakeCustomDelegateWhenHasDefaultValueOrTooLarge)
+        {
+            if (Parameters.Length > 16 || (MethodKind == MethodKind.Lambda && Parameters.Any(x => x.HasDefaultValue || x.IsParams)))
+            {
+                customDelegateDefinition = BuildDelegateTypeDefinition(customDelegateTypeName);
+                return customDelegateTypeName;
+            }
+        }
 
         if (IsAsync)
         {
@@ -126,7 +130,7 @@ public string BuildFunctionPointerDelegateSignature()
         return $"delegate* managed<{parameters}{comma}{retType}>";
     }
 
-    public string BuildDelegateType(string delegateName)
+    public string BuildDelegateTypeDefinition(string delegateName)
     {
         var retType = (IsAsync, IsVoid) switch
         {
diff --git a/src/ConsoleAppFramework/ConsoleAppGenerator.cs b/src/ConsoleAppFramework/ConsoleAppGenerator.cs
@@ -41,7 +41,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
                 var reporter = new DiagnosticReporter();
                 var node = (InvocationExpressionSyntax)context.Node;
                 var wellknownTypes = new WellKnownTypes(context.SemanticModel.Compilation);
-                var parser = new Parser(reporter, node, context.SemanticModel, wellknownTypes, DelegateBuildType.MakeDelegateWhenHasDefaultValue, []);
+                var parser = new Parser(reporter, node, context.SemanticModel, wellknownTypes, DelegateBuildType.MakeCustomDelegateWhenHasDefaultValueOrTooLarge, []);
                 var isRunAsync = (node.Expression as MemberAccessExpressionSyntax)?.Name.Identifier.Text == "RunAsync";
 
                 var command = parser.ParseAndValidateForRun();
@@ -624,20 +624,32 @@ static void EmitConsoleAppBuilder(SourceProductionContext sourceProductionContex
         var sb = new SourceBuilder(0);
         sb.AppendLine(GeneratedCodeHeader);
 
+        var delegateSignatures = new List<string>();
+
         // with id number
         var commandIds = collectBuilderContext.Commands
             .Select((x, i) =>
             {
-                return new Emitter.CommandWithId(
-                    FieldType: x!.BuildDelegateSignature(out _), // for builder, always generate Action/Func so ok to ignore out var.
+                var command = new Emitter.CommandWithId(
+                    FieldType: x!.BuildDelegateSignature(Emitter.CommandWithId.BuildCustomDelegateTypeName(i), out var delegateDef),
                     Command: x!,
                     Id: i
                 );
+                if (delegateDef != null)
+                {
+                    delegateSignatures.Add(delegateDef);
+                }
+                return command;
             })
             .ToArray();
 
         using (sb.BeginBlock("internal static partial class ConsoleApp"))
         {
+            foreach (var d in delegateSignatures)
+            {
+                sb.AppendLine(d);
+            }
+
             var emitter = new Emitter();
             emitter.EmitBuilder(sb, commandIds, hasRun, hasRunAsync);
         }
@@ -748,7 +760,7 @@ public CollectBuilderContext(ImmutableArray<BuilderContext> contexts, Cancellati
                 .Select(x =>
                 {
                     var wellKnownTypes = new WellKnownTypes(x.Model.Compilation);
-                    var parser = new Parser(DiagnosticReporter, x.Node, x.Model, wellKnownTypes, DelegateBuildType.OnlyActionFunc, globalFilters);
+                    var parser = new Parser(DiagnosticReporter, x.Node, x.Model, wellKnownTypes, DelegateBuildType.MakeCustomDelegateWhenHasDefaultValueOrTooLarge, globalFilters);
                     var command = parser.ParseAndValidateForBuilderDelegateRegistration();
 
                     // validation command name duplicate
diff --git a/src/ConsoleAppFramework/Emitter.cs b/src/ConsoleAppFramework/Emitter.cs
@@ -29,7 +29,7 @@ public void EmitRun(SourceBuilder sb, CommandWithId commandWithId, bool isRunAsy
         methodName = methodName ?? (isRunAsync ? "RunAsync" : "Run");
         var unsafeCode = (command.MethodKind == MethodKind.FunctionPointer) ? "unsafe " : "";
 
-        var commandMethodType = command.BuildDelegateSignature(out var delegateType);
+        var commandMethodType = command.BuildDelegateSignature(commandWithId.BuildCustomDelegateTypeName(), out var delegateType);
         if (commandMethodType != null)
         {
             commandMethodType = $", {commandMethodType} command";
@@ -539,7 +539,7 @@ void EmitLeafCommand(CommandWithId? command)
 
         void EmitFilterInvoker(CommandWithId command)
         {
-            var commandType = command.Command.BuildDelegateSignature(out _);
+            var commandType = command.Command.BuildDelegateSignature(command.BuildCustomDelegateTypeName(), out _);
             var needsCommand = commandType != null;
             if (needsCommand) commandType = $", {commandType} command";
 
@@ -605,5 +605,17 @@ public void EmitHelp(SourceBuilder sb, CommandWithId[] commands)
         }
     }
 
-    internal record CommandWithId(string? FieldType, Command Command, int Id);
+    internal record CommandWithId(string? FieldType, Command Command, int Id)
+    {
+        public static string BuildCustomDelegateTypeName(int id)
+        {
+            if (id < 0) return "DelegateCommand";
+            return $"DelegateCommand{id}";
+        }
+
+        public string BuildCustomDelegateTypeName()
+        {
+            return BuildCustomDelegateTypeName(Id);
+        }
+    }
 }
diff --git a/tests/ConsoleAppFramework.GeneratorTests/BuildCustomDelegateTest.cs b/tests/ConsoleAppFramework.GeneratorTests/BuildCustomDelegateTest.cs
@@ -0,0 +1,174 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ConsoleAppFramework.GeneratorTests;
+
+public class BuildCustomDelegateTest(ITestOutputHelper output)
+{
+    VerifyHelper verifier = new VerifyHelper(output, "CAF");
+
+    [Fact]
+    public void Run()
+    {
+        var code = """
+ConsoleApp.Run(args, (
+bool a1,
+bool a2,
+bool a3,
+bool a4,
+bool a5,
+bool a6,
+bool a7,
+bool a8,
+bool a9,
+bool a10,
+bool a11,
+bool a12,
+bool a13,
+bool a14,
+bool a15,
+bool a16 // ok it is Action
+) => { Console.Write("ok"); });
+""";
+
+        verifier.Execute(code, "", "ok");
+
+        var code2 = """
+ConsoleApp.Run(args, (
+bool a1,
+bool a2,
+bool a3,
+bool a4,
+bool a5,
+bool a6,
+bool a7,
+bool a8,
+bool a9,
+bool a10,
+bool a11,
+bool a12,
+bool a13,
+bool a14,
+bool a15,
+bool a16,
+bool a17 // custom delegate
+) => { Console.Write("ok"); });
+""";
+
+        verifier.Execute(code2, "", "ok");
+
+
+        verifier.Execute("""
+var t = new Test();
+ConsoleApp.Run(args, t.Handle);
+
+public partial class Test
+{
+    public void Handle(
+        bool a1,
+        bool a2,
+        bool a3,
+        bool a4,
+        bool a5,
+        bool a6,
+        bool a7,
+        bool a8,
+        bool a9,
+        bool a10,
+        bool a11,
+        bool a12,
+        bool a13,
+        bool a14,
+        bool a15,
+        bool a16,
+        bool a17,
+        bool a18,
+        bool a19
+    )
+    {
+        Console.Write("ok");
+    }
+}
+""", "", "ok");
+
+
+
+        verifier.Execute("""
+unsafe
+{
+    ConsoleApp.Run(args, &Test.Handle);
+}
+
+public partial class Test
+{
+    public static void Handle(
+        bool a1,
+        bool a2,
+        bool a3,
+        bool a4,
+        bool a5,
+        bool a6,
+        bool a7,
+        bool a8,
+        bool a9,
+        bool a10,
+        bool a11,
+        bool a12,
+        bool a13,
+        bool a14,
+        bool a15,
+        bool a16,
+        bool a17,
+        bool a18,
+        bool a19
+    )
+    {
+        Console.Write("ok");
+    }
+}
+""", "", "ok");
+    }
+
+    [Fact]
+    public void Builder()
+    {
+        verifier.Execute("""
+var t = new Test();
+
+var app = ConsoleApp.Create();
+app.Add("", t.Handle);
+app.Run(args);
+
+public partial class Test
+{
+    public void Handle(
+        bool a1,
+        bool a2,
+        bool a3,
+        bool a4,
+        bool a5,
+        bool a6,
+        bool a7,
+        bool a8,
+        bool a9,
+        bool a10,
+        bool a11,
+        bool a12,
+        bool a13,
+        bool a14,
+        bool a15,
+        bool a16,
+        bool a17,
+        bool a18,
+        bool a19
+    )
+    {
+        Console.Write("ok");
+    }
+}
+""", "", "ok");
+    }
+}
diff --git a/tests/ConsoleAppFramework.GeneratorTests/CSharpGeneratorRunner.cs b/tests/ConsoleAppFramework.GeneratorTests/CSharpGeneratorRunner.cs
@@ -29,7 +29,7 @@ public static void InitializeCompilation()
         var compilation = CSharpCompilation.Create("generatortest",
             references: references,
             syntaxTrees: [CSharpSyntaxTree.ParseText(globalUsings, path: "GlobalUsings.cs")],
-            options: new CSharpCompilationOptions(OutputKind.ConsoleApplication)); // .exe
+            options: new CSharpCompilationOptions(OutputKind.ConsoleApplication, allowUnsafe: true)); // .exe
 
         baseCompilation = compilation;
     }

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public static void InitializeCompilation()`
`29`	`29`	`var compilation = CSharpCompilation.Create("generatortest",`
`30`	`30`	`references: references,`
`31`	`31`	`syntaxTrees: [CSharpSyntaxTree.ParseText(globalUsings, path: "GlobalUsings.cs")],`
`32`		`- options: new CSharpCompilationOptions(OutputKind.ConsoleApplication)); // .exe`
	`32`	`+ options: new CSharpCompilationOptions(OutputKind.ConsoleApplication, allowUnsafe: true)); // .exe`
`33`	`33`
`34`	`34`	`baseCompilation = compilation;`
`35`	`35`	`}`