Merge pull request #5 from tmr232/fix-demo-build

fix demo build

Author: tmr232

.github/workflows/pages.yaml

@@ -1,5 +1,6 @@
 name: Github Pages
 on:
+  pull_request:
   push:
     branches: "main"
 
@@ -20,6 +21,7 @@ jobs:
         with:
           path: ./dist/demo
   deploy:
+    if: github.ref == 'refs/heads/main'
     needs: build
     runs-on: ubuntu-latest
     # Grant GITHUB_TOKEN the permissions required to make a Pages deployment

src/control-flow/cfg-python.ts

@@ -224,6 +224,9 @@ export class CFGBuilder {
     const exceptSyntaxMany = this.getSyntaxMany(match, "except-body");
     const elseSyntax = this.getSyntax(match, "else-body");
     const finallySyntax = this.getSyntax(match, "finally-body");
+
+    const mergeNode = this.addNode("MERGE", "merge try-complex");
+
     return this.withCluster("try-complex", (tryComplexCluster) => {
       const bodyBlock = this.withCluster("try", () =>
         getBlock(bodySyntax),
@@ -281,29 +284,37 @@ export class CFGBuilder {
         return finallyBlock;
       });
 
-      let complexExit: string | null = bodyBlock.exit;
+      // This is the exit we get to if we don't have an exception
+      let happyExit: string | null = bodyBlock.exit;
 
       // Connect the body to the `else` block
       if (bodyBlock.exit && elseBlock?.entry) {
         this.addEdge(bodyBlock.exit, elseBlock.entry);
-        complexExit = elseBlock.exit;
+        happyExit = elseBlock.exit;
       }
 
       if (finallyBlock?.entry) {
         // Connect `try` to `finally`
         const toFinally = elseBlock?.exit ?? bodyBlock.exit;
         if (toFinally) this.addEdge(toFinally, finallyBlock.entry);
-        complexExit = finallyBlock.exit;
+        happyExit = finallyBlock.exit;
         // Connect `except` to `finally`
         exceptBlocks.forEach((exceptBlock) => {
           if (exceptBlock.exit)
             this.addEdge(exceptBlock.exit, finallyBlock.entry as string);
         });
+      } else {
+        // We need to connect the `except` blocks to the merge node
+        exceptBlocks.forEach((exceptBlock) => {
+          if (exceptBlock.exit) this.addEdge(exceptBlock.exit, mergeNode);
+        });
       }
 
+      if (happyExit) this.addEdge(happyExit, mergeNode);
+
       return blockHandler.update({
         entry: bodyBlock.entry,
-        exit: complexExit,
+        exit: mergeNode,
       });
     });
   }

src/demo/src/App.svelte

@@ -2,10 +2,11 @@
   import Demo from "../../frontend/src/lib/Demo.svelte";
   import demoCodeGo from "./assets/demo.go?raw";
   import demoCodeC from "./assets/demo.c?raw";
+  import demoCodePython from "./assets/demo.py?raw";
 </script>
 
 <main>
-  <Demo codeGo={demoCodeGo} codeC={demoCodeC} />
+  <Demo codeGo={demoCodeGo} codeC={demoCodeC} codePython={demoCodePython} />
 </main>
 
 <style>

src/demo/src/assets/demo.py

@@ -0,0 +1,13 @@
+def f():
+    try:
+        linux_interaction()
+    except RuntimeError as error:
+        print(error)
+    else:
+        try:
+            with open("file.log") as file:
+                read_data = file.read()
+        except FileNotFoundError as fnf_error:
+            print(fnf_error)
+    finally:
+        print("Cleaning up, irrespective of any exceptions.")

src/frontend/src/lib/Graph.svelte

@@ -5,7 +5,11 @@
   import { graphToDot } from "../../../control-flow/render";
   import { simplifyCFG, trimFor } from "../../../control-flow/graph-ops";
   import { Graphviz } from "@hpcc-js/wasm-graphviz";
-  import { getFirstFunction, initializeParsers, type Parsers } from "./utils";
+  import {
+    getFirstFunction,
+    initialize as initializeUtils,
+    type Parsers,
+  } from "./utils";
 
   let parsers: Parsers;
   let graphviz: Graphviz;
