Merge pull request #33 from tmr232/bugfix-issue32

bugfix issue32

Author: tmr232

CHANGELOG.md

@@ -22,6 +22,10 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
 
 - Adding a new language now requires less wiring code, as many language declarations were merged.
 
+### Fixed
+
+- In C and C++, `if-else` statements without curly braces no longer break the CFG builder (#32)
+
 ## [0.0.8] - 2024-10-10
 
 ### Added

src/components/Demo.svelte

@@ -227,7 +227,7 @@
       {#if showSegmentation}
         <div class="segmentation">
           <CodeSegmentation
-            languageCode={languageCode[selection.language]}
+            code={languageCode[selection.language]}
             language={selection.language}
             {simplify}
           />

src/components/Graph.svelte

@@ -62,7 +62,6 @@
     colorList: ColorList,
   ) {
     const { trim, simplify, verbose, flatSwitch, highlight } = options;
-    console.log(code);
     tree = parsers[language].parse(code);
     const functionSyntax = getFirstFunction(tree, language);
     if (!functionSyntax) {

src/components/utils.ts

@@ -55,7 +55,6 @@ export function getFirstFunction(
 ): Parser.SyntaxNode | null {
   let functionNode: Parser.SyntaxNode | null = null;
   const cursor = tree.walk();
-  console.log(tree.rootNode.toString());
   const visitNode = () => {
     if (functionNodeTypes[language].includes(cursor.nodeType)) {
       functionNode = cursor.currentNode;

src/control-flow/cfg-c.ts

@@ -180,7 +180,7 @@ function processIfStatement(
   const queryString = `
       (if_statement
         condition: (_ ")" @closing-paren) @cond
-        consequence: (_ "}"? @closing-brace) @then
+        consequence: (_) @then
         alternative: (
             else_clause ([
                 (if_statement) @else-if
@@ -213,7 +213,7 @@ function processIfStatement(
   }
   for (const [prevIf, thisIf] of pairwise(allIfs)) {
     ctx.link.offsetToSyntax(
-      prevIf.requireSyntax("closing-brace"),
+      prevIf.requireSyntax("then"),
       thisIf.requireSyntax("if"),
     );
   }
@@ -258,10 +258,7 @@ function processIfStatement(
     const lastMatch = last(allIfs) as Match;
     const elseSyntax = lastMatch.requireSyntax("else");
     ctx.link.syntaxToNode(elseSyntax, elseBlock.entry);
-    ctx.link.offsetToSyntax(
-      lastMatch.requireSyntax("closing-brace"),
-      elseSyntax,
-    );
+    ctx.link.offsetToSyntax(lastMatch.requireSyntax("then"), elseSyntax);
 
     if (previous && elseBlock.entry) {
       ctx.builder.addEdge(previous, elseBlock.entry, "alternative");

src/control-flow/generic-cfg-builder.ts

@@ -24,7 +24,7 @@ interface Dispatch {
   many(statements: Parser.SyntaxNode[]): BasicBlock;
 }
 interface Link {
-  syntaxToNode: InstanceType<typeof NodeMapper>["linkSytaxToNode"];
+  syntaxToNode: InstanceType<typeof NodeMapper>["linkSyntaxToNode"];
   offsetToSyntax: InstanceType<typeof NodeMapper>["linkOffsetToSyntax"];
 }
 export interface Context {
@@ -78,7 +78,7 @@ export class GenericCFGBuilder {
       "START",
       functionNode.startIndex,
     );
-    this.nodeMapper.linkSytaxToNode(functionNode, startNode);
+    this.nodeMapper.linkSyntaxToNode(functionNode, startNode);
     const bodySyntax = functionNode.childForFieldName("body");
     if (bodySyntax) {
       const blockHandler = new BlockHandler();
@@ -135,7 +135,7 @@ export class GenericCFGBuilder {
         many: this.dispatchMany.bind(this),
       },
       link: {
-        syntaxToNode: this.nodeMapper.linkSytaxToNode.bind(this.nodeMapper),
+        syntaxToNode: this.nodeMapper.linkSyntaxToNode.bind(this.nodeMapper),
         offsetToSyntax: this.nodeMapper.linkOffsetToSyntax.bind(
           this.nodeMapper,
         ),

src/control-flow/node-mapper.ts

@@ -39,7 +39,7 @@ export class NodeMapper {
   private ranges: { start: number; stop: number; value: Parser.SyntaxNode }[] =
     [];
 
-  public linkSytaxToNode(syntax: Parser.SyntaxNode, node: string) {
+  public linkSyntaxToNode(syntax: Parser.SyntaxNode, node: string) {
     this.syntaxToNode.set(syntax, node);
 
     this.ranges.push({