From: John Snow <jsnow@redhat.com>
To: Markus Armbruster <armbru@redhat.com>, qemu-devel@nongnu.org
Cc: John Snow <jsnow@redhat.com>,
Eduardo Habkost <ehabkost@redhat.com>,
Cleber Rosa <crosa@redhat.com>
Subject: [PATCH v3 07/13] qapi/introspect.py: Introduce preliminary tree typing
Date: Wed, 16 Dec 2020 20:53:37 -0500 [thread overview]
Message-ID: <20201217015343.196279-8-jsnow@redhat.com> (raw)
In-Reply-To: <20201217015343.196279-1-jsnow@redhat.com>
The types will be used in forthcoming patches to add typing. These types
describe the layout and structure of the objects passed to
_tree_to_qlit, but lack the power to describe annotations until the next
commit.
Signed-off-by: John Snow <jsnow@redhat.com>
---
scripts/qapi/introspect.py | 30 +++++++++++++++++++++++++++++-
1 file changed, 29 insertions(+), 1 deletion(-)
diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py
index 0aa3b77109f..b82efe16f6e 100644
--- a/scripts/qapi/introspect.py
+++ b/scripts/qapi/introspect.py
@@ -10,7 +10,13 @@
See the COPYING file in the top-level directory.
"""
-from typing import Optional
+from typing import (
+ Any,
+ Dict,
+ List,
+ Optional,
+ Union,
+)
from .common import (
c_name,
@@ -26,6 +32,28 @@
)
+# This module constructs a tree data structure that is used to
+# generate the introspection information for QEMU. It behaves similarly
+# to a JSON value.
+#
+# A complexity over JSON is that our values may or may not be annotated.
+#
+# Un-annotated values may be:
+# Scalar: str, bool, None.
+# Non-scalar: List, Dict
+# _value = Union[str, bool, None, Dict[str, TreeValue], List[TreeValue]]
+#
+# With optional annotations, the type of all values is:
+# TreeValue = Union[_value, Annotated[_value]]
+#
+# Sadly, mypy does not support recursive types, so we must approximate this.
+_stub = Any
+_scalar = Union[str, bool, None]
+_nonscalar = Union[Dict[str, _stub], List[_stub]]
+_value = Union[_scalar, _nonscalar]
+# TreeValue = Union[_value, 'Annotated[_value]']
+
+
def _make_tree(obj, ifcond, comment=None):
extra = {
'if': ifcond,
--
2.26.2
next prev parent reply other threads:[~2020-12-17 2:05 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-17 1:53 [PATCH v3 00/13] qapi: static typing conversion, pt2 John Snow
2020-12-17 1:53 ` [PATCH v3 01/13] qapi/introspect.py: assert schema is not None John Snow
2020-12-17 1:53 ` [PATCH v3 02/13] qapi/introspect.py: use _make_tree for features nodes John Snow
2020-12-17 1:53 ` [PATCH v3 03/13] qapi/introspect.py: add _gen_features helper John Snow
2020-12-17 1:53 ` [PATCH v3 04/13] qapi/introspect.py: guard against ifcond/comment misuse John Snow
2020-12-17 1:53 ` [PATCH v3 05/13] qapi/introspect.py: Unify return type of _make_tree() John Snow
2020-12-17 1:53 ` [PATCH v3 06/13] qapi/introspect.py: replace 'extra' dict with 'comment' argument John Snow
2020-12-17 1:53 ` John Snow [this message]
2020-12-17 1:53 ` [PATCH v3 08/13] qapi/introspect.py: create a typed 'Annotated' data strutcure John Snow
2020-12-17 1:53 ` [PATCH v3 09/13] qapi/introspect.py: improve _tree_to_qlit error message John Snow
2020-12-17 1:53 ` [PATCH v3 10/13] qapi/introspect.py: improve readability of _tree_to_qlit John Snow
2020-12-17 1:53 ` [PATCH v3 11/13] qapi/introspect.py: add type hint annotations John Snow
2020-12-17 1:53 ` [PATCH v3 12/13] qapi/instrospect.py: add introspect.json dummy types John Snow
2020-12-17 1:53 ` [PATCH v3 13/13] qapi/introspect.py: Add docstring to _tree_to_qlit John Snow
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=20201217015343.196279-8-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=armbru@redhat.com \
--cc=crosa@redhat.com \
--cc=ehabkost@redhat.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.