Make all WriteTo methods in MLIR.Syntax public; remove Action callbacks

src/MLIR.Generators/DialectSourceEmitter.cs

@@ -224,7 +224,7 @@ private static void AppendOperationBodySyntaxClass(StringBuilder builder, Operat
         builder.AppendLine("        return false;");
         builder.AppendLine("    }");
         builder.AppendLine();
-        builder.AppendLine("    public override void WriteTo(Text.SyntaxWriter writer, int indentLevel, System.Action<Text.SyntaxWriter, RegionSyntax, int> writeRegion)");
+        builder.AppendLine("    public override void WriteTo(Text.SyntaxWriter writer, int indentLevel)");
         builder.AppendLine("    {");
         foreach (var field in fields)
         {

src/MLIR/Syntax/BlockArgumentSyntax.cs

@@ -56,7 +56,12 @@ public bool TryGetRawType(out RawSyntaxText? rawType)
     /// </summary>
     public RawSyntaxText RawType => TypeSyntax.GetRawText();
 
-    internal void WriteTo(SyntaxWriter writer, string defaultLeadingTrivia)
+    /// <summary>
+    /// Writes this block argument to the supplied syntax writer.
+    /// </summary>
+    /// <param name="writer">The syntax writer to write to.</param>
+    /// <param name="defaultLeadingTrivia">The fallback leading trivia to use when syntax does not carry explicit trivia.</param>
+    public void WriteTo(SyntaxWriter writer, string defaultLeadingTrivia)
     {
         writer.WriteToken(NameToken, defaultLeadingTrivia);
         writer.WriteToken(ColonToken, string.Empty);

src/MLIR/Syntax/BlockSyntax.cs

@@ -1,7 +1,6 @@
 namespace MLIR.Syntax;
 
 using System.Collections.Generic;
-using System;
 using MLIR.Text;
 
 /// <summary>
@@ -72,10 +71,14 @@ public BlockSyntax(
     /// </summary>
     public string Label => LabelToken.Text;
 
-    internal void WriteTo(
+    /// <summary>
+    /// Writes this block to the supplied syntax writer.
+    /// </summary>
+    /// <param name="writer">The syntax writer to write to.</param>
+    /// <param name="regionIndentLevel">The indentation level of the containing region.</param>
+    public void WriteTo(
         SyntaxWriter writer,
-        int regionIndentLevel,
-        Action<SyntaxWriter, OperationSyntax, int, string> writeOperation)
+        int regionIndentLevel)
     {
         // Synthetic entry blocks are a parser implementation detail. Omit their labels when
         // printing unless the block carries arguments that require an explicit header.
@@ -108,7 +111,7 @@ internal void WriteTo(
         var operationIndentLevel = blockHasExplicitLabel ? regionIndentLevel + 2 : regionIndentLevel + 1;
         foreach (var operation in Operations)
         {
-            writeOperation(writer, operation, operationIndentLevel, "\n");
+            writer.WriteOperation(operation, operationIndentLevel, "\n");
         }
     }
 

src/MLIR/Syntax/GenericOperationBodySyntax.cs

@@ -77,7 +77,7 @@ public override bool TryGetGenericBody(out GenericOperationBodySyntax? genericBo
     }
 
     /// <inheritdoc/>
-    public override void WriteTo(Text.SyntaxWriter writer, int indentLevel, System.Action<Text.SyntaxWriter, RegionSyntax, int> writeRegion)
+    public override void WriteTo(Text.SyntaxWriter writer, int indentLevel)
     {
         writer.WriteToken(OperandList.OpenToken!.Value, string.Empty);
         for (var i = 0; i < OperandList.Count; i++)
@@ -110,7 +110,7 @@ public override void WriteTo(Text.SyntaxWriter writer, int indentLevel, System.A
 
         foreach (var region in Regions)
         {
-            writeRegion(writer, region, indentLevel);
+            writer.WriteRegion(region, indentLevel);
         }
 
         if (Attributes.OpenToken != null)

src/MLIR/Syntax/ModuleSyntax.cs

@@ -32,7 +32,11 @@ public ModuleSyntax(IReadOnlyList<OperationSyntax> operations)
     /// </summary>
     public SyntaxToken EndOfFileToken { get; } = endOfFileToken;
 
-    internal void WriteTo(SyntaxWriter writer)
+    /// <summary>
+    /// Writes this module to the supplied syntax writer.
+    /// </summary>
+    /// <param name="writer">The syntax writer to write to.</param>
+    public void WriteTo(SyntaxWriter writer)
     {
         for (var i = 0; i < Operations.Count; i++)
         {

src/MLIR/Syntax/OperationBodySyntax.cs

@@ -35,5 +35,5 @@ public GenericOperationBodySyntax GetGenericBody()
     /// <summary>
     /// Writes the operation body to the supplied syntax writer.
     /// </summary>
-    public abstract void WriteTo(Text.SyntaxWriter writer, int indentLevel, System.Action<Text.SyntaxWriter, RegionSyntax, int> writeRegion);
+    public abstract void WriteTo(Text.SyntaxWriter writer, int indentLevel);
 }

src/MLIR/Syntax/OperationSyntax.cs

@@ -1,7 +1,6 @@
 namespace MLIR.Syntax;
 
 using System.Collections.Generic;
-using System;
 using MLIR.Text;
 
 /// <summary>
@@ -221,11 +220,16 @@ public bool TryGetRawTypeSignature(out RawSyntaxText? rawTypeSignature)
     /// </summary>
     public bool HasCustomAssemblyBody => Body is not GenericOperationBodySyntax;
 
-    internal void WriteTo(
+    /// <summary>
+    /// Writes this operation to the supplied syntax writer.
+    /// </summary>
+    /// <param name="writer">The syntax writer to write to.</param>
+    /// <param name="indentLevel">The indentation level to use when indentation is synthesized.</param>
+    /// <param name="defaultLeadingTrivia">The fallback leading trivia to use when syntax does not carry explicit trivia.</param>
+    public void WriteTo(
         SyntaxWriter writer,
         int indentLevel,
-        string defaultLeadingTrivia,
-        Action<SyntaxWriter, RegionSyntax, int> writeRegion)
+        string defaultLeadingTrivia)
     {
         if (ResultTokens.Count > 0)
         {
@@ -247,7 +251,7 @@ internal void WriteTo(
             writer.WriteToken(NameToken, defaultLeadingTrivia, indentLevel);
         }
 
-        Body.WriteTo(writer, indentLevel, writeRegion);
+        Body.WriteTo(writer, indentLevel);
     }
 
     private static IReadOnlyList<SyntaxToken> CreateValueTokens(IReadOnlyList<string> values)

src/MLIR/Syntax/RegionSyntax.cs

@@ -1,7 +1,6 @@
 namespace MLIR.Syntax;
 
 using System.Collections.Generic;
-using System;
 using MLIR.Text;
 
 /// <summary>
@@ -39,16 +38,20 @@ public RegionSyntax(IReadOnlyList<BlockSyntax> blocks)
     /// </summary>
     public SyntaxToken CloseBraceToken { get; } = closeBraceToken;
 
-    internal void WriteTo(
+    /// <summary>
+    /// Writes this region to the supplied syntax writer.
+    /// </summary>
+    /// <param name="writer">The syntax writer to write to.</param>
+    /// <param name="indentLevel">The indentation level of the containing operation.</param>
+    public void WriteTo(
         SyntaxWriter writer,
-        int indentLevel,
-        Action<SyntaxWriter, OperationSyntax, int, string> writeOperation)
+        int indentLevel)
     {
         writer.WriteToken(OpenBraceToken, " ");
 
         foreach (var block in Blocks)
         {
-            block.WriteTo(writer, indentLevel, writeOperation);
+            block.WriteTo(writer, indentLevel);
         }
 
         writer.WriteToken(CloseBraceToken, "\n", indentLevel);

src/MLIR/Text/SyntaxWriter.cs

@@ -1,6 +1,5 @@
 namespace MLIR.Text;
 
-using System;
 using System.Text;
 using MLIR.Syntax;
 
@@ -60,8 +59,7 @@ public void WriteModule(ModuleSyntax module)
     /// <param name="defaultLeadingTrivia">The fallback leading trivia to use when syntax does not carry explicit trivia.</param>
     public void WriteOperation(OperationSyntax operation, int indentLevel, string defaultLeadingTrivia)
     {
-        operation.WriteTo(this, indentLevel, defaultLeadingTrivia, static (writer, region, innerIndentLevel) =>
-            writer.WriteRegion(region, innerIndentLevel));
+        operation.WriteTo(this, indentLevel, defaultLeadingTrivia);
     }
 
     /// <summary>
@@ -71,8 +69,7 @@ public void WriteOperation(OperationSyntax operation, int indentLevel, string de
     /// <param name="indentLevel">The indentation level of the containing operation.</param>
     public void WriteRegion(RegionSyntax region, int indentLevel)
     {
-        region.WriteTo(this, indentLevel, static (writer, operation, operationIndentLevel, operationLeadingTrivia) =>
-            writer.WriteOperation(operation, operationIndentLevel, operationLeadingTrivia));
+        region.WriteTo(this, indentLevel);
     }
 
     /// <summary>
@@ -82,8 +79,7 @@ public void WriteRegion(RegionSyntax region, int indentLevel)
     /// <param name="regionIndentLevel">The indentation level of the containing region.</param>
     public void WriteBlock(BlockSyntax block, int regionIndentLevel)
     {
-        block.WriteTo(this, regionIndentLevel, static (writer, operation, operationIndentLevel, operationLeadingTrivia) =>
-            writer.WriteOperation(operation, operationIndentLevel, operationLeadingTrivia));
+        block.WriteTo(this, regionIndentLevel);
     }
 
     /// <summary>

tests/MLIR.Generators.Tests/DialectGeneratorTests.cs

@@ -103,7 +103,7 @@ public void GeneratesOperationBodySyntaxClassForDeclarativeAssemblyFormat()
         Assert.Contains("return false;", registrationSource);
 
         // WriteTo is implemented.
-        Assert.Contains("public override void WriteTo(Text.SyntaxWriter writer, int indentLevel, System.Action<Text.SyntaxWriter, RegionSyntax, int> writeRegion)", registrationSource);
+        Assert.Contains("public override void WriteTo(Text.SyntaxWriter writer, int indentLevel)", registrationSource);
     }
 
     [Fact]

tests/MLIR.Tests/ConstructionTests.cs

@@ -40,7 +40,7 @@ public override bool TryGetGenericBody(out GenericOperationBodySyntax? genericBo
             return true;
         }
 
-        public override void WriteTo(SyntaxWriter writer, int indentLevel, System.Action<SyntaxWriter, RegionSyntax, int> writeRegion)
+        public override void WriteTo(SyntaxWriter writer, int indentLevel)
         {
             writer.WriteRaw(Value, " ");
             writer.WriteToken(ColonToken, " ");

tests/MLIR.Tests/ParsingTests.cs

@@ -39,7 +39,7 @@ public override bool TryGetGenericBody(out GenericOperationBodySyntax? genericBo
             return true;
         }
 
-        public override void WriteTo(SyntaxWriter writer, int indentLevel, System.Action<SyntaxWriter, RegionSyntax, int> writeRegion)
+        public override void WriteTo(SyntaxWriter writer, int indentLevel)
         {
             writer.WriteRaw(value, " ");
             writer.WriteToken(this.genericBody.TypeSignatureColonToken ?? new SyntaxToken(":"), " ");

tests/MLIR.Tests/SemanticTests.cs

@@ -57,7 +57,7 @@ public override bool TryGetGenericBody(out GenericOperationBodySyntax? genericBo
             return true;
         }
 
-        public override void WriteTo(SyntaxWriter writer, int indentLevel, System.Action<SyntaxWriter, RegionSyntax, int> writeRegion)
+        public override void WriteTo(SyntaxWriter writer, int indentLevel)
         {
             writer.WriteRaw(Value, " ");
             writer.WriteToken(ColonToken, " ");