mirror of
https://github.com/safishamsi/graphify.git
synced 2026-10-13 15:40:05 +00:00
rajatnagda45
e4c48bf97e
Objective-C is an object-oriented extractor that already emits @interface,
@implementation and @protocol type nodes, but plain `enum` and
`typedef enum` definitions were dropped entirely: both the enum type and all
of its enumerators were invisible in the graph.
Handle `enum_specifier` (and the `typedef enum { ... } Name;` form, where the
name is the typedef alias), emitting a type node plus a node and `case_of` edge
per enumerator — the same shape every other language with enums uses (Java
#1719, C++ #3939, Swift). A nameless enum and a bodyless `enum X y;` reference
are skipped so no phantom node is minted.
NS_ENUM/NS_OPTIONS is deliberately out of scope: it is a macro call that
tree-sitter-objc parses into an ERROR subtree, so there is no clean AST to
read. Documented in the test.
Add regression tests for the plain, typedef, and skip cases.
(cherry picked from commit 2d30c413d3)
86 lines
3.1 KiB
Python
86 lines
3.1 KiB
Python
"""C-style enum extraction for Objective-C.
|
|
|
|
Objective-C is an object-oriented extractor that already emits @interface,
|
|
@implementation and @protocol type nodes, but plain `enum` and `typedef enum`
|
|
definitions were dropped entirely — the type and all of its enumerators were
|
|
invisible. Every other language with enums emits a type node plus a `case_of`
|
|
edge per member (Java #1719, C++ #3939, Swift); ObjC now matches.
|
|
|
|
The NS_ENUM/NS_OPTIONS macro spelling is deliberately out of scope: it is a
|
|
macro call that tree-sitter-objc parses into an ERROR subtree, so there is no
|
|
clean AST to read.
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
from graphify.extract import extract
|
|
|
|
|
|
def _edge_labels(result: dict, relation: str) -> set[tuple[str, str]]:
|
|
labels = {node["id"]: node["label"] for node in result["nodes"]}
|
|
return {
|
|
(labels.get(edge["source"], edge["source"]), labels.get(edge["target"], edge["target"]))
|
|
for edge in result["edges"]
|
|
if edge["relation"] == relation
|
|
}
|
|
|
|
|
|
def test_objc_plain_enum_emits_type_and_case_of_members(tmp_path):
|
|
source = tmp_path / "Color.m"
|
|
source.write_text(
|
|
"enum Color { Red, Green, Blue };\n"
|
|
"@interface Foo : NSObject\n@end\n"
|
|
"@implementation Foo\n@end\n",
|
|
encoding="utf-8",
|
|
)
|
|
|
|
result = extract([source], cache_root=tmp_path)
|
|
|
|
labels = {n["label"] for n in result["nodes"]}
|
|
assert "Color" in labels, "enum type dropped"
|
|
case_of = _edge_labels(result, "case_of")
|
|
assert ("Color", "Red") in case_of
|
|
assert ("Color", "Green") in case_of
|
|
assert ("Color", "Blue") in case_of
|
|
# The enum does not disturb the surrounding class.
|
|
assert "Foo" in labels
|
|
|
|
|
|
def test_objc_typedef_enum_uses_the_typedef_alias(tmp_path):
|
|
# `.m` is shared with MATLAB, so give the file an unambiguous ObjC marker so
|
|
# detection routes it to the ObjC extractor.
|
|
source = tmp_path / "Dir.m"
|
|
source.write_text(
|
|
"#import <Foundation/Foundation.h>\n"
|
|
"typedef enum { North, South } Direction;\n",
|
|
encoding="utf-8",
|
|
)
|
|
|
|
result = extract([source], cache_root=tmp_path)
|
|
|
|
# The anonymous enum is named after its typedef alias, the name callers use.
|
|
assert "Direction" in {n["label"] for n in result["nodes"]}
|
|
case_of = _edge_labels(result, "case_of")
|
|
assert ("Direction", "North") in case_of
|
|
assert ("Direction", "South") in case_of
|
|
|
|
|
|
def test_objc_anonymous_and_bodyless_enums_mint_no_phantom(tmp_path):
|
|
# A nameless enum has nothing to name a node after; a bare `enum X y;` use is
|
|
# a reference, not a definition. Neither should fabricate a node — while the
|
|
# surrounding class is still extracted.
|
|
source = tmp_path / "None.m"
|
|
source.write_text(
|
|
"#import <Foundation/Foundation.h>\n"
|
|
"enum { Loose1, Loose2 };\n"
|
|
"@interface Keep : NSObject\n@end\n"
|
|
"@implementation Keep\n@end\n",
|
|
encoding="utf-8",
|
|
)
|
|
|
|
result = extract([source], cache_root=tmp_path)
|
|
|
|
labels = {n["label"] for n in result["nodes"]}
|
|
assert "Keep" in labels, "surrounding class should still be extracted"
|
|
assert labels.isdisjoint({"Loose1", "Loose2"})
|
|
assert not _edge_labels(result, "case_of")
|