Started modularising program with CLI args

Need to fix, and implement expression comparisons

Author: tomc128

v2/BooleanExpressionParser/BooleanExpressionParser.csproj

@@ -7,4 +7,9 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
+    <PackageReference Include="System.CommandLine.DragonFruit" Version="0.4.0-alpha.22272.1" />
+  </ItemGroup>
+
 </Project>

v2/BooleanExpressionParser/ParsedExpression.cs

@@ -0,0 +1,15 @@
+public record ParsedExpression
+{   
+    public string Expression { get; set; }
+    public string StrippedExpression { get; set; }
+
+    public List<Token> Tokens { get; set; }
+    public List<Token> PolishTokens { get; set; }
+
+    public Node RootNode { get; set; }
+    public String ASTString { get; set; }
+
+    public List<bool[]> Table { get; set; }
+    public String TableString { get; set; }
+    
+}

v2/BooleanExpressionParser/Program.cs

@@ -2,14 +2,65 @@
 
 internal class Program
 {
-    static void Main(string[] args)
+
+    public enum Command
+    {
+        Evaluate,
+        Compare
+    }
+
+    /// <summary>
+    /// Tom's boolean expression parser and evaluator.
+    /// </summary>
+    /// <param name="subCommand">The command to perform</param>
+    /// <param name="expression">The expression to evaluate</param>
+    /// <param name="secondExpression">The expression to compare to (if using Compare sub-command)</param>
+
+    static void Main(Command subCommand = Command.Evaluate, string? expression, string? secondExpression)
     {
-        string expression = @"(!(A & B) | C) & D";
+        Console.WriteLine("Tom's boolean expression parser and evaluator.");
+        Console.WriteLine($"Command: {subCommand}");
+        Console.WriteLine($"Expression: {expression ?? "Not specified"}");
+        Console.WriteLine($"Second Expression: {secondExpression ?? "Not specified"}");
+
+        switch (subCommand)
+        {
+            case Command.Evaluate:
+                if (expression is null)
+                {
+                    Console.WriteLine("Enter expression:");
+                    Console.Write("> ");
+                    expression = Console.ReadLine();
+                }
+
+                break;
+            case Command.Compare:
+                if (expression is null)
+                {
+                    Console.WriteLine("Enter expression:");
+                    Console.Write("> ");
+                    expression = Console.ReadLine();
+                }
+                if (secondExpression is null)
+                {
+                    Console.WriteLine("Enter second expression:");
+                    Console.Write("> ");
+                    secondExpression = Console.ReadLine();
+                }
+
+                break;
+        }
 
-        expression = expression.Replace(" ", "");
+
+
+    }
+
+    static ParsedExpression RunExpression(string expression)
+    {
+        var strippedExpression = expression.Replace(" ", "");
 
         var tokens = new List<Token>();
-        var reader = new StringReader(expression);
+        var reader = new StringReader(strippedExpression);
 
         Console.WriteLine("Tokenising...");
         Token token;
@@ -58,17 +109,28 @@ static void Main(string[] args)
             }
 
             var result = Evaluate(root, values);
-            Console.WriteLine($"Combination {i} ({binary}) = {result}");
+            Console.WriteLine($"Combination {i} ({binary}) = {(result ? "1" : "0")}");
 
-            tableRows.Add(values.Values.Concat(new bool[] { result }).ToArray());
+            tableRows.Add(values.Values.Append(result).ToArray());
         }
 
         Console.WriteLine();
-        Console.WriteLine("Truth table:");
+        Console.WriteLine($"Truth table for '{expression}':");
 
         var table = FormatTruthTable(variables, tableRows);
 
-        Console.WriteLine(table);
+        return new ParsedExpression
+        {
+            Expression = expression,
+            StrippedExpression = strippedExpression,
+            Tokens = tokens,
+            PolishTokens = polishTokens,
+            RootNode = root,
+            ASTString = text,
+            Table = tableRows,
+            TableString = table
+        };
+
     }
 
     static List<Token> ToPolish(List<Token> normalTokens)