[libclang/python] Refactor TokenKind usage

Unify TokenKind implementation with other enums

Author: DeinAlptraum

clang/bindings/python/clang/cindex.py

@@ -64,8 +64,6 @@
 
 from ctypes import *
 
-import clang.enumerations
-
 import collections.abc
 import os
 from enum import Enum
@@ -573,44 +571,6 @@ def get_tokens(tu, extent):
             yield token
 
 
-class TokenKind:
-    """Describes a specific type of a Token."""
-
-    _value_map = {}  # int -> TokenKind
-
-    def __init__(self, value, name):
-        """Create a new TokenKind instance from a numeric value and a name."""
-        self.value = value
-        self.name = name
-
-    def __repr__(self):
-        return "TokenKind.%s" % (self.name,)
-
-    @staticmethod
-    def from_value(value):
-        """Obtain a registered TokenKind instance from its value."""
-        result = TokenKind._value_map.get(value, None)
-
-        if result is None:
-            raise ValueError("Unknown TokenKind: %d" % value)
-
-        return result
-
-    @staticmethod
-    def register(value, name):
-        """Register a new TokenKind enumeration.
-
-        This should only be called at module load time by code within this
-        package.
-        """
-        if value in TokenKind._value_map:
-            raise ValueError("TokenKind already registered: %d" % value)
-
-        kind = TokenKind(value, name)
-        TokenKind._value_map[value] = kind
-        setattr(TokenKind, name, kind)
-
-
 ### Cursor Kinds ###
 class BaseEnumeration(Enum):
     """
@@ -635,6 +595,21 @@ def __repr__(self):
         )
 
 
+class TokenKind(BaseEnumeration):
+    """Describes a specific type of a Token."""
+
+    @classmethod
+    def from_value(cls, value):
+        """Obtain a registered TokenKind instance from its value."""
+        return cls.from_id(value)
+
+    PUNCTUATION = 0
+    KEYWORD = 1
+    IDENTIFIER = 2
+    LITERAL = 3
+    COMMENT = 4
+
+
 class CursorKind(BaseEnumeration):
     """
     A CursorKind describes the kind of entity that a cursor points to.
@@ -4040,13 +4015,7 @@ def function_exists(self, name):
         return True
 
 
-def register_enumerations():
-    for name, value in clang.enumerations.TokenKinds:
-        TokenKind.register(value, name)
-
-
 conf = Config()
-register_enumerations()
 
 __all__ = [
     "AvailabilityKind",

clang/bindings/python/clang/enumerations.py

@@ -1,6 +1,7 @@
 import unittest
 
 from clang.cindex import (
+    TokenKind,
     CursorKind,
     TemplateArgumentKind,
     ExceptionSpecificationKind,
@@ -16,6 +17,7 @@
 
 class TestCursorKind(unittest.TestCase):
     enums = [
+        TokenKind,
         CursorKind,
         TemplateArgumentKind,
         ExceptionSpecificationKind,

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

@@ -10,26 +10,6 @@
 
 
 class TestTokenKind(unittest.TestCase):
-    def test_constructor(self):
-        """Ensure TokenKind constructor works as expected."""
-
-        t = TokenKind(5, "foo")
-
-        self.assertEqual(t.value, 5)
-        self.assertEqual(t.name, "foo")
-
-    def test_bad_register(self):
-        """Ensure a duplicate value is rejected for registration."""
-
-        with self.assertRaises(ValueError):
-            TokenKind.register(2, "foo")
-
-    def test_unknown_value(self):
-        """Ensure trying to fetch an unknown value raises."""
-
-        with self.assertRaises(ValueError):
-            TokenKind.from_value(-1)
-
     def test_registration(self):
         """Ensure that items registered appear as class attributes."""
         self.assertTrue(hasattr(TokenKind, "LITERAL"))