[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 06/12] qapi: Factor common recursion out of cgen_ifcond(), docgen
From: |
Markus Armbruster |
Subject: |
[PATCH 06/12] qapi: Factor common recursion out of cgen_ifcond(), docgen_ifcond() |
Date: |
Tue, 31 Aug 2021 14:38:03 +0200 |
Signed-off-by: Markus Armbruster <armbru@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
- [PATCH 00/12] qapi: Fixes and cleanups for recent work (mostly), Markus Armbruster, 2021/08/31
- [PATCH 07/12] qapi: Avoid redundant parens in code generated for conditionals, Markus Armbruster, 2021/08/31
- [PATCH 01/12] qapi: Simplify QAPISchemaIfCond's interface for generating C, Markus Armbruster, 2021/08/31
- [PATCH 06/12] qapi: Factor common recursion out of cgen_ifcond(), docgen_ifcond(),
Markus Armbruster <=
- [PATCH 02/12] qapi: Simplify how QAPISchemaIfCond represents "no condition", Markus Armbruster, 2021/08/31
- [PATCH 05/12] qapi: Fix C code generation for 'if', Markus Armbruster, 2021/08/31
- [PATCH 04/12] tests/qapi-schema: Demonstrate broken C code for 'if', Markus Armbruster, 2021/08/31
- [PATCH 08/12] qapi: Use "not COND" instead of "!COND" for generated documentation, Markus Armbruster, 2021/08/31
- [PATCH 03/12] tests/qapi-schema: Correct two 'if' conditionals, Markus Armbruster, 2021/08/31
- [PATCH 10/12] tests/qapi-schema: Hide OrderedDict in test output, Markus Armbruster, 2021/08/31
- [PATCH 11/12] qapi: Tweak error messages for missing / conflicting meta-type, Markus Armbruster, 2021/08/31
- [PATCH 12/12] qapi: Tweak error messages for unknown / conflicting 'if' keys, Markus Armbruster, 2021/08/31
- [PATCH 09/12] qapi: Use re.fullmatch() where appropriate, Markus Armbruster, 2021/08/31
- Re: [PATCH 00/12] qapi: Fixes and cleanups for recent work (mostly), Marc-André Lureau, 2021/08/31