Add Cursor.is_null() method

Guard all Cursor methods against being used with null cursors

Author: DeinAlptraum

clang/bindings/python/clang/cindex.py

@@ -1555,6 +1555,18 @@ class Cursor(Structure):
 
     _tu: TranslationUnit
 
+    # This ensures that no operations are possible on null cursors
+    # by guarding all method calls with a not-null assert
+    def __getattribute__(self, key: str) -> object:
+        value = super().__getattribute__(key)
+        is_property = isinstance(getattr(Cursor, key, None), property)
+        # Don't guard the is_null method, since it is part of the guard
+        # and leads to infinite recursion otherwise
+        if is_property or callable(value):
+            if key != "is_null" and self.is_null():
+                raise Exception("Tried calling method on a null-cursor.")
+        return value
+
     @staticmethod
     def from_location(tu: TranslationUnit, location: SourceLocation) -> Cursor:
         # We store a reference to the TU in the instance so the TU won't get
@@ -1575,6 +1587,9 @@ def __ne__(self, other: object) -> bool:
     def __hash__(self) -> int:
         return self.hash
 
+    def is_null(self) -> bool:
+        return self == conf.null_cursor
+
     def is_definition(self) -> bool:
         """
         Returns true if the declaration pointed at by the cursor is also a
@@ -2124,8 +2139,7 @@ def get_children(self) -> Iterator[Cursor]:
         # FIXME: Expose iteration from CIndex, PR6125.
         def visitor(child: Cursor, _: Cursor, children: list[Cursor]) -> int:
             # FIXME: Document this assertion in API.
-            # FIXME: There should just be an isNull method.
-            assert child != conf.lib.clang_getNullCursor()
+            assert not child.is_null()
 
             # Create reference to TU so it isn't GC'd before Cursor.
             child._tu = self._tu
@@ -2210,7 +2224,7 @@ def has_attrs(self) -> bool:
     def from_result(res: Cursor, arg: Cursor | TranslationUnit | Type) -> Cursor | None:
         assert isinstance(res, Cursor)
         # FIXME: There should just be an isNull method.
-        if res == conf.lib.clang_getNullCursor():
+        if res.is_null():
             return None
 
         # Store a reference to the TU in the Python object so it won't get GC'd
@@ -2229,7 +2243,7 @@ def from_result(res: Cursor, arg: Cursor | TranslationUnit | Type) -> Cursor | N
     @staticmethod
     def from_cursor_result(res: Cursor, arg: Cursor) -> Cursor | None:
         assert isinstance(res, Cursor)
-        if res == conf.lib.clang_getNullCursor():
+        if res.is_null():
             return None
 
         res._tu = arg._tu
@@ -2728,7 +2742,7 @@ def get_fields(self):
         """Return an iterator for accessing the fields of this type."""
 
         def visitor(field, children):
-            assert field != conf.lib.clang_getNullCursor()
+            assert not field.is_null()
 
             # Create reference to TU so it isn't GC'd before Cursor.
             field._tu = self._tu
@@ -2743,7 +2757,7 @@ def get_bases(self):
         """Return an iterator for accessing the base classes of this type."""
 
         def visitor(base, children):
-            assert base != conf.lib.clang_getNullCursor()
+            assert not base.is_null()
 
             # Create reference to TU so it isn't GC'd before Cursor.
             base._tu = self._tu
@@ -2758,7 +2772,7 @@ def get_methods(self):
         """Return an iterator for accessing the methods of this type."""
 
         def visitor(method, children):
-            assert method != conf.lib.clang_getNullCursor()
+            assert not method.is_null()
 
             # Create reference to TU so it isn't GC'd before Cursor.
             method._tu = self._tu
@@ -4228,6 +4242,7 @@ def set_compatibility_check(check_status: bool) -> None:
     def lib(self) -> CDLL:
         lib = self.get_cindex_library()
         register_functions(lib, not Config.compatibility_check)
+        self.null_cursor = lib.clang_getNullCursor()
         Config.loaded = True
         return lib
 

clang/bindings/python/tests/cindex/test_cursor.py

@@ -12,6 +12,7 @@
     TemplateArgumentKind,
     TranslationUnit,
     TypeKind,
+    conf,
 )
 
 if "CLANG_LIBRARY_PATH" in os.environ:
@@ -1050,3 +1051,16 @@ def test_equality(self):
         self.assertEqual(cursor1, cursor1_2)
         self.assertNotEqual(cursor1, cursor2)
         self.assertNotEqual(cursor1, "foo")
+
+    def test_null_cursor(self):
+        tu = get_tu("int a = 729;")
+
+        for cursor in tu.cursor.walk_preorder():
+            self.assertFalse(cursor.is_null())
+
+        nc = conf.lib.clang_getNullCursor()
+        self.assertTrue(nc.is_null())
+        with self.assertRaises(Exception):
+            nc.is_definition()
+        with self.assertRaises(Exception):
+            nc.spelling