Skip to content

Codebase intelligence for AI and humans: code health scores, auto-generated docs, git analytics, dead code detection, and architectural decisions via MCP.

fix(objectivec): give a C function returning a pointer its symbol (#2857)

Yang Bai97da1124e63c
diff --git a/packages/core/src/repowise/core/ingestion/queries/objectivec.scm b/packages/core/src/repowise/core/ingestion/queries/objectivec.scm
index c202cdb9e..87ec56eef 100644
--- a/packages/core/src/repowise/core/ingestion/queries/objectivec.scm
+++ b/packages/core/src/repowise/core/ingestion/queries/objectivec.scm
@@ -84,11 +84,53 @@
declarator: (identifier) @symbol.name
parameters: (parameter_list) @symbol.params)) @symbol.def
+; A function returning a pointer wraps the function_declarator, as c.scm
+; explains: ``NSString *MakeName(void)``, ``char **argv(void)``, and a function
+; returning a function pointer. Queries cannot recurse, so each depth is listed.
+(function_definition
+ declarator: [
+ (pointer_declarator
+ declarator: (function_declarator
+ declarator: (identifier) @symbol.name
+ parameters: (parameter_list) @symbol.params))
+ (pointer_declarator
+ declarator: (pointer_declarator
+ declarator: (function_declarator
+ declarator: (identifier) @symbol.name
+ parameters: (parameter_list) @symbol.params)))
+ (function_declarator
+ declarator: (parenthesized_declarator
+ (pointer_declarator
+ declarator: (function_declarator
+ declarator: (identifier) @symbol.name
+ parameters: (parameter_list) @symbol.params))))
+ ]) @symbol.def
+
(declaration
declarator: (function_declarator
declarator: (identifier) @symbol.name
parameters: (parameter_list) @symbol.params)) @symbol.def
+; ... returning a pointer, the same shapes as the definitions above
+(declaration
+ declarator: [
+ (pointer_declarator
+ declarator: (function_declarator
+ declarator: (identifier) @symbol.name
+ parameters: (parameter_list) @symbol.params))
+ (pointer_declarator
+ declarator: (pointer_declarator
+ declarator: (function_declarator
+ declarator: (identifier) @symbol.name
+ parameters: (parameter_list) @symbol.params)))
+ (function_declarator
+ declarator: (parenthesized_declarator
+ (pointer_declarator
+ declarator: (function_declarator
+ declarator: (identifier) @symbol.name
+ parameters: (parameter_list) @symbol.params))))
+ ]) @symbol.def
+
(preproc_def
name: (identifier) @symbol.name) @symbol.def
diff --git a/tests/unit/ingestion/test_objc_pointer_return_symbols.py b/tests/unit/ingestion/test_objc_pointer_return_symbols.py
new file mode 100644
index 000000000..e1ec5dd1a
--- /dev/null
+++ b/tests/unit/ingestion/test_objc_pointer_return_symbols.py
@@ -0,0 +1,59 @@
+"""A C function returning a pointer is still a symbol in an Objective-C file.
+
+``NSString *MakeName(void)`` wraps the ``function_declarator`` in a
+``pointer_declarator``, as it does in a ``.c`` file, and ``objectivec.scm``
+carries the plain-C shapes ``c.scm`` does.
+"""
+
+from __future__ import annotations
+
+import pytest
+
+from repowise.core.ingestion.parser import ASTParser
+from tests.unit.ingestion.parser._helpers import _make_file_info
+
+_PARSER = ASTParser()
+
+
+def _parse(src: str):
+ return _PARSER.parse_file(_make_file_info("a.m", "objectivec"), src.encode())
+
+
+def _names(src: str) -> dict[str, str]:
+ return {s.name: s.kind for s in _parse(src).symbols}
+
+
+ ("src", "name"),
+ [
+ ('NSString *MakeName(void) { return @"x"; }', "MakeName"),
+ ("NSString **MakeNamePtr(void) { return 0; }", "MakeNamePtr"),
+ ("static inline NSArray *MakeItems(id source) { return nil; }", "MakeItems"),
+ ("int (*getHandler(int k))(int) { return 0; }", "getHandler"),
+ ("NSString *DeclaredOnly(int fd);", "DeclaredOnly"),
+ ("char **DeclaredOnly2(void);", "DeclaredOnly2"),
+ ],
+)
+def test_pointer_returning_function_is_a_symbol(src: str, name: str) -> None:
+ assert _names(src).get(name) == "function"
+
+
+def test_a_function_returning_no_pointer_is_still_a_symbol() -> None:
+ assert _names("int MakeCount(void) { return 1; }").get("MakeCount") == "function"
+
+
+def test_function_pointer_variable_is_not_a_function() -> None:
+ names = _names("void (*on_close)(int);\nint *(*alloc_fn)(unsigned n);\n")
+ assert "on_close" not in names
+ assert "alloc_fn" not in names
+
+
+def test_calls_to_and_from_a_pointer_returning_function_key_to_it() -> None:
+ src = (
+ "void helper(void) {}\n"
+ "NSString *MakeName(void) { helper(); return 0; }\n"
+ "void caller(void) { MakeName(); }\n"
+ )
+ calls = _parse(src).calls
+ assert [c.caller_symbol_id for c in calls if c.target_name == "helper"] == ["a.m::MakeName"]
+ assert [c.caller_symbol_id for c in calls if c.target_name == "MakeName"] == ["a.m::caller"]