mirror of
https://github.com/morgan9e/systemd
synced 2026-04-14 00:14:32 +09:00
test/parse_hwdb: wrap Or inside an And in a Group
I now get a warning like this with python3-pyparsing-3.1.2-8.fc42:
hwdb.d/parse_hwdb.py:208: UserWarning: warn_multiple_tokens_in_named_alternation:
setting results name 'VALUE' on Or expression will return a list of all parsed
tokens in an And alternative, in prior versions only the first token was returned;
enclose contained argument in Group
('!' ^ (Optional('!') - Word(alphanums + '_')))('VALUE')
This commit is contained in:
committed by
Luca Boccassi
parent
06d73c5046
commit
48aec295a8
@@ -205,7 +205,7 @@ def property_grammar():
|
||||
for name, val in props]
|
||||
kbd_props = [Regex(r'KEYBOARD_KEY_[0-9a-f]+')('NAME')
|
||||
- Suppress('=') -
|
||||
('!' ^ (Optional('!') - Word(alphanums + '_')))('VALUE')
|
||||
Group('!' ^ (Optional('!') - Word(alphanums + '_')))('VALUE')
|
||||
]
|
||||
abs_props = [Regex(r'EVDEV_ABS_[0-9a-f]{2}')('NAME')
|
||||
- Suppress('=') -
|
||||
|
||||
Reference in New Issue
Block a user