Project restructure & new web UI

BooleanExpressionParser.CLI/BooleanExpressionParser.CLI.csproj

@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<TargetFramework>net7.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+		<PackageId>BooleanExpressionParser.CLI</PackageId>
+		<Version>1.2.0</Version>
+		<Authors>Tom Chapman</Authors>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Spectre.Console" Version="0.45.0" />
+		<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\BooleanExpressionParser\BooleanExpressionParser.csproj" />
+	</ItemGroup>
+
+</Project>

BooleanExpressionParser/Formatters/DisplayFormatter.cs → BooleanExpressionParser.CLI/Formatters/DisplayFormatter.cs

@@ -1,18 +1,19 @@
 using System.Globalization;
 using System.Text;
+using BooleanExpressionParser.Formatters;
+using BooleanExpressionParser.Tokens;
 using Spectre.Console;
 
-namespace BooleanExpressionParser.Formatter;
+namespace BooleanExpressionParser.CLI.Formatters;
 
-enum ColourMode
+public enum ColourMode
 {
     None,
     Foreground,
     Background
 }
 
-
-class DisplayFormatter : IFormatter
+public class DisplayFormatter : IFormatter
 {
     private static int FinalPadding = 2;
 
@@ -128,7 +129,7 @@ static string PadBoth(string source, int totalLength, char paddingChar = ' ')
     }
 
 
