fix(cs): generator lingering $

betwixt-labs · Aug 12, 2024 · ccb3e2f · ccb3e2f
1 parent 38f4545
commit ccb3e2f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/Core/Generators/CSharp/CSharpGenerator.cs b/Core/Generators/CSharp/CSharpGenerator.cs
@@ -488,6 +488,8 @@ private string CompileDecodeUnion(UnionDefinition definition)
         /// </summary>
         private void CompileUnionFamily(IndentedStringBuilder builder, UnionDefinition ud)
         {
+
+
             var recordAttribute = "[global::Bebop.Attributes.BebopRecord(global::Bebop.Runtime.BebopKind.Union)]";
             var genericPositionalArguments = string.Join(", ", ud.Branches.Select(b => $"T{b.GenericIndex()}")).Trim();
             var genericTypeArguments = string.Join(", ", ud.Branches.Select(b => $"{PrefixNamespace(b.Definition.ClassName())}")).Trim();
@@ -497,6 +499,7 @@ private void CompileUnionFamily(IndentedStringBuilder builder, UnionDefinition u
             var interfaceName = $"I{ud.ClassName()}Member";
 
 
+
             var nullCheck = LanguageVersion == CSharpNine ? "is null" : "== null";
             var notNullCheck = LanguageVersion == CSharpNine ? "is not null" : "!= null";
             var isCheck = LanguageVersion == CSharpNine ? "is" : "==";
@@ -603,7 +606,7 @@ void CompileUnionInterface()
                 builder.AppendLine($"/// Interface for members of the {ud.ClassName()} union");
                 builder.AppendLine("/// </summary>");
                 builder.AppendLine(GeneratedAttribute);
-                builder.AppendLine($"public partial interface ${interfaceName} {{").Indent(indentStep);
+                builder.AppendLine($"public partial interface {interfaceName} {{").Indent(indentStep);
 
                 builder.Dedent(indentStep).AppendLine("}").AppendLine();
             }
@@ -757,10 +760,11 @@ void CompileUnionConcreteClass()
 
                 builder.Dedent(indentStep).AppendLine("}").AppendLine();
             }
-            CompileUnionInterface();
+
             CompileUnionBaseClass();
             CompileUnionConcreteClass();
             CompileUnionStruct();
+            CompileUnionInterface();
         }
 
         #endregion

diff --git a/Laboratory/C#/README.md b/Laboratory/C#/README.md
@@ -1,6 +1,5 @@
 # C# Bebop Laboratory
 
 To run the C# tests, from PowerShell:
-
-    dotnet run --project ..\..\Compiler\ --cs ".\GeneratedTestCode\Output.g.cs" --namespace Bebop.Codegen --files (gci ..\Schemas\Valid\*.bop)
+    dotnet run --project ../../Compiler/ -i ../Schemas/Valid/*.bop build -g "cs:./GeneratedTestCode/Output.g.cs,namespace=Bebop.Codegen"
     dotnet test -nowarn:CS0618