From 44bf419778fd2b45436000dc244da2a35845772c Mon Sep 17 00:00:00 2001 From: Ulf Magnusson Date: Fri, 5 Jul 2019 03:10:39 +0200 Subject: Pass set literals instead of tuples to frozenset() This triggers a different set-to-set code path and makes some of them a bit smaller, e.g. 480 instead of 736 bytes for _RELATIONS. Probably no measurable performance difference, but might as well. --- kconfiglib.py | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/kconfiglib.py b/kconfiglib.py index 546d2dd..67ca6ff 100644 --- a/kconfiglib.py +++ b/kconfiglib.py @@ -6878,7 +6878,7 @@ _DEF_TOKEN_TO_TYPE = { # Identifier-like lexemes ("missing quotes") are also treated as strings after # these tokens. _T_CHOICE is included to avoid symbols being registered for # named choices. -_STRING_LEX = frozenset(( +_STRING_LEX = frozenset({ _T_BOOL, _T_CHOICE, _T_COMMENT, @@ -6893,76 +6893,76 @@ _STRING_LEX = frozenset(( _T_SOURCE, _T_STRING, _T_TRISTATE, -)) +}) # Various sets for quick membership tests. Gives a single global lookup and # avoids creating temporary dicts/tuples. -_TYPE_TOKENS = frozenset(( +_TYPE_TOKENS = frozenset({ _T_BOOL, _T_TRISTATE, _T_INT, _T_HEX, _T_STRING, -)) +}) -_SOURCE_TOKENS = frozenset(( +_SOURCE_TOKENS = frozenset({ _T_SOURCE, _T_RSOURCE, _T_OSOURCE, _T_ORSOURCE, -)) +}) -_REL_SOURCE_TOKENS = frozenset(( +_REL_SOURCE_TOKENS = frozenset({ _T_RSOURCE, _T_ORSOURCE, -)) +}) # Obligatory (non-optional) sources -_OBL_SOURCE_TOKENS = frozenset(( +_OBL_SOURCE_TOKENS = frozenset({ _T_SOURCE, _T_RSOURCE, -)) +}) -_BOOL_TRISTATE = frozenset(( +_BOOL_TRISTATE = frozenset({ BOOL, TRISTATE, -)) +}) -_BOOL_TRISTATE_UNKNOWN = frozenset(( +_BOOL_TRISTATE_UNKNOWN = frozenset({ BOOL, TRISTATE, UNKNOWN, -)) +}) -_INT_HEX = frozenset(( +_INT_HEX = frozenset({ INT, HEX, -)) +}) -_SYMBOL_CHOICE = frozenset(( +_SYMBOL_CHOICE = frozenset({ Symbol, Choice, -)) +}) -_MENU_COMMENT = frozenset(( +_MENU_COMMENT = frozenset({ MENU, COMMENT, -)) +}) -_EQUAL_UNEQUAL = frozenset(( +_EQUAL_UNEQUAL = frozenset({ EQUAL, UNEQUAL, -)) +}) -_RELATIONS = frozenset(( +_RELATIONS = frozenset({ EQUAL, UNEQUAL, LESS, LESS_EQUAL, GREATER, GREATER_EQUAL, -)) +}) # Helper functions for getting compiled regular expressions, with the needed # matching function returned directly as a small optimization. -- cgit v1.2.3