From 488716020e275ef777454724d2ab41cfc050b40a Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Thu, 6 Mar 2025 11:44:09 -1000
Subject: [PATCH] feat: improve performance of checking SignatureType tokens
 (#410)

* feat: improve performance of checking SignatureType tokens

* chore: fixes
---
 src/dbus_fast/_private/unmarshaller.py | 9 +++++----
 src/dbus_fast/signature.pxd            | 1 +
 src/dbus_fast/signature.py             | 3 ++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/dbus_fast/_private/unmarshaller.py b/src/dbus_fast/_private/unmarshaller.py
index f180518..34cafbb 100644
--- a/src/dbus_fast/_private/unmarshaller.py
+++ b/src/dbus_fast/_private/unmarshaller.py
@@ -617,7 +617,7 @@ class Unmarshaller:
         else:
             array_length = self._uint32_unpack(self._buf, self._pos - UINT32_SIZE)[0]
         child_type: SignatureType = type_.children[0]
-        token_as_int = ord(child_type.token[0])
+        token_as_int = child_type.token_as_int
 
         if (
             token_as_int == TOKEN_X_AS_INT
@@ -635,12 +635,13 @@ class Unmarshaller:
 
         if token_as_int == TOKEN_LEFT_CURLY_AS_INT:
             result_dict: dict[Any, Any] = {}
+            key: str | int
             beginning_pos = self._pos
             children = child_type.children
             child_0 = children[0]
             child_1 = children[1]
-            child_0_token_as_int = ord(child_0.token[0])
-            child_1_token_as_int = ord(child_1.token[0])
+            child_0_token_as_int = child_0.token_as_int
+            child_1_token_as_int = child_1.token_as_int
             # Strings with variant values are the most common case
             # so we optimize for that by inlining the string reading
             # and the variant reading here
@@ -650,7 +651,7 @@ class Unmarshaller:
             ) and child_1_token_as_int == TOKEN_V_AS_INT:
                 while self._pos - beginning_pos < array_length:
                     self._pos += -self._pos & 7  # align 8
-                    key: str | int = self._read_string_unpack()
+                    key = self._read_string_unpack()
                     result_dict[key] = self._read_variant()
             elif (
                 child_0_token_as_int == TOKEN_Q_AS_INT
diff --git a/src/dbus_fast/signature.pxd b/src/dbus_fast/signature.pxd
index faf8ea0..ea125cd 100644
--- a/src/dbus_fast/signature.pxd
+++ b/src/dbus_fast/signature.pxd
@@ -6,6 +6,7 @@ import cython
 cdef class SignatureType:
 
     cdef public str token
+    cdef public unsigned int token_as_int
     cdef public list children
     cdef str _signature
 
diff --git a/src/dbus_fast/signature.py b/src/dbus_fast/signature.py
index 23afbe5..7b3f124 100644
--- a/src/dbus_fast/signature.py
+++ b/src/dbus_fast/signature.py
@@ -21,11 +21,12 @@ class SignatureType:
     """
 
     _tokens = "ybnqiuxtdsogavh({"
-    __slots__ = ("token", "children", "_signature")
+    __slots__ = ("token", "token_as_int", "children", "_signature")
 
     def __init__(self, token: str) -> None:
         """Init a new SignatureType."""
         self.token: str = token
+        self.token_as_int = ord(token)
         self.children: list[SignatureType] = []
         self._signature: Optional[str] = None