Change prefix to postfix

Author: tomc128

BooleanExpressionParser/.vscode/launch.json

@@ -8,18 +8,20 @@
             "preLaunchTask": "build",
             "program": "${workspaceFolder}/bin/Debug/net7.0/BooleanExpressionParser.dll",
             "args": [
-                "-o",
-                "basic",
-                "table",
+                // "-o",
+                // "basic",
+                // "table",
                 // "-t ✅",
                 // "-f ❌",
-                "A.B+!A",
-                "A+B+C",
-                "D_0.D_1",
-                // "convert",
+                // "A.B+!A",
+                // "A+B+C",
+                // "D_0.D_1",
+                "convert",
                 // "A.B",
                 // "A+B",
-                // "!(A+B+C)",
+                "!(A+B+C)",
+                "A.B",
+                "(p=>!s) or (!p and !s)"
                 // "(((A.B&C) OR A) AND (NOT B + !C)) AND NOT D",
                 // "[D_0 . !S] + [D_1 . S];S,D_0,D_1",
             ],

BooleanExpressionParser/Formatters/BasicFormatter.cs

@@ -12,7 +12,7 @@ public string FormatTokens(IEnumerable<Token> tokens)
         foreach (var token in tokens)
         {
             string s = token.ToString()!;
-            if (token is not VariableToken && s.Length > 1) s = $"[{s}]";
+            if (token is not VariableToken && s.Length > 1) s = $"[[{s}]]";
             sb.Append(s);
         }
 

BooleanExpressionParser/Formatters/DisplayFormatter.cs

@@ -34,7 +34,7 @@ public string FormatTokens(IEnumerable<Token> tokens)
         foreach (var token in tokens)
         {
             string s = token.ToString()!;
-            if (token is not VariableToken && s.Length > 1) s = $"[{s}]";
+            if (token is not VariableToken && s.Length > 1) s = $"[[{s}]]";
             sb.Append(s);
         }
 

BooleanExpressionParser/Parser.cs

@@ -7,11 +7,11 @@ public Parser()
     }
 
     /// <summary>
-    /// Converts a list of tokens in infix notation to a list of tokens in prefix notation.
+    /// Converts a list of tokens in infix notation to a list of tokens in postfix notation.
     /// </summary>
     /// <param name="tokens">The tokens to parse.</param>
     /// <returns>The root node of the expression tree.</returns>
-    public IEnumerable<Token> InfixToPrefix(IEnumerable<Token> tokens)
+    public IEnumerable<Token> InfixToPostfix(IEnumerable<Token> tokens)
     {
         var output = new Queue<Token>();
         var stack = new Stack<Token>();

BooleanExpressionParser/Program.cs

@@ -51,8 +51,8 @@ private static void Main(string[] args)
         rootCommand.AddCommand(tableCommand);
 
         // Convert command
-        // Takes in a list of expressions, and converts them to prefix notation.
-        var convertCommand = new Command("convert", description: "Converts a boolean expression(s) to prefix notation. If none are provided, the user will be prompted to enter them.")
+        // Takes in a list of expressions, and converts them to postfix notation.
+        var convertCommand = new Command("convert", description: "Converts a boolean expression(s) to postfix notation. If none are provided, the user will be prompted to enter them.")
         {
             // outputTypeOption,
             expressionsArgument
@@ -88,9 +88,9 @@ private static void TableHandler(OutputType outputType, string @true, string @fa
             var infixTokens = tokeniser.Tokenise();
 
             var parser = new Parser();
-            var prefixTokens = parser.InfixToPrefix(infixTokens);
+            var postfixTokens = parser.InfixToPostfix(infixTokens);
 
-            var ast = parser.GrowAst(prefixTokens, expression.VariableOrder);
+            var ast = parser.GrowAst(postfixTokens, expression.VariableOrder);
 
             int numCombinations = (int)Math.Pow(2, ast.Variables.Count);
             var table = new List<bool[]>();
@@ -131,9 +131,9 @@ private static void ConvertHandler(OutputType outputType, string[] args)
             var infixTokens = tokeniser.Tokenise();
 
             var parser = new Parser();
-            var prefixTokens = parser.InfixToPrefix(infixTokens);
+            var postfixTokens = parser.InfixToPostfix(infixTokens);
 
-            AnsiConsole.MarkupLine($"{expression.Expression} -> [bold]{formatter.FormatTokens(prefixTokens)}[/]");
+            AnsiConsole.MarkupLine($"{expression.Expression} -> [bold]{formatter.FormatTokens(postfixTokens)}[/]");
         }
     }