-    public String JoinTruthTables(params string[] tables)
+    public string JoinTruthTables(params string[] tables)
     {
         var sb = new StringBuilder();
 

BooleanExpressionParser/Program.cs → BooleanExpressionParser.CLI/Program.cs

@@ -1,9 +1,11 @@
-using System.CommandLine;
+using System.CommandLine;
 using System.Text;
-using BooleanExpressionParser.Formatter;
+using System;
 using Spectre.Console;
+using BooleanExpressionParser.CLI.Formatters;
+using BooleanExpressionParser.Formatters;
 
-namespace BooleanExpressionParser;
+namespace BooleanExpressionParser.CLI;
 
 
 enum OutputType

BooleanExpressionParser.CLI/Properties/launchSettings.json

@@ -0,0 +1,12 @@
+{
+  "profiles": {
+    "BooleanExpressionParser.CLI - table": {
+      "commandName": "Project",
+      "commandLineArgs": "table"
+    },
+    "BooleanExpressionParser.CLI - convert": {
+      "commandName": "Project",
+      "commandLineArgs": "convert"
+    }
+  }
+}

BooleanExpressionParser.Web/Client/App.razor

@@ -0,0 +1,12 @@
+<Router AppAssembly="@typeof(App).Assembly">
+    <Found Context="routeData">
+        <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
+        <FocusOnNavigate RouteData="@routeData" Selector="h1" />
+    </Found>
+    <NotFound>
+        <PageTitle>Not found</PageTitle>
+        <LayoutView Layout="@typeof(MainLayout)">
+            <p role="alert">Sorry, there's nothing at this address.</p>
+        </LayoutView>
+    </NotFound>
+</Router>

BooleanExpressionParser.Web/Client/BooleanExpressionParser.Web.Client.csproj

@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
+
+	<PropertyGroup>
+		<TargetFramework>net7.0</TargetFramework>
+		<Nullable>annotations</Nullable>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<ServiceWorkerAssetsManifest>service-worker-assets.js</ServiceWorkerAssetsManifest>
+		<PackageId>BooleanExpressionParser.Web.Client</PackageId>
+		<Version>1.0.0</Version>
+		<Authors>Tom Chapman</Authors>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.1" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.1" PrivateAssets="all" />
+		<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\Shared\BooleanExpressionParser.Web.Shared.csproj" />
+		<ProjectReference Include="..\..\BooleanExpressionParser\BooleanExpressionParser.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ServiceWorker Include="wwwroot\service-worker.js" PublishedContent="wwwroot\service-worker.published.js" />
+	</ItemGroup>
+
+</Project>

BooleanExpressionParser.Web/Client/Components/ExpressionInput.razor

@@ -0,0 +1,26 @@
+<input placeholder="Enter expression" @oninput="OnInputChanged" @bind="expression"/>
+<button @onclick="OnButtonClicked">@ButtonLabel</button>
+
+
+@code {
+    [Parameter]
+    public string ButtonLabel {get; set;}
+
+    public string? expression;
+
+    [Parameter]
+    public EventCallback<string> ButtonClicked { get; set; }
+
+    [Parameter]
+    public EventCallback<string> ExpressionChanged { get; set; }
+
+    private Task OnButtonClicked()
+    {
+        return ButtonClicked.InvokeAsync(expression);
+    }
+
+    private Task OnInputChanged(ChangeEventArgs args)
+    {
+        return ExpressionChanged.InvokeAsync(args.Value.ToString());
+    }
+}

BooleanExpressionParser.Web/Client/Components/NavBar.razor

@@ -0,0 +1,19 @@
+<div class="container">
+    <h3>Boolean Expression Parser</h3>
+    <nav>
+        <ul>
+            <li>
+                <NavLink class="nav-link" href="/" Match="NavLinkMatch.All">Home</NavLink>
+            </li>
+            <li>
+                <NavLink class="nav-link" href="/truth-table" Match="NavLinkMatch.All">Truth Table Generator</NavLink>
+            </li>
+            <li>
+                <NavLink class="nav-link" href="/evaluator" Match="NavLinkMatch.All">Evaluator</NavLink>
+            </li>
+            <li>
+                <NavLink class="nav-link" href="/notation-converter" Match="NavLinkMatch.All">Notation Converter</NavLink>
+            </li>
+        </ul>
+    </nav>
+</div>

BooleanExpressionParser.Web/Client/Components/NavBar.razor.css

@@ -0,0 +1,23 @@
+.container {
+    display: flex;
+    justify-content: space-between;
+    padding: 2rem;
+}
+
+    .container ul {
+        display: flex;
+        gap: 2rem;
+    }
+
+        .container ul li {
+            list-style: none;
+        }
+
+            .container ul li ::deep .nav-link {
+                text-decoration: none;
+                color: black;
+            }
+
+                .container ul li ::deep .nav-link.active {
+                    font-weight: bold;
+                }

BooleanExpressionParser.Web/Client/Components/ValueInput.razor

@@ -0,0 +1,33 @@
+@foreach (var item in Ast.Variables)
+{
+    <span>@item</span>
+    <input size="3" @bind="inputs[item]" />
+}
+
+<button @onclick="OnButtonClicked">Evaluate</button>
+
+
+@code {
+    [Parameter]
+    public Ast Ast { get; set; }
+
+    [Parameter]
+    public EventCallback<Dictionary<string, string?>> EvaluateClicked { get; set; }
+
+    private Dictionary<string, string?> inputs = new();
+
+    private Task OnButtonClicked()
+    {
+        return EvaluateClicked.InvokeAsync(inputs);
+    }
+
+    protected override void OnParametersSet()
+    {
+        base.OnParametersSet();
+
+        foreach (var item in Ast.Variables)
+        {
+            if (!inputs.ContainsKey(item)) inputs.Add(item, null);
+        }
+    }
+}

BooleanExpressionParser.Web/Client/Formatters/HTMLFormatter.cs

@@ -0,0 +1,62 @@
+using BooleanExpressionParser.Formatters;
+using BooleanExpressionParser.Tokens;
+using System.Text;
+
+namespace BooleanExpressionParser.Web.Client.Formatters;
+
+public class HTMLFormatter : IFormatter
+{
+    public string FormatTokens(IEnumerable<Token> tokens)
+    {
+        var sb = new StringBuilder();
+
+        foreach (Token token in tokens)
+        {
+            string s = token.ToString()!;
+            if (token is OperatorToken && s.Length > 1) s = $"[[{s}]]";
+            sb.Append(s);
+        }
+
+        return sb.ToString();
+    }
+
+    public string FormatTruthTable(Ast ast, List<bool[]> table, string label)
+    {
+        var sb = new StringBuilder();
+
+        // Generate HTML representation of the truth table
+        // table
+        //   tr
+        //     th th th
+        //   tr ***
+        //     td td td
+
+        sb.Append("<table class=\"truth-table\">");
+
+        sb.Append("<tr>");
+        for (int i = 0; i < ast.Variables.Count; i++)
+        {
+            string? item = ast.Variables[i];
+            sb.Append($"<th>{item}</th>");
+        }
+        sb.Append($"<th>{label}</th>");
+        sb.Append("</tr>");
+
+        foreach (bool[] row in table)
+        {
+            sb.Append("<tr>");
+            for (int i = 0; i < row.Length; i++)
+            {
+                sb.Append($"<td class=\"{(row[i] ? "true" : "false")}\">{(row[i] ? "1" : "0")}</td>");
+            }
+            sb.Append("</tr>");
+        }
+
+        return sb.ToString();
+    }
+
+    public string JoinTruthTables(params string[] tables)
+    {
+        throw new NotImplementedException();
+    }
+}

BooleanExpressionParser.Web/Client/MainLayout.razor

@@ -0,0 +1,11 @@
+@inherits LayoutComponentBase
+@using BooleanExpressionParser.Web.Client.Components;
+
+
+<div id="nav-bar">
+    <NavBar />
+</div>
+
+<main>
+    @Body
+</main>

BooleanExpressionParser.Web/Client/Pages/Evaluator.razor

@@ -0,0 +1,56 @@
+@page "/evaluator"
+@using BooleanExpressionParser.Web.Client.Components
+
+<PageTitle>Expression Evaluator</PageTitle>
+
+<h1>Expression Evaluator</h1>
+<p>Produces the output of an expression for given values.</p>
+
+<ExpressionInput ButtonLabel="Load" ButtonClicked="ParseExpression" ExpressionChanged="ExpressionChanged" />
+
+@if (expressionParsed)
+{
+    <ValueInput Ast="ast" EvaluateClicked="Evaluate"/>
+}
+
+@if (result is not null)
+{
+    <h3>@result</h3>
+}
+
+@code {
+    private bool expressionParsed = false;
+    private Ast? ast;
+    private bool? result;
+
+    private void ExpressionChanged(string _)
+    {
+        expressionParsed = false;
+        result = null;
+    }
+
+    private void ParseExpression(string? expression)
+    {
+        if (string.IsNullOrWhiteSpace(expression)) return;
+        var wrapper = new ExpressionWrapper(expression);
+
+        var tokeniser = new Tokeniser(wrapper.Expression);
+        var infixTokens = tokeniser.Tokenise();
+
+        var parser = new Parser();
+        var postfixTokens = parser.InfixToPostfix(infixTokens);
+
+        ast = parser.GrowAst(postfixTokens, wrapper.VariableOrder);
+
+        expressionParsed = true;
+    }
+
+    private void Evaluate(Dictionary<string, string?> inputs)
+    {
+        // Parse inputs
+        var values = inputs.Select(x => new { Key = x.Key, Value = x.Value == "1" }).ToDictionary(pair => pair.Key, pair => pair.Value);
+
+        result = ast.Root.Evaluate(values);
+    }
+}
+

BooleanExpressionParser.Web/Client/Pages/Index.razor

@@ -0,0 +1,6 @@
+@page "/"
+
+<PageTitle>Index Page</PageTitle>
+
+<h1>BooleanExpressionParser - Web</h1>
+<p>This is a web UI for BooleanExpressionParser.</p>