Merge pull request #500 from FirelyTeam/499-external-parameter-naming

Fix 499 - generating parameter names for external functions
FirelyTeam · Sep 2, 2024 · a44c38b · a44c38b
2 parents 40dfa4f + 805b03a
commit a44c38b
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 5 deletions.
diff --git a/Cql/CodeGeneration.NET/AssemblyCompiler.cs b/Cql/CodeGeneration.NET/AssemblyCompiler.cs
@@ -71,9 +71,10 @@ public AssemblyCompiler(
 
         public IReadOnlyDictionary<string, AssemblyData> Compile(
             LibrarySet librarySet,
-            DefinitionDictionary<LambdaExpression>? definitions = null)
+            DefinitionDictionary<LambdaExpression> definitions)
         {
-            definitions ??= new();
+            if (definitions is null)
+                throw new ArgumentNullException(nameof(definitions));
 
             Dictionary<string, AssemblyData> results = new();
 

diff --git a/Cql/Cql.Compiler/ExpressionBuilderContext.StaticHelpers.cs b/Cql/Cql.Compiler/ExpressionBuilderContext.StaticHelpers.cs
@@ -143,7 +143,10 @@ private static string TypeNameToIdentifier(Type type, ExpressionBuilderContext?
         var typeName = type.Name.ToLowerInvariant();
         if (type.IsGenericType)
         {
-            var genericTypeNames = string.Join("_", type.GetGenericArguments().Select(t => TypeNameToIdentifier(t, ctx)));
+            var typeNames = type.GetGenericArguments()
+                .Select(t => TypeNameToIdentifier(t, ctx)
+                .TrimStart('@'));
+            var genericTypeNames = string.Join("_", typeNames);
             var tick = typeName.IndexOf('`');
             if (tick > -1)
                 typeName = typeName[..tick];

diff --git a/Cql/CqlToElmTests/Base.cs b/Cql/CqlToElmTests/Base.cs
@@ -1,4 +1,5 @@
-using Hl7.Cql.Compiler;
+using Hl7.Cql.CodeGeneration.NET;
+using Hl7.Cql.Compiler;
 using Hl7.Cql.CqlToElm.LibraryProviders;
 using Hl7.Cql.Elm;
 using Hl7.Cql.Fhir;
@@ -26,6 +27,9 @@ public class Base
 
         internal static LibraryExpressionBuilder LibraryExpressionBuilder;
 
+        internal static CSharpLibrarySetToStreamsWriter SourceCodeWriter =>
+            Services.GetRequiredService<CSharpLibrarySetToStreamsWriter>();
+
         internal static MessageProvider Messaging => Services.GetRequiredService<MessageProvider>();
 
 
@@ -41,7 +45,11 @@ protected static IServiceCollection ServiceCollection(Action<CqlToElmOptions>? o
                 .AddMessaging()
                 .AddLogging(builder => builder
                     .AddConsole())
-                .AddSingleton(typeof(ILibraryProvider), libraryProviderType ?? typeof(MemoryLibraryProvider));
+                .AddSingleton(typeof(ILibraryProvider), libraryProviderType ?? typeof(MemoryLibraryProvider))
+                .AddSingleton(typeof(CSharpLibrarySetToStreamsWriter))
+                .AddSingleton(typeof(TypeToCSharpConverter))
+                .AddSingleton(typeof(CqlCompilerFactory))
+                .AddSingleton(isp => isp.GetRequiredService<CqlCompilerFactory>().TypeResolver);
 
         private class TestLibraryProvider : ILibraryProvider
         {
@@ -276,5 +284,41 @@ internal static void AddFHIRHelpers(MemoryLibraryProvider provider,
             provider.Libraries.Add("FHIRHelpers", "4.0.1", builder);
         }
 
+
+        internal static string WriteCSharp(Library library)
+        {
+            var lambdas = LibraryExpressionBuilder.ProcessLibrary(library);
+            var ls = new LibrarySet("", library);
+            var csByNav = new Dictionary<string, string>();
+            var callbacks = new CSharpSourceCodeWriterCallbacks(onAfterStep: afterWrite);
+            SourceCodeWriter.ProcessDefinitions(lambdas, ls, callbacks);
+            return csByNav[library.NameAndVersion()!];
+
+            void afterWrite(CSharpSourceCodeStep step)
+            {
+                switch (step)
+                {
+                    case CSharpSourceCodeStep.OnStream onStream:
+                        onStream.Stream.Seek(0, SeekOrigin.Begin);
+                        using (var reader = new StreamReader(onStream.Stream))
+                        {
+                            var code = reader.ReadToEnd();
+                            csByNav.Add(onStream.Name, code);
+                        }
+                        break;
+                    default:
+                        break;
+                }
+            }
+        }
+
+        internal static byte[] Compile(Library library)
+        {
+            var lambdas = LibraryExpressionBuilder.ProcessLibrary(library);
+            var ccf = Services.GetRequiredService<CqlCompilerFactory>();
+            var asm = new AssemblyCompiler(SourceCodeWriter, ccf.TypeManager, default, default);
+            var dict = asm.Compile(new LibrarySet("",library), lambdas);
+            return dict.Single().Value.Binary;
+        }
     }
 }
diff --git a/Cql/CqlToElmTests/FunctionDefinitionTest.cs b/Cql/CqlToElmTests/FunctionDefinitionTest.cs
@@ -2,6 +2,7 @@
 using System.IO;
 using Antlr4.Runtime;
 using FluentAssertions;
+using Hl7.Cql.Compiler;
 using Hl7.Cql.CqlToElm.Grammar;
 using Hl7.Cql.CqlToElm.LibraryProviders;
 using Hl7.Cql.CqlToElm.Visitors;
@@ -279,5 +280,17 @@ define function Add(left Integer, right Integer) returns Integer: external
             fd.externalSpecified.Should().BeTrue();
             fd.expression.Should().BeNull();
         }
+
+        [TestMethod]
+        public void CSharp_Keyword_Parameter_Name()
+        {
+            var lib = MakeLibrary(@"
+                library FuncTest version '1.0.0'
+
+                define function ToInteger(decimal System.Decimal) returns System.Integer: external
+            ");
+            var asm = Compile(lib);
+
+        }
     }
 }