Rename the Token class to Tokens

Author: Cédric Belin

src/BranchCoverage.cs

@@ -29,7 +29,7 @@ public sealed class BranchCoverage(int found = 0, int hit = 0, IEnumerable<Branc
 	/// <returns>The string representation of this object.</returns>
 	public override string ToString() => string.Join('\n', [
 		.. Data.Select(item => item.ToString()),
-		$"{Token.BranchesFound}:{Found}",
-		$"{Token.BranchesHit}:{Hit}"
+		$"{Tokens.BranchesFound}:{Found}",
+		$"{Tokens.BranchesHit}:{Hit}"
 	]);
 }

src/BranchData.cs

@@ -14,7 +14,7 @@ public sealed record BranchData(int LineNumber = 0, int BlockNumber = 0, int Bra
 	/// </summary>
 	/// <returns>The string representation of this object.</returns>
 	public override string ToString() {
-		var value = $"{Token.BranchData}:{LineNumber},{BlockNumber},{BranchNumber}";
+		var value = $"{Tokens.BranchData}:{LineNumber},{BlockNumber},{BranchNumber}";
 		return Taken > 0 ? $"{value},{Taken}" : $"{value},-";
 	}
 }

src/FunctionCoverage.cs

@@ -30,7 +30,7 @@ public sealed class FunctionCoverage(int found = 0, int hit = 0, IEnumerable<Fun
 	public override string ToString() => string.Join('\n', [
 		.. Data.Select(item => item.ToString(asDefinition: true)),
 		.. Data.Select(item => item.ToString(asDefinition: false)),
-		$"{Token.FunctionsFound}:{Found}",
-		$"{Token.FunctionsHit}:{Hit}"
+		$"{Tokens.FunctionsFound}:{Found}",
+		$"{Tokens.FunctionsHit}:{Hit}"
 	]);
 }

src/FunctionData.cs

