From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org,
"Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: [PULL 07/13] qapi: Factor common recursion out of cgen_ifcond(), docgen_ifcond()
Date: Fri, 3 Sep 2021 21:32:03 +0200 [thread overview]
Message-ID: <20210903193209.1426791-8-armbru@redhat.com> (raw)
In-Reply-To: <20210903193209.1426791-1-armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20210831123809.1107782-7-armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
scripts/qapi/common.py | 45 +++++++++++++++++++++++-------------------
1 file changed, 25 insertions(+), 20 deletions(-)
diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py
index f31e077d7b..df92cff852 100644
--- a/scripts/qapi/common.py
+++ b/scripts/qapi/common.py
@@ -17,6 +17,7 @@
Dict,
Match,
Optional,
+ Sequence,
Union,
)
@@ -200,33 +201,37 @@ def guardend(name: str) -> str:
name=c_fname(name).upper())
-def cgen_ifcond(ifcond: Optional[Union[str, Dict[str, Any]]]) -> str:
+def gen_ifcond(ifcond: Optional[Union[str, Dict[str, Any]]],
+ cond_fmt: str, not_fmt: str,
+ all_operator: str, any_operator: str) -> str:
+
+ def do_gen(ifcond: Union[str, Dict[str, Any]]):
+ if isinstance(ifcond, str):
+ return cond_fmt % ifcond
+ assert isinstance(ifcond, dict) and len(ifcond) == 1
+ if 'not' in ifcond:
+ return not_fmt % do_gen(ifcond['not'])
+ if 'all' in ifcond:
+ gen = gen_infix(all_operator, ifcond['all'])
+ else:
+ gen = gen_infix(any_operator, ifcond['any'])
+ return gen
+
+ def gen_infix(operator: str, operands: Sequence[Any]) -> str:
+ return '(' + operator.join([do_gen(o) for o in operands]) + ')'
+
if not ifcond:
return ''
- if isinstance(ifcond, str):
- return 'defined(' + ifcond + ')'
+ return do_gen(ifcond)
- oper, operands = next(iter(ifcond.items()))
- if oper == 'not':
- return '!' + cgen_ifcond(operands)
- oper = {'all': ' && ', 'any': ' || '}[oper]
- operands = [cgen_ifcond(o) for o in operands]
- return '(' + oper.join(operands) + ')'
+
+def cgen_ifcond(ifcond: Optional[Union[str, Dict[str, Any]]]) -> str:
+ return gen_ifcond(ifcond, 'defined(%s)', '!%s', ' && ', ' || ')
def docgen_ifcond(ifcond: Optional[Union[str, Dict[str, Any]]]) -> str:
# TODO Doc generated for conditions needs polish
- if not ifcond:
- return ''
- if isinstance(ifcond, str):
- return ifcond
-
- oper, operands = next(iter(ifcond.items()))
- if oper == 'not':
- return '!' + docgen_ifcond(operands)
- oper = {'all': ' and ', 'any': ' or '}[oper]
- operands = [docgen_ifcond(o) for o in operands]
- return '(' + oper.join(operands) + ')'
+ return gen_ifcond(ifcond, '%s', '!%s', ' and ', ' or ')
def gen_if(cond: str) -> str:
--
2.31.1
next prev parent reply other threads:[~2021-09-03 19:40 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-03 19:31 [PULL 00/13] QAPI patches patches for 2021-09-03 Markus Armbruster
2021-09-03 19:31 ` [PULL 01/13] qapi: Set boolean value correctly in examples Markus Armbruster
2021-09-03 19:31 ` [PULL 02/13] qapi: Simplify QAPISchemaIfCond's interface for generating C Markus Armbruster
2021-09-03 19:31 ` [PULL 03/13] qapi: Simplify how QAPISchemaIfCond represents "no condition" Markus Armbruster
2021-09-03 19:32 ` [PULL 04/13] tests/qapi-schema: Correct two 'if' conditionals Markus Armbruster
2021-09-03 19:32 ` [PULL 05/13] tests/qapi-schema: Demonstrate broken C code for 'if' Markus Armbruster
2021-09-03 19:32 ` [PULL 06/13] qapi: Fix C code generation " Markus Armbruster
2021-09-03 19:32 ` Markus Armbruster [this message]
2021-09-03 19:32 ` [PULL 08/13] qapi: Avoid redundant parens in code generated for conditionals Markus Armbruster
2021-09-03 19:32 ` [PULL 09/13] qapi: Use "not COND" instead of "!COND" for generated documentation Markus Armbruster
2021-09-03 19:32 ` [PULL 10/13] qapi: Use re.fullmatch() where appropriate Markus Armbruster
2021-09-03 19:32 ` [PULL 11/13] tests/qapi-schema: Hide OrderedDict in test output Markus Armbruster
2021-09-03 19:32 ` [PULL 12/13] qapi: Tweak error messages for missing / conflicting meta-type Markus Armbruster
2021-09-03 19:32 ` [PULL 13/13] qapi: Tweak error messages for unknown / conflicting 'if' keys Markus Armbruster
2021-09-05 14:47 ` [PULL 00/13] QAPI patches patches for 2021-09-03 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=20210903193209.1426791-8-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=marcandre.lureau@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 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.