================
@@ -611,51 +612,25 @@ def register(value, name):
### Cursor Kinds ###
-class BaseEnumeration:
+class BaseEnumeration(Enum):
"""
Common base class for named enumerations held in sync with Index.h values.
-
- Subclasses must define their own _kinds and _name_map members, as:
- _kinds = []
- _name_map = None
- These values hold the per-subclass instances and value-to-name mappings,
- respectively.
-
"""
- def __init__(self, value):
- if value >= len(self.__class__._kinds):
- self.__class__._kinds += [None] * (value -
len(self.__class__._kinds) + 1)
- if self.__class__._kinds[value] is not None:
- raise ValueError(
- "{0} value {1} already loaded".format(str(self.__class__),
value)
- )
- self.value = value
- self.__class__._kinds[value] = self
- self.__class__._name_map = None
def from_param(self):
return self.value
- @property
- def name(self):
- """Get the enumeration name of this cursor kind."""
- if self._name_map is None:
- self._name_map = {}
- for key, value in self.__class__.__dict__.items():
- if isinstance(value, self.__class__):
- self._name_map[value] = key
- return self._name_map[self]
-
@classmethod
def from_id(cls, id):
- 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]
+ try:
+ return cls(id)
+ except ValueError:
+ raise ValueError("Unknown %s %d" % (cls.__name__, id)) from None
----------------
DeinAlptraum wrote:
In hindsight, should the change of error message go into a separate PR? The one
we had before, `Unknown template argument kind`, doesn't make much sense since
this is the base class of not just `TemplateArgumentKind`.
If we don't consider changing error messages as a breaking change, then we
could also remove the try-except part entirely since `Enum` already throws a
meanginful error, looking like this: `ValueError: 703 is not a valid CursorKind`
https://github.com/llvm/llvm-project/pull/95608
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