@@ -21,7 +21,7 @@ public sealed record FunctionData(string FunctionName = "", int LineNumber = 0,
 	/// <param name="asDefinition">Whether to return the function definition instead of its data.</param>
 	/// <returns>The string representation of this object.</returns>
 	public string ToString(bool asDefinition) {
-		var token = asDefinition ? Token.FunctionName : Token.FunctionData;
+		var token = asDefinition ? Tokens.FunctionName : Tokens.FunctionData;
 		var count = asDefinition ? LineNumber : ExecutionCount;
 		return $"{token}:{count},{FunctionName}";
 	}

src/LineCoverage.cs

@@ -29,7 +29,7 @@ public sealed class LineCoverage(int found = 0, int hit = 0, IEnumerable<LineDat
 	/// <returns>The string representation of this object.</returns>
 	public override string ToString() => string.Join('\n', [
 		.. Data.Select(item => item.ToString()),
-		$"{Token.LinesFound}:{Found}",
-		$"{Token.LinesHit}:{Hit}"
+		$"{Tokens.LinesFound}:{Found}",
+		$"{Tokens.LinesHit}:{Hit}"
 	]);
 }

src/LineData.cs

@@ -13,7 +13,7 @@ public sealed record LineData(int LineNumber = 0, int ExecutionCount = 0, string
 	/// </summary>
 	/// <returns>The string representation of this object.</returns>
 	public override string ToString() {
-		var value = $"{Token.LineData}:{LineNumber},{ExecutionCount}";
+		var value = $"{Tokens.LineData}:{LineNumber},{ExecutionCount}";
 		return string.IsNullOrWhiteSpace(Checksum) ? value : $"{value},{Checksum}";
 	}
 }

src/Report.cs

@@ -36,16 +36,16 @@ public static Report Parse(string coverage) {
 			if (string.IsNullOrWhiteSpace(line)) continue;
 
 			var parts = line.Trim().Split(':');
-			if (parts.Length < 2 && parts[0] != Token.EndOfRecord) throw new FormatException($"Invalid token format at line {offset}.");
+			if (parts.Length < 2 && parts[0] != Tokens.EndOfRecord) throw new FormatException($"Invalid token format at line {offset}.");
 
 			var data = string.Join(':', parts[1..]).Split(',');
 			var token = parts[0];
 			switch (token) {
-				case Token.TestName: if (string.IsNullOrWhiteSpace(report.TestName)) report.TestName = data[0]; break;
-				case Token.SourceFile: sourceFile = new(data[0]) { Branches = new(), Functions = new(), Lines = new() }; break;
-				case Token.EndOfRecord: report.SourceFiles.Add(sourceFile); break;
+				case Tokens.TestName: if (string.IsNullOrWhiteSpace(report.TestName)) report.TestName = data[0]; break;
+				case Tokens.SourceFile: sourceFile = new(data[0]) { Branches = new(), Functions = new(), Lines = new() }; break;
+				case Tokens.EndOfRecord: report.SourceFiles.Add(sourceFile); break;
 
-				case Token.BranchData:
+				case Tokens.BranchData:
 					if (data.Length < 4) throw new FormatException($"Invalid branch data at line #{offset}.");
 					sourceFile.Branches?.Data.Add(new() {
 						BlockNumber = int.Parse(data[1]),
@@ -55,7 +55,7 @@ public static Report Parse(string coverage) {
 					});
 					break;
 
-				case Token.FunctionData:
+				case Tokens.FunctionData:
 					if (data.Length < 2) throw new FormatException($"Invalid function data at line #{offset}.");
 					if (sourceFile.Functions is not null) {
 						var items = sourceFile.Functions.Data;
@@ -66,12 +66,12 @@ public static Report Parse(string coverage) {
 					}
 					break;
 
-				case Token.FunctionName:
+				case Tokens.FunctionName:
 					if (data.Length < 2) throw new FormatException($"Invalid function name at line #{offset}.");
 					sourceFile.Functions?.Data.Add(new() { FunctionName = data[1], LineNumber = int.Parse(data[0]) });
 					break;
 
-				case Token.LineData:
+				case Tokens.LineData:
 					if (data.Length < 2) throw new FormatException($"Invalid line data at line #{offset}.");
 					sourceFile.Lines?.Data.Add(new() {
 						Checksum = data.Length >= 3 ? data[2] : string.Empty,
@@ -80,12 +80,12 @@ public static Report Parse(string coverage) {
 					});
 					break;
 
-				case Token.BranchesFound when sourceFile.Branches is not null: sourceFile.Branches.Found = int.Parse(data[0]); break;
-				case Token.BranchesHit when sourceFile.Branches is not null: sourceFile.Branches.Hit = int.Parse(data[0]); break;
-				case Token.FunctionsFound when sourceFile.Functions is not null: sourceFile.Functions.Found = int.Parse(data[0]); break;
-				case Token.FunctionsHit when sourceFile.Functions is not null: sourceFile.Functions.Hit = int.Parse(data[0]); break;
-				case Token.LinesFound when sourceFile.Lines is not null: sourceFile.Lines.Found = int.Parse(data[0]); break;
-				case Token.LinesHit when sourceFile.Lines is not null: sourceFile.Lines.Hit = int.Parse(data[0]); break;
+				case Tokens.BranchesFound when sourceFile.Branches is not null: sourceFile.Branches.Found = int.Parse(data[0]); break;
+				case Tokens.BranchesHit when sourceFile.Branches is not null: sourceFile.Branches.Hit = int.Parse(data[0]); break;
+				case Tokens.FunctionsFound when sourceFile.Functions is not null: sourceFile.Functions.Found = int.Parse(data[0]); break;
+				case Tokens.FunctionsHit when sourceFile.Functions is not null: sourceFile.Functions.Hit = int.Parse(data[0]); break;
+				case Tokens.LinesFound when sourceFile.Lines is not null: sourceFile.Lines.Found = int.Parse(data[0]); break;
+				case Tokens.LinesHit when sourceFile.Lines is not null: sourceFile.Lines.Hit = int.Parse(data[0]); break;
 				default: throw new FormatException($"Unknown token at line {offset}.");
 			}
 		}
@@ -115,7 +115,7 @@ public static bool TryParse(string coverage, [NotNullWhen(true)] out Report? rep
 	/// </summary>
 	/// <returns>The string representation of this object.</returns>
 	public override string ToString() => string.Join('\n', [
-		.. string.IsNullOrWhiteSpace(TestName) ? Array.Empty<string>() : [$"{Token.TestName}:{TestName}"],
+		.. string.IsNullOrWhiteSpace(TestName) ? Array.Empty<string>() : [$"{Tokens.TestName}:{TestName}"],
 		.. SourceFiles.Select(item => item.ToString())
 	]);
 }

src/SourceFile.cs

@@ -34,11 +34,11 @@ public sealed class SourceFile(string path, FunctionCoverage? functions = null,
 	/// </summary>
 	/// <returns>The string representation of this object.</returns>
 	public override string ToString() {
-		List<string> output = [$"{Token.SourceFile}:{Path}"];
+		List<string> output = [$"{Tokens.SourceFile}:{Path}"];
 		if (Functions is not null) output.Add(Functions.ToString());
 		if (Branches is not null) output.Add(Branches.ToString());
 		if (Lines is not null) output.Add(Lines.ToString());
-		output.Add(Token.EndOfRecord);
+		output.Add(Tokens.EndOfRecord);
 		return string.Join('\n', output);
 	}
 }

src/Token.cs renamed to src/Tokens.cs

@@ -3,7 +3,7 @@ namespace Belin.Lcov;
 /// <summary>
 /// Provides the list of tokens supported by the parser.
 /// </summary>
-public static class Token {
+public static class Tokens {
 
 	/// <summary>
 	/// The coverage data of a branch.