diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-11-27 13:12:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-27 13:12:23 +0100 |
| commit | b2363dcdd8d9529fe670b2d140f0dada307dbe98 (patch) | |
| tree | 88dd735b954ab03cd7861e39b9c9e2224f9951c8 | |
| parent | 1526e55f6cc7e741dae28b240bd682fd4e2bed79 (diff) | |
| parent | 315a3c9ff42afe8326ea34af3b2e8c720acc6658 (diff) | |
| download | systemd-b2363dcdd8d9529fe670b2d140f0dada307dbe98.tar.gz | |
Merge pull request #17734 from yuwata/parse-hwdb
hwdb: add missing Group()
| -rwxr-xr-x | hwdb.d/parse_hwdb.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/hwdb.d/parse_hwdb.py b/hwdb.d/parse_hwdb.py index ed07224b3c..d1ff4470de 100755 --- a/hwdb.d/parse_hwdb.py +++ b/hwdb.d/parse_hwdb.py @@ -33,7 +33,7 @@ try: OneOrMore, Combine, Or, Optional, Suppress, Group, nums, alphanums, printables, stringEnd, pythonStyleComment, - ParseBaseException) + ParseBaseException, __diag__) except ImportError: print('pyparsing is not available') sys.exit(77) @@ -50,6 +50,12 @@ except ImportError: # don't do caching on old python lru_cache = lambda: (lambda f: f) +__diag__.warn_multiple_tokens_in_named_alternation = True +__diag__.warn_ungrouped_named_tokens_in_collection = True +__diag__.warn_name_set_on_empty_Forward = True +__diag__.warn_on_multiple_string_args_to_oneof = True +__diag__.enable_debug_on_named_expressions = True + EOL = LineEnd().suppress() EMPTYLINE = LineEnd() COMMENTLINE = pythonStyleComment + EOL @@ -111,9 +117,9 @@ def hwdb_grammar(): def property_grammar(): ParserElement.setDefaultWhitespaceChars(' ') - dpi_setting = (Optional('*')('DEFAULT') + INTEGER('DPI') + Suppress('@') + INTEGER('HZ'))('SETTINGS*') + dpi_setting = Group(Optional('*')('DEFAULT') + INTEGER('DPI') + Suppress('@') + INTEGER('HZ'))('SETTINGS*') mount_matrix_row = SIGNED_REAL + ',' + SIGNED_REAL + ',' + SIGNED_REAL - mount_matrix = (mount_matrix_row + ';' + mount_matrix_row + ';' + mount_matrix_row)('MOUNT_MATRIX') + mount_matrix = Group(mount_matrix_row + ';' + mount_matrix_row + ';' + mount_matrix_row)('MOUNT_MATRIX') xkb_setting = Optional(Word(alphanums + '+-/@._')) props = (('MOUSE_DPI', Group(OneOrMore(dpi_setting))), |