@@ -17,8 +21,9 @@
   export let flatSwitch: boolean = false;
 
   async function initialize() {
-    parsers = await initializeParsers();
-    graphviz = await Graphviz.load();
+    const utils = await initializeUtils();
+    parsers = utils.parsers;
+    graphviz = utils.graphviz;
   }
 
   interface RenderOptions {

src/frontend/src/lib/TestViewer.svelte

@@ -2,34 +2,45 @@
   import testRecordsJson from "../../../../dist/tests/commentTests.json?json";
   import type { TestFuncRecord } from "../../../test/commentTestUtils";
   import TestGraph from "./TestGraph.svelte";
-  import { runTest, type TestResults } from "./utils";
+  import {
+    runTest,
+    type TestResults,
+    initialize as initializeUtils,
+  } from "./utils";
+
   const testRecords = testRecordsJson as TestFuncRecord[];
 
-  const testResults = testRecords.map((record) => {
-    let results: TestResults[];
-    try {
-      results = runTest(record);
-    } catch (error) {
-      console.trace(
-        `\nFailed running tests for ${record.language}: ${record.name}\n`,
-        error,
-      );
-      results = [
-        {
-          reqName: "Tests",
-          reqValue: "Failed to complete",
-          failure: `${error}`,
-        },
-      ];
-    }
-    return {
-      record,
-      failed: !results.every((result) => result.failure === null),
-      results,
-    };
-  });
+  async function runAllTests() {
+    await initializeUtils();
+
+    const testResults = testRecords.map((record) => {
+      let results: TestResults[];
+      try {
+        results = runTest(record);
+      } catch (error) {
+        console.trace(
+          `\nFailed running tests for ${record.language}: ${record.name}\n`,
+          error,
+        );
+        results = [
+          {
+            reqName: "Tests",
+            reqValue: "Failed to complete",
+            failure: `${error}`,
+          },
+        ];
+      }
+      return {
+        record,
+        failed: !results.every((result) => result.failure === null),
+        results,
+      };
+    });
 
-  const failCount = testResults.filter(({ failed }) => failed).length;
+    const failCount = testResults.filter(({ failed }) => failed).length;
+
+    return { testResults, failCount };
+  }
 
   let simplify: boolean = true;
   let verbose: boolean = false;
@@ -54,35 +65,37 @@
   <input type="checkbox" id="showAll" bind:checked={showAll} />
   <label for="showAll">Show All</label>
 </div>
-<div class="content">
-  <div class="summary" class:green={failCount === 0} class:red={failCount}>
-    {#if failCount === 0}
-      All tests pass.
-    {:else}
-      {failCount} failing test{failCount > 1 ? "s" : ""}.
-    {/if}
-  </div>
-  <div class="container">
-    {#each testResults as { record, failed, results } (record)}
-      {#if failed || showAll}
-        <div class="code-side" data-failed={failed}>
-          <div class="test-name">{record.language}: {record.name}</div>
-          <div class="code"><pre>{record.code}</pre></div>
-          <div class="results">
-            {#each results as { reqName, reqValue, failure } (reqName)}
-              {#if failure !== null}
-                <div class="result">
-                  {reqName}: {reqValue}; {failure}
-                </div>
-              {/if}
-            {/each}
-          </div>
-        </div>
-        <TestGraph {record} {simplify} {verbose} {trim} {flatSwitch} />
+{#await runAllTests() then { failCount, testResults }}
+  <div class="content">
+    <div class="summary" class:green={failCount === 0} class:red={failCount}>
+      {#if failCount === 0}
+        All tests pass.
+      {:else}
+        {failCount} failing test{failCount > 1 ? "s" : ""}.
       {/if}
-    {/each}
+    </div>
+    <div class="container">
+      {#each testResults as { record, failed, results } (record)}
+        {#if failed || showAll}
+          <div class="code-side" data-failed={failed}>
+            <div class="test-name">{record.language}: {record.name}</div>
+            <div class="code"><pre>{record.code}</pre></div>
+            <div class="results">
+              {#each results as { reqName, reqValue, failure } (reqName)}
+                {#if failure !== null}
+                  <div class="result">
+                    {reqName}: {reqValue}; {failure}
+                  </div>
+                {/if}
+              {/each}
+            </div>
+          </div>
+          <TestGraph {record} {simplify} {verbose} {trim} {flatSwitch} />
+        {/if}
+      {/each}
+    </div>
   </div>
-</div>
+{/await}
 
 <style>
   .content {

src/frontend/src/lib/utils.ts

@@ -77,13 +77,19 @@ export function getFirstFunction(tree: Parser.Tree): Parser.SyntaxNode | null {
   return functionNode;
 }
 
-const parsers: Parsers = await initializeParsers();
-const graphviz: Graphviz = await Graphviz.load();
+let parsers: Parsers;
+let graphviz: Graphviz;
+export async function initialize() {
+  parsers = await initializeParsers();
+  graphviz = await Graphviz.load();
+  return { parsers, graphviz };
+}
 export interface TestResults {
   reqName: string;
   reqValue: any;
   failure: string | null;
 }
+
 export function runTest(record: TestFuncRecord): TestResults[] {
   const tree = parsers[record.language].parse(record.code);
   const testFunc: TestFunction = {