ezri/dbus-fast
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat: simplify code to unmarshall arrays (#435)

Browse Source
This commit is contained in:
J. Nick Koston 2025-03-22 23:45:41 -10:00 committed by GitHub
parent 331b755348
commit 958115f77b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/dbus_fast/_private/unmarshaller.py
View File

@ -610,13 +610,13 @@ class Unmarshaller:
child_type: SignatureType = type_.children[0] child_type: SignatureType = type_.children[0]
token_as_int = child_type.token_as_int token_as_int = child_type.token_as_int
if ( if token_as_int in {
token_as_int == TOKEN_X_AS_INT TOKEN_X_AS_INT,
or token_as_int == TOKEN_T_AS_INT TOKEN_T_AS_INT,
or token_as_int == TOKEN_D_AS_INT TOKEN_D_AS_INT,
or token_as_int == TOKEN_LEFT_CURLY_AS_INT TOKEN_LEFT_CURLY_AS_INT,
or token_as_int == TOKEN_LEFT_PAREN_AS_INT TOKEN_LEFT_PAREN_AS_INT,
): }:
# the first alignment is not included in the array size # the first alignment is not included in the array size
self._pos += -self._pos & 7 # align 8 self._pos += -self._pos & 7 # align 8
@ -640,9 +640,9 @@ class Unmarshaller:
# so we optimize for that by inlining the string reading # so we optimize for that by inlining the string reading
# and the variant reading here # and the variant reading here
if ( if (
child_0_token_as_int == TOKEN_O_AS_INT child_0_token_as_int in {TOKEN_O_AS_INT, TOKEN_S_AS_INT}
or child_0_token_as_int == TOKEN_S_AS_INT and child_1_token_as_int == TOKEN_V_AS_INT
) and child_1_token_as_int == TOKEN_V_AS_INT: ):
while self._pos - beginning_pos < array_length: while self._pos - beginning_pos < array_length:
self._pos += -self._pos & 7 # align 8 self._pos += -self._pos & 7 # align 8
key = self._read_string_unpack() key = self._read_string_unpack()
@ -656,9 +656,9 @@ class Unmarshaller:
key = self._read_uint16_unpack() key = self._read_uint16_unpack()
result_dict[key] = self._read_variant() result_dict[key] = self._read_variant()
elif ( elif (
child_0_token_as_int == TOKEN_O_AS_INT child_0_token_as_int in {TOKEN_O_AS_INT, TOKEN_S_AS_INT}
or child_0_token_as_int == TOKEN_S_AS_INT and child_1_token_as_int == TOKEN_A_AS_INT
) and child_1_token_as_int == TOKEN_A_AS_INT: ):
while self._pos - beginning_pos < array_length: while self._pos - beginning_pos < array_length:
self._pos += -self._pos & 7 # align 8 self._pos += -self._pos & 7 # align 8
key = self._read_string_unpack() key = self._read_string_unpack()