Changed logic for function name resolution

Author: LeBoufty

packages/cli/src/languagePlugins/c/headerResolver/index.test.ts

@@ -7,10 +7,15 @@ describe("CHeaderResolver", () => {
   const cFilesMap = getCFilesMap();
   const resolver = new CHeaderResolver();
   const burgers = path.join(cFilesFolder, "burgers.h");
+  const crashcases = path.join(cFilesFolder, "crashcases.h");
   const file = cFilesMap.get(burgers);
   if (!file) {
     throw new Error(`File not found: ${burgers}`);
   }
+  const ccfile = cFilesMap.get(crashcases);
+  if (!ccfile) {
+    throw new Error(`File not found: ${crashcases}`);
+  }
   const exportedSymbols = resolver.resolveSymbols(file);
 
   test("should resolve symbols in C header files", () => {
@@ -153,4 +158,40 @@ describe("CHeaderResolver", () => {
     expect(drink.identifierNode.type).toBe("type_identifier");
     expect(drink.filepath).toBe(burgers);
   });
+
+  test("Crash Cases", () => {
+    const ccexportedSymbols = resolver.resolveSymbols(ccfile);
+    expect(ccexportedSymbols).toBeDefined();
+
+    const sprite = ccexportedSymbols.find((s) => s.name === "Sprite");
+    expect(sprite).toBeDefined();
+    expect(sprite.type).toBe("struct");
+    expect(sprite.specifiers).toEqual([]);
+    expect(sprite.qualifiers).toEqual([]);
+    expect(sprite.node.type).toBe("struct_specifier");
+    expect(sprite.identifierNode.type).toBe("type_identifier");
+    expect(sprite.filepath).toBe(crashcases);
+
+    const placeholderfunction = ccexportedSymbols.find(
+      (s) => s.name === "PlaceholderFunction",
+    );
+    expect(placeholderfunction).toBeDefined();
+    expect(placeholderfunction.type).toBe("function");
+    expect(placeholderfunction.specifiers).toEqual([]);
+    expect(placeholderfunction.qualifiers).toEqual([]);
+    expect(placeholderfunction.node.type).toBe("declaration");
+    expect(placeholderfunction.identifierNode.type).toBe("identifier");
+    expect(placeholderfunction.filepath).toBe(crashcases);
+
+    const gmtfwa = ccexportedSymbols.find(
+      (s) => s.name === "gMovementTypeFuncs_WanderAround",
+    );
+    expect(gmtfwa).toBeDefined();
+    expect(gmtfwa.type).toBe("variable");
+    expect(gmtfwa.specifiers).toEqual([]);
+    expect(gmtfwa.qualifiers).toEqual([]);
+    expect(gmtfwa.node.type).toBe("declaration");
+    expect(gmtfwa.identifierNode.type).toBe("identifier");
+    expect(gmtfwa.filepath).toBe(crashcases);
+  });
 });

packages/cli/src/languagePlugins/c/headerResolver/index.ts

@@ -50,20 +50,22 @@ export class CHeaderResolver {
         const qualifiers = capture.node.children
           .filter((child) => child.type === "type_qualifier")
           .map((child) => child.text);
-        // Check if the node is a function or variable declaration
-        const type =
-          capture.node.descendantsOfType("function_declarator").length !== 0
-            ? "function"
-            : "variable";
         let currentNode = capture.node;
         // Traverse the tree to find the identifier node
         // This is a workaround for the fact that the identifier node is not always the first child
         // (e.g. in pointers or arrays)
         while (
+          !currentNode.childForFieldName("declarator") ||
           currentNode.childForFieldName("declarator").type !== "identifier"
         ) {
-          currentNode = currentNode.childForFieldName("declarator");
+          if (!currentNode.childForFieldName("declarator")) {
+            currentNode = currentNode.firstNamedChild;
+          } else {
+            currentNode = currentNode.childForFieldName("declarator");
+          }
         }
+        const type =
+          currentNode.type === "function_declarator" ? "function" : "variable";
         const idNode = currentNode.childForFieldName("declarator");
         exportedSymbols.push({
           name: idNode.text,

packages/cli/src/languagePlugins/c/symbolRegistry/index.ts

@@ -130,9 +130,14 @@ export class CSymbolRegistry {
         // Traverse the tree to find the identifier node
         // cf. header resolver.
         while (
+          !currentNode.childForFieldName("declarator") ||
           currentNode.childForFieldName("declarator").type !== "identifier"
         ) {
-          currentNode = currentNode.childForFieldName("declarator");
+          if (!currentNode.childForFieldName("declarator")) {
+            currentNode = currentNode.firstNamedChild;
+          } else {
+            currentNode = currentNode.childForFieldName("declarator");
+          }
         }
         const name = currentNode.childForFieldName("declarator").text;
         let foundInRegistry = false;

packages/cli/src/languagePlugins/c/testFiles/cFiles/crashcases.h

@@ -0,0 +1,20 @@
+struct ObjectEvent {
+    int id;
+};
+
+struct Sprite {
+    int x;
+    int y;
+};
+
+int PlaceholderFunction(struct ObjectEvent *oe, struct Sprite *s);
+
+int (*const gMovementTypeFuncs_WanderAround[])(struct ObjectEvent *, struct Sprite *) = {
+    PlaceholderFunction,
+    PlaceholderFunction,
+    PlaceholderFunction,
+    PlaceholderFunction,
+    PlaceholderFunction,
+    PlaceholderFunction,
+    PlaceholderFunction,
+};