Refactor parsing methods to replace OperationParseHeader with OperationHeader for improved clarity and consistency across multiple classes.

Author: jonathanvdc

src/MLIR.Generators/Emitters/AssemblyFormat/TryParseEmitter.cs

@@ -54,7 +54,7 @@ public static void Emit(StringBuilder builder, OperationModel operation, Operati
 
     private void EmitMethod(StringBuilder builder)
     {
-        builder.AppendLine("    protected override ParseResult<OperationBodySyntax> TryParseBody(in OperationParseHeader header, OperationParsingContext context)");
+        builder.AppendLine("    protected override ParseResult<OperationBodySyntax> TryParseBody(in OperationHeader header, OperationParsingContext context)");
         builder.AppendLine("    {");
 
         var format = operation.AssemblyFormat!;

src/MLIR/Dialects/Extensions/FuncOperationAssemblyFormat.cs

@@ -27,7 +27,7 @@ public FuncOperationAssemblyFormat(OperationDefinition definition)
 
     /// <inheritdoc/>
     protected override ParseResult<OperationBodySyntax> TryParseBody(
-        in OperationParseHeader header,
+        in OperationHeader header,
         OperationParsingContext context)
     {
         if (header.ResultList.Count != 0 || header.EqualsToken.HasValue)

src/MLIR/Dialects/Extensions/SelectLikeOperationAssemblyFormat.cs

@@ -31,7 +31,7 @@ public SelectLikeOperationAssemblyFormat(OperationDefinition definition)
 
     /// <inheritdoc/>
     protected override ParseResult<OperationBodySyntax> TryParseBody(
-        in OperationParseHeader header,
+        in OperationHeader header,
         OperationParsingContext context)
     {
         var conditionResult = context.TryParseSsaToken();

src/MLIR/Dialects/IOperationAssemblyFormat.cs

@@ -44,7 +44,7 @@ public ParseResult<OperationSyntax> TryParse(OperationParsingContext context)
     /// <param name="context">The parsing context.</param>
     /// <param name="header">The parsed operation header.</param>
     /// <returns>The parsed operation syntax, a no-match result, or a diagnostic-producing failure.</returns>
-    public ParseResult<OperationSyntax> TryParseAfterHeader(OperationParseHeader header, in OperationParsingContext context)
+    public ParseResult<OperationSyntax> TryParseAfterHeader(OperationHeader header, in OperationParsingContext context)
     {
         var result = TryParseBody(header, context);
         if (!result.IsSuccess)
@@ -71,7 +71,7 @@ public ParseResult<OperationSyntax> TryParseAfterHeader(OperationParseHeader hea
     /// <param name="context">The parsing context.</param>
     /// <returns>The parsed operation body syntax, a no-match result, or a diagnostic-producing failure.</returns>
     protected abstract ParseResult<OperationBodySyntax> TryParseBody(
-        in OperationParseHeader header,
+        in OperationHeader header,
         OperationParsingContext context);
 
     /// <summary>

src/MLIR/Text/OperationParseHeader.cs src/MLIR/Syntax/OperationHeader.cssrc/MLIR/Text/OperationParseHeader.cs renamed to src/MLIR/Syntax/OperationHeader.cs

@@ -1,17 +1,15 @@
-namespace MLIR.Text;
-
-using MLIR.Syntax;
+namespace MLIR.Syntax;
 
 /// <summary>
 /// Carries the operation header parsed before dispatching to a custom operation assembly format.
 /// </summary>
 /// <remarks>
-/// Initializes a new instance of the <see cref="OperationParseHeader"/> class.
+/// Initializes a new instance of the <see cref="OperationHeader"/> class.
 /// </remarks>
 /// <param name="nameToken">The parsed operation name token.</param>
 /// <param name="resultList">The parsed SSA result tokens with their separator tokens.</param>
 /// <param name="equalsToken">The parsed equals token, if present.</param>
-public readonly struct OperationParseHeader(
+public readonly struct OperationHeader(
     Token nameToken,
     SeparatedSyntaxList<Token> resultList,
     Token? equalsToken)

src/MLIR/Text/OperationParsingContext.cs

@@ -18,7 +18,7 @@ internal OperationParsingContext(Parser parser)
     /// <summary>
     /// Parses an operation header: optional SSA result list, optional equals token, and operation name token.
     /// </summary>
-    public ParseResult<OperationParseHeader> TryParseHeader()
+    public ParseResult<OperationHeader> TryParseHeader()
     {
         var resultItems = new List<Token>();
         var resultSeparators = new List<Token>();
@@ -29,7 +29,7 @@ public ParseResult<OperationParseHeader> TryParseHeader()
             var firstResultTokenResult = TryParseSsaToken();
             if (!firstResultTokenResult.IsSuccess)
             {
-                return ParseResult<OperationParseHeader>.Failure(firstResultTokenResult.Diagnostic!);
+                return ParseResult<OperationHeader>.Failure(firstResultTokenResult.Diagnostic!);
             }
 
             var firstResultToken = firstResultTokenResult.Value;
@@ -40,7 +40,7 @@ public ParseResult<OperationParseHeader> TryParseHeader()
                 var countTokenResult = Expect(TokenKind.Integer, "Expected result count after ':'.");
                 if (!countTokenResult.IsSuccess)
                 {
-                    return ParseResult<OperationParseHeader>.Failure(countTokenResult.Diagnostic!);
+                    return ParseResult<OperationHeader>.Failure(countTokenResult.Diagnostic!);
                 }
 
                 var count = int.Parse(countTokenResult.Value.Text, CultureInfo.InvariantCulture);
@@ -56,7 +56,7 @@ public ParseResult<OperationParseHeader> TryParseHeader()
                 var nextResultToken = TryParseSsaToken();
                 if (!nextResultToken.IsSuccess)
                 {
-                    return ParseResult<OperationParseHeader>.Failure(nextResultToken.Diagnostic!);
+                    return ParseResult<OperationHeader>.Failure(nextResultToken.Diagnostic!);
                 }
 
                 resultItems.Add(nextResultToken.Value);
@@ -65,7 +65,7 @@ public ParseResult<OperationParseHeader> TryParseHeader()
             var equalsTokenResult = Expect(TokenKind.Equal, "Expected '=' after operation result list.");
             if (!equalsTokenResult.IsSuccess)
             {
-                return ParseResult<OperationParseHeader>.Failure(equalsTokenResult.Diagnostic!);
+                return ParseResult<OperationHeader>.Failure(equalsTokenResult.Diagnostic!);
             }
 
             equalsToken = equalsTokenResult.Value;
@@ -82,10 +82,10 @@ public ParseResult<OperationParseHeader> TryParseHeader()
         }
         else
         {
-            return ParseResult<OperationParseHeader>.Failure(CreateDiagnostic("Expected an operation name."));
+            return ParseResult<OperationHeader>.Failure(CreateDiagnostic("Expected an operation name."));
         }
 
-        return ParseResult<OperationParseHeader>.Success(new OperationParseHeader(
+        return ParseResult<OperationHeader>.Success(new OperationHeader(
             nameToken,
             new SeparatedSyntaxList<Token>(resultItems, resultSeparators),
             equalsToken));

tests/MLIR.Generators.Tests/DialectGeneratorAssemblyFormatTests.cs

@@ -110,7 +110,7 @@ public void TryParseGeneratesOperandAndLiteralParsingCallsForAddIOp()
         AssertContainsAll(
             registrationSource,
             "protected override ParseResult<OperationBodySyntax> TryParseBody(",
-            "in OperationParseHeader header,",
+            "in OperationHeader header,",
             "var lhsResult = context.TryParseSsaToken();",
             "var rhsResult = context.TryParseSsaToken();",
             "context.Expect(TokenKind.Comma, ",

tests/MLIR.Tests/ParsingTests.cs

@@ -62,7 +62,7 @@ public override SyntaxNode Rewrite(SyntaxRewriter rewriter)
     private sealed class PrefixConstantAssemblyFormat : BodyOnlyOperationAssemblyFormat
     {
         protected override ParseResult<OperationBodySyntax> TryParseBody(
-            in OperationParseHeader header,
+            in OperationHeader header,
             OperationParsingContext context)
         {
             if (context.Is(TokenKind.LParen))
@@ -143,7 +143,7 @@ public override SyntaxNode Rewrite(SyntaxRewriter rewriter)
     private sealed class SsaListCapturingAssemblyFormat : BodyOnlyOperationAssemblyFormat
     {
         protected override ParseResult<OperationBodySyntax> TryParseBody(
-            in OperationParseHeader header,
+            in OperationHeader header,
             OperationParsingContext context)
         {
             var listResult = context.TryParseSsaTokenList();

tests/MLIR.Tests/SemanticTestInfrastructure.cs

@@ -444,7 +444,7 @@ public PrefixConstantAssemblyFormat(OperationDefinition definition)
         }
 
         protected override ParseResult<OperationBodySyntax> TryParseBody(
-            in OperationParseHeader header,
+            in OperationHeader header,
             OperationParsingContext context)
         {
             if (context.Is(TokenKind.LParen))
@@ -516,7 +516,7 @@ public ContextDirectedConstantAssemblyFormat(
         }
 
         protected override ParseResult<OperationBodySyntax> TryParseBody(
-            in OperationParseHeader header,
+            in OperationHeader header,
             OperationParsingContext context)
         {
             if (context.Is(TokenKind.LParen))