https://github.com/DeinAlptraum created
https://github.com/llvm/llvm-project/pull/95381
Do not allow initialization of enum from negative IDs (e.g. from_id(-1)
currently produces the last known variant)
Rename duplicate enums: CursorKind.OMP_TEAMS_DISTRIBUTE_DIRECTIVE and
TypeKind.OBJCCLASS
Add tests to cover these cases
>From 0a81be569d5a8a4ca0945310804106df70962c64 Mon Sep 17 00:00:00 2001
From: Jannick Kremer <jannick-kre...@gmx.de>
Date: Thu, 13 Jun 2024 10:43:52 +0100
Subject: [PATCH] [libclang/python] Fix bugs in custom enum implementation and
add tests
Do not allow initialization of enum from negative IDs (e.g. from_id(-1)
currently produces the last known variant)
Rename duplicate enums: CursorKind.OMP_TEAMS_DISTRIBUTE_DIRECTIVE
and TypeKind.OBJCCLASS
Add tests to cover these cases
---
clang/bindings/python/clang/cindex.py | 8 +--
.../python/tests/cindex/test_enums.py | 55 +++++++++++++++++++
2 files changed, 59 insertions(+), 4 deletions(-)
create mode 100644 clang/bindings/python/tests/cindex/test_enums.py
diff --git a/clang/bindings/python/clang/cindex.py
b/clang/bindings/python/clang/cindex.py
index 302d99dccd77b..b3d51e4d2a668 100644
--- a/clang/bindings/python/clang/cindex.py
+++ b/clang/bindings/python/clang/cindex.py
@@ -649,7 +649,7 @@ def name(self):
@classmethod
def from_id(cls, id):
- if id >= len(cls._kinds) or cls._kinds[id] is None:
+ if id < 0 or id >= len(cls._kinds) or cls._kinds[id] is None:
raise ValueError("Unknown template argument kind %d" % id)
return cls._kinds[id]
@@ -1336,7 +1336,7 @@ def __repr__(self):
CursorKind.OMP_TEAMS_DISTRIBUTE_DIRECTIVE = CursorKind(271)
# OpenMP teams distribute simd directive.
-CursorKind.OMP_TEAMS_DISTRIBUTE_DIRECTIVE = CursorKind(272)
+CursorKind.OMP_TEAMS_DISTRIBUTE_SIMD_DIRECTIVE = CursorKind(272)
# OpenMP teams distribute parallel for simd directive.
CursorKind.OMP_TEAMS_DISTRIBUTE_PARALLEL_FOR_SIMD_DIRECTIVE = CursorKind(273)
@@ -2215,7 +2215,7 @@ def name(self):
@staticmethod
def from_id(id):
- if id >= len(StorageClass._kinds) or not StorageClass._kinds[id]:
+ if id < 0 or id >= len(StorageClass._kinds) or not
StorageClass._kinds[id]:
raise ValueError("Unknown storage class %d" % id)
return StorageClass._kinds[id]
@@ -2395,7 +2395,7 @@ def __repr__(self):
TypeKind.OCLRESERVEID = TypeKind(160)
TypeKind.OBJCOBJECT = TypeKind(161)
-TypeKind.OBJCCLASS = TypeKind(162)
+TypeKind.OBJCTYPEPARAM = TypeKind(162)
TypeKind.ATTRIBUTED = TypeKind(163)
TypeKind.OCLINTELSUBGROUPAVCMCEPAYLOAD = TypeKind(164)
diff --git a/clang/bindings/python/tests/cindex/test_enums.py
b/clang/bindings/python/tests/cindex/test_enums.py
new file mode 100644
index 0000000000000..425c4a8274a17
--- /dev/null
+++ b/clang/bindings/python/tests/cindex/test_enums.py
@@ -0,0 +1,55 @@
+import unittest
+
+from clang.cindex import (
+ CursorKind,
+ TemplateArgumentKind,
+ ExceptionSpecificationKind,
+ AvailabilityKind,
+ AccessSpecifier,
+ TypeKind,
+ RefQualifierKind,
+ LinkageKind,
+ TLSKind,
+ StorageClass,
+)
+
+
+def get_all_kinds(enum):
+ """Return all CursorKind enumeration instances."""
+ return [x for x in enum._kinds if not x is None]
+
+
+class TestCursorKind(unittest.TestCase):
+ enums = [
+ CursorKind,
+ TemplateArgumentKind,
+ ExceptionSpecificationKind,
+ AvailabilityKind,
+ AccessSpecifier,
+ TypeKind,
+ RefQualifierKind,
+ LinkageKind,
+ TLSKind,
+ StorageClass,
+ ]
+
+ def test_from_id(self):
+ """Check that kinds can be constructed from valid IDs"""
+ for enum in self.enums:
+ self.assertEqual(enum.from_id(2), enum._kinds[2])
+ with self.assertRaises(ValueError):
+ enum.from_id(len(enum._kinds))
+ with self.assertRaises(ValueError):
+ enum.from_id(-1)
+
+ def test_unique_kinds(self):
+ """Check that no kind name has been used multiple times"""
+ for enum in self.enums:
+ seen_names = set()
+ for id in range(len(enum._kinds)):
+ try:
+ kind_name = enum.from_id(id).name
+ except ValueError:
+ continue
+ self.assertNotIn(kind_name, seen_names)
+ seen_names.add(id)
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
