qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, John Snow <jsnow@redhat.com>
Subject: [PATCH 09/18] qapi/introspect.py: Introduce preliminary tree typing
Date: Fri, 19 Feb 2021 13:04:13 +0100	[thread overview]
Message-ID: <20210219120422.600850-10-armbru@redhat.com> (raw)
In-Reply-To: <20210219120422.600850-1-armbru@redhat.com>

From: John Snow <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>
Message-Id: <20210216021809.134886-10-jsnow@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 scripts/qapi/introspect.py | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py
index 88af5383d5..c271006100 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,29 @@
 )
 
 
+# This module constructs a tree data structure that is used to
+# generate the introspection information for QEMU. It is shaped
+# like 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, JSONValue], List[JSONValue]]
+#
+# With optional annotations, the type of all values is:
+# JSONValue = Union[_Value, Annotated[_Value]]
+#
+# Sadly, mypy does not support recursive types; so the _Stub alias is used to
+# mark the imprecision in the type model where we'd otherwise use JSONValue.
+_Stub = Any
+_Scalar = Union[str, bool, None]
+_NonScalar = Union[Dict[str, _Stub], List[_Stub]]
+_Value = Union[_Scalar, _NonScalar]
+# JSONValue = TODO, in a forthcoming commit.
+
+
 def _make_tree(obj, ifcond, comment=None):
     extra = {
         'if': ifcond,
-- 
2.26.2



  parent reply	other threads:[~2021-02-19 12:27 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-19 12:04 [PATCH 00/18] QAPI patches patches for 2021-02-18 Markus Armbruster
2021-02-19 12:04 ` [PATCH 01/18] qapi: Replace List[str] with Sequence[str] for ifcond Markus Armbruster
2021-02-19 12:04 ` [PATCH 02/18] qapi/introspect.py: assert schema is not None Markus Armbruster
2021-02-19 12:04 ` [PATCH 03/18] qapi/introspect.py: use _make_tree for features nodes Markus Armbruster
2021-02-19 12:04 ` [PATCH 04/18] qapi/introspect.py: add _gen_features helper Markus Armbruster
2021-02-19 12:04 ` [PATCH 05/18] qapi/introspect.py: guard against ifcond/comment misuse Markus Armbruster
2021-02-19 12:04 ` [PATCH 06/18] qapi/introspect.py: Unify return type of _make_tree() Markus Armbruster
2021-02-19 12:04 ` [PATCH 07/18] qapi/introspect.py: replace 'extra' dict with 'comment' argument Markus Armbruster
2021-02-19 12:04 ` [PATCH 08/18] qapi/introspect.py: Always define all 'extra' dict keys Markus Armbruster
2021-02-19 12:04 ` Markus Armbruster [this message]
2021-02-19 12:04 ` [PATCH 10/18] qapi/introspect.py: create a typed 'Annotated' data strutcure Markus Armbruster
2021-02-19 12:04 ` [PATCH 11/18] qapi/introspect.py: improve _tree_to_qlit error message Markus Armbruster
2021-02-19 12:04 ` [PATCH 12/18] qapi/introspect.py: improve readability of _tree_to_qlit Markus Armbruster
2021-02-19 12:04 ` [PATCH 13/18] qapi/introspect.py: remove _gen_variants helper Markus Armbruster
2021-02-19 12:04 ` [PATCH 14/18] qapi/introspect.py: add type hint annotations Markus Armbruster
2021-02-19 12:04 ` [PATCH 15/18] qapi/introspect.py: Add docstrings to _gen_tree and _tree_to_qlit Markus Armbruster
2021-02-19 12:04 ` [PATCH 16/18] qapi/introspect.py: Update copyright and authors list Markus Armbruster
2021-02-19 12:04 ` [PATCH 17/18] qapi/introspect.py: Type _gen_tree variants as Sequence[str] Markus Armbruster
2021-02-19 12:04 ` [PATCH 18/18] qapi/introspect.py: set _gen_tree's default ifcond argument to () Markus Armbruster
2021-02-19 14:49 ` [PATCH 00/18] QAPI patches patches for 2021-02-18 Markus Armbruster

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=20210219120422.600850-10-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).