Add Spectre.Console to add coloured output

Author: tomc128

BooleanExpressionParser/BooleanExpressionParser.csproj

@@ -8,6 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Spectre.Console" Version="0.45.0" />
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
     <PackageReference Include="System.CommandLine.DragonFruit" Version="0.4.0-alpha.22272.1" />
   </ItemGroup>

BooleanExpressionParser/Formatter.cs

@@ -4,7 +4,10 @@ namespace BooleanExpressionParser;
 
 class Formatter
 {
-    public static string FormatTokens(IEnumerable<Token> tokens)
+    public string True { get; set; } = "1";
+    public string False { get; set; } = "0";
+
+    public string FormatTokens(IEnumerable<Token> tokens)
     {
         var sb = new StringBuilder();
 
@@ -18,7 +21,7 @@ public static string FormatTokens(IEnumerable<Token> tokens)
         return sb.ToString();
     }
 
-    public static string FormatTruthTable(Ast ast, List<bool[]> table, string label = "Result")
+    public string FormatTruthTable(Ast ast, List<bool[]> table, string label = "Result")
     {
         var sb = new StringBuilder();
 
@@ -44,12 +47,12 @@ public static string FormatTruthTable(Ast ast, List<bool[]> table, string label
             {
                 string pad1 = Repeat(' ', (int)Math.Ceiling(ast.Variables[i].Length / 2.0f));
                 string pad2 = Repeat(' ', (int)Math.Floor(ast.Variables[i].Length / 2.0f));
-                sb.Append($"{pad1}{(row[i] ? '1' : '0')}{pad2} ");
+                sb.Append($"{pad1}{(row[i] ? $"[green]{True}[/]" : $"[red]{False}[/]")}{pad2} ");
             }
 
             string pad3 = Repeat(' ', (int)Math.Ceiling(label.Length / 2.0f));
             string pad4 = Repeat(' ', (int)Math.Floor(label.Length / 2.0f));
-            sb.AppendLine($" ┃ {pad3}{(row[^1] ? '1' : '0')}{pad4}  ┃");
+            sb.AppendLine($" ┃ {pad3}{(row[^1] ? $"[green]{True}[/]" : $"[red]{False}[/]")}{pad4}  ┃");
         }
 
         sb.Append("┗━");
@@ -61,7 +64,7 @@ public static string FormatTruthTable(Ast ast, List<bool[]> table, string label
 
     static string Repeat(char c, int count) => new string(c, count);
 
-    public static String JoinTruthTables(params string[] tables)
+    public String JoinTruthTables(params string[] tables)
     {
         var sb = new StringBuilder();
 

BooleanExpressionParser/Parser.cs

@@ -20,7 +20,8 @@ public IEnumerable<Token> ParseTokens(IEnumerable<Token> tokens)
                     break;
 
                 case OperatorToken op:
-                    while ((stack.Count > 0 && stack.Peek() is OperatorToken && stack.Peek() is not OpenParenToken) && ((stack.Peek() as OperatorToken)!.Precedence >= op!.Precedence))
+                    while ((stack.Count > 0 && stack.Peek() is OperatorToken && stack.Peek() is not OpenParenToken) &&
+                           ((stack.Peek() as OperatorToken)!.Precedence >= op!.Precedence))
                     {
                         output.Enqueue(stack.Pop());
                     }
@@ -62,7 +63,7 @@ public IEnumerable<Token> ParseTokens(IEnumerable<Token> tokens)
         return output;
     }
 
-    public Ast GrowAst(IEnumerable<Token> tokens)
+    public Ast GrowAst(IEnumerable<Token> tokens, string[] variableOrder)
     {
         var stack = new Stack<Node>();
         var variables = new List<string>();
@@ -109,6 +110,8 @@ public Ast GrowAst(IEnumerable<Token> tokens)
 
         var root = stack.Pop();
 
+        variables = variables.OrderBy(v => Array.IndexOf(variableOrder, v)).ToList();
+
         return new Ast(root, variables);
     }
 }

BooleanExpressionParser/Program.cs

@@ -1,4 +1,5 @@
 using System.Text;
+using Spectre.Console;
 
 namespace BooleanExpressionParser;
 
@@ -25,6 +26,10 @@ static void Main(params string[] args)
         }
 
         var tables = new List<string>();
+        var formatter = new Formatter {
+            True = "T",
+            False = "F"
+        };
 
         foreach (var expression in expressions)
         {
@@ -49,16 +54,18 @@ static void Main(params string[] args)
                 table.Add(values.Append(result).ToArray());
             }
 
-            tables.Add(Formatter.FormatTruthTable(ast, table, label: expression.Expression));
+            tables.Add(formatter.FormatTruthTable(ast, table, label: expression.Expression));
         }
 
         if (tables.Count > 1)
         {
-            Console.WriteLine(Formatter.JoinTruthTables(tables.ToArray()));
+            Console.WriteLine(formatter.JoinTruthTables(tables.ToArray()));
+
         }
         else
         {
-            Console.WriteLine(tables[0]);
+            // Console.WriteLine(tables[0]);
+            AnsiConsole.Markup(tables[0]);
         }
     }