[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 14/25] qapi/expr: Only explicitly prohibit 'Kind' nor 'List' for t
From: |
Markus Armbruster |
Subject: |
[PULL 14/25] qapi/expr: Only explicitly prohibit 'Kind' nor 'List' for type names |
Date: |
Fri, 30 Apr 2021 13:48:27 +0200 |
From: John Snow <jsnow@redhat.com>
Per list review: qapi-code-gen.txt reserves suffixes Kind and
List only for type names, but the code rejects them for events and
commands, too.
It turns out we reject them earlier anyway: In check_name_upper() for
event names, and in check_name_lower() for command names.
Still, adjust the code for clarity over what precisely we are guarding
against.
Signed-off-by: John Snow <jsnow@redhat.com>
Message-Id: <20210421182032.3521476-15-jsnow@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
scripts/qapi/expr.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/qapi/expr.py b/scripts/qapi/expr.py
index 5e4d5f80aa..c33caf00d9 100644
--- a/scripts/qapi/expr.py
+++ b/scripts/qapi/expr.py
@@ -95,9 +95,9 @@ def check_defn_name_str(name: str, info: QAPISourceInfo,
meta: str) -> None:
permit_underscore=name in info.pragma.command_name_exceptions)
else:
check_name_camel(name, info, meta)
- if name.endswith('Kind') or name.endswith('List'):
- raise QAPISemError(
- info, "%s name should not end in '%s'" % (meta, name[-4:]))
+ if name.endswith('Kind') or name.endswith('List'):
+ raise QAPISemError(
+ info, "%s name should not end in '%s'" % (meta, name[-4:]))
def check_keys(value: _JSONObject,
--
2.26.3
- [PULL 00/25] QAPI patches patches for 2021-04-30, Markus Armbruster, 2021/04/30
- [PULL 04/25] qapi/expr.py: constrain incoming expression types, Markus Armbruster, 2021/04/30
- [PULL 03/25] qapi/expr.py: Check for dict instead of OrderedDict, Markus Armbruster, 2021/04/30
- [PULL 08/25] qapi/expr.py: Add casts in a few select cases, Markus Armbruster, 2021/04/30
- [PULL 13/25] qapi/expr.py: enable pylint checks, Markus Armbruster, 2021/04/30
- [PULL 11/25] qapi/expr.py: Consolidate check_if_str calls in check_if, Markus Armbruster, 2021/04/30
- [PULL 06/25] qapi/expr.py: move string check upwards in check_type, Markus Armbruster, 2021/04/30
- [PULL 12/25] qapi/expr.py: Remove single-letter variable, Markus Armbruster, 2021/04/30
- [PULL 14/25] qapi/expr: Only explicitly prohibit 'Kind' nor 'List' for type names,
Markus Armbruster <=
- [PULL 10/25] qapi/expr.py: add type hint annotations, Markus Armbruster, 2021/04/30
- [PULL 09/25] qapi/expr.py: Modify check_keys to accept any Collection, Markus Armbruster, 2021/04/30
- [PULL 01/25] qapi/expr: Comment cleanup, Markus Armbruster, 2021/04/30
- [PULL 16/25] qapi/expr.py: Use tuples instead of lists for static data, Markus Armbruster, 2021/04/30
- [PULL 05/25] qapi/expr.py: Add assertion for union type 'check_dict', Markus Armbruster, 2021/04/30
- [PULL 25/25] qapi/error.py: enable mypy checks, Markus Armbruster, 2021/04/30
- [PULL 19/25] qapi/error: Use Python3-style super(), Markus Armbruster, 2021/04/30
- [PULL 23/25] qapi/error.py: enable pylint checks, Markus Armbruster, 2021/04/30
- [PULL 20/25] qapi/error: Make QAPISourceError 'col' parameter optional, Markus Armbruster, 2021/04/30
- [PULL 22/25] qapi/error.py: move QAPIParseError to parser.py, Markus Armbruster, 2021/04/30