Added C switch

Author: tmr232

src/control-flow/cfg-c.ts

@@ -122,9 +122,7 @@ export class CFGBuilder {
         return this.processWhileStatement(node);
       case "do_statement":
         return this.processDoStatement(node);
-      case "expression_switch_statement":
-      case "type_switch_statement":
-      case "select_statement":
+      case "switch_statement":
         return this.processSwitchlike(node);
       case "return_statement": {
         const returnNode = this.addNode("RETURN", node.text);
@@ -211,42 +209,49 @@ export class CFGBuilder {
     if (previous) {
       this.addEdge(previous, mergeNode, "alternative");
     }
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+    if (fallthrough) {
+      this.addEdge(fallthrough, mergeNode, "regular");
+    }
   }
 
   private collectCases(
     switchSyntax: Parser.SyntaxNode,
     blockHandler: BlockHandler,
   ): Case[] {
     const cases: Case[] = [];
-    const caseTypes = [
-      "default_case",
-      "communication_case",
-      "type_case",
-      "expression_case",
-    ];
-    switchSyntax.namedChildren
+    const caseTypes = ["case_statement"];
+    switchSyntax.namedChildren[1].namedChildren
       .filter((child) => caseTypes.includes(child.type))
       .forEach((caseSyntax) => {
         const isDefault = caseSyntax.type === "default_case";
 
         const consequence = caseSyntax.namedChildren.slice(isDefault ? 0 : 1);
-        const hasFallthrough = consequence
-          .map((node) => node.type)
-          .includes("fallthrough_statement");
+        const hasFallthrough = true;
 
         const conditionNode = this.addNode(
           "CASE_CONDITION",
           isDefault ? "default" : (caseSyntax.firstNamedChild?.text ?? ""),
         );
-        const consequenceNode = blockHandler.update(
+        // let consequenceBlock;
+        // if (consequence.length) {
+        //   consequenceBlock = blockHandler.update(
+        //     this.processStatements(consequence),
+        //   );
+        // } else {
+        //   const consequenceNode = this.addNode("EMPTY", "empty case body");
+        //   consequenceBlock = { entry: consequenceNode, exit: consequenceNode };
+        // }
+
+        const consequenceBlock = blockHandler.update(
           this.processStatements(consequence),
         );
 
         cases.push({
           conditionEntry: conditionNode,
           conditionExit: conditionNode,
-          consequenceEntry: consequenceNode.entry,
-          consequenceExit: consequenceNode.exit,
+          consequenceEntry: consequenceBlock.entry,
+          consequenceExit: consequenceBlock.exit,
           alternativeExit: conditionNode,
           hasFallthrough,
           isDefault,

src/control-flow/render.ts

@@ -16,7 +16,7 @@ export function graphToDot(cfg: CFG, verbose: boolean = false): string {
 
     // const label = `${graph.getNodeAttribute(node, "line") || ""}`;
     // label = `${levels.get(node)}`;
-    label = `${graph.getNodeAttribute(node, "markers")}`;
+    // label = `${graph.getNodeAttribute(node, "markers")}`;
 
     let shape = "box";
     let fillColor = "lightgray";

src/frontend/src/lib/TestGraph.svelte

@@ -83,12 +83,12 @@
     if (trim) cfg = trimFor(cfg);
     if (simplify) cfg = simplifyCFG(cfg, mergeNodeAttrs);
 
+    dot = graphToDot(cfg, verbose);
+    ast = formatAST(functionSyntax.toString());
+
     const testResults = runTest(record);
     visibleTestResults = JSON.stringify(testResults);
     failed = !!testResults.filter((result) => result.failure).length;
-    console.log(failed);
-    dot = graphToDot(cfg, verbose);
-    ast = formatAST(functionSyntax.toString());
 
     return graphviz.dot(dot);
   }

src/test/sample.c

@@ -68,4 +68,45 @@ exits: 1
 void doWhile() {
     do {
     } while (x());
+}
+
+/*
+nodes: 4,
+exits: 1
+*/
+void gotoA() {
+label:
+    if (x) {
+        goto label;
+    }
+}
+
+/*
+nodes: 7,
+exits: 1,
+reaches: [["1","3"]]
+*/
+void switch_1() {
+    switch (x) {
+    case 1:
+        // CFG: 1
+        "include me!";
+    case 2:
+    case 3:
+        // CFG: 3
+        "Include me!";
+    }
+}
+
+/*
+nodes: 7,
+exits: 1
+*/
+void switch_2() {
+    switch (x) {
+    case 1:
+        break;
+    case 2:
+    case 3:
+    }
 }