From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, John Snow <jsnow@redhat.com>
Subject: [PULL 05/15] qapi/parser: Assert lexer value is a string
Date: Thu, 20 May 2021 19:52:46 +0200 [thread overview]
Message-ID: <20210520175256.1119684-6-armbru@redhat.com> (raw)
In-Reply-To: <20210520175256.1119684-1-armbru@redhat.com>
From: John Snow <jsnow@redhat.com>
The type checker can't narrow the type of the token value to string,
because it's only loosely correlated with the return token.
We know that a token of '#' should always have a "str" value.
Add an assertion.
Signed-off-by: John Snow <jsnow@redhat.com>
Message-Id: <20210519183951.3946870-6-jsnow@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
scripts/qapi/parser.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/scripts/qapi/parser.py b/scripts/qapi/parser.py
index d620706fff..0bc852eda7 100644
--- a/scripts/qapi/parser.py
+++ b/scripts/qapi/parser.py
@@ -304,6 +304,7 @@ def get_doc(self, info):
cur_doc = QAPIDoc(self, info)
self.accept(False)
while self.tok == '#':
+ assert isinstance(self.val, str)
if self.val.startswith('##'):
# End of doc comment
if self.val != '##':
--
2.26.3
next prev parent reply other threads:[~2021-05-20 18:07 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-20 17:52 [PULL 00/15] QAPI patches patches for 2021-05-20 Markus Armbruster
2021-05-20 17:52 ` [PULL 01/15] qapi/parser: Don't try to handle file errors Markus Armbruster
2021-05-20 17:52 ` [PULL 02/15] qapi: Add test for nonexistent schema file Markus Armbruster
2021-05-20 17:52 ` [PULL 03/15] qapi/source: Remove line number from QAPISourceInfo initializer Markus Armbruster
2021-05-20 17:52 ` [PULL 04/15] qapi/parser: factor parsing routine into method Markus Armbruster
2021-05-20 17:52 ` Markus Armbruster [this message]
2021-05-20 17:52 ` [PULL 06/15] qapi/parser: enforce all top-level expressions must be dict in _parse() Markus Armbruster
2021-05-20 17:52 ` [PULL 07/15] qapi/parser: assert object keys are strings Markus Armbruster
2021-05-20 17:52 ` [PULL 08/15] qapi/parser: Use @staticmethod where appropriate Markus Armbruster
2021-05-20 17:52 ` [PULL 09/15] qapi: add must_match helper Markus Armbruster
2021-05-20 17:52 ` [PULL 10/15] qapi/parser: Fix token membership tests when token can be None Markus Armbruster
2021-05-20 17:52 ` [PULL 11/15] qapi/parser: Rework _check_pragma_list_of_str as a TypeGuard Markus Armbruster
2021-05-20 17:52 ` [PULL 12/15] qapi/parser: add type hint annotations Markus Armbruster
2021-05-20 17:52 ` [PULL 13/15] qapi/parser: Remove superfluous list comprehension Markus Armbruster
2021-05-20 17:52 ` [PULL 14/15] qapi/parser: allow 'ch' variable name Markus Armbruster
2021-05-20 17:52 ` [PULL 15/15] qapi/parser: add docstrings Markus Armbruster
2021-05-21 8:54 ` [PULL 00/15] QAPI patches patches for 2021-05-20 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210520175256.1119684-6-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=jsnow@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).