[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 02/12] qapi: Simplify how QAPISchemaIfCond represents "no conditi
From: |
Markus Armbruster |
Subject: |
[PATCH 02/12] qapi: Simplify how QAPISchemaIfCond represents "no condition" |
Date: |
Tue, 31 Aug 2021 14:37:59 +0200 |
None works fine, there is no need to replace it by {} in .__init__().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
scripts/qapi/common.py | 4 ++--
scripts/qapi/schema.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py
index 1724ac32db..1c1dc87ccb 100644
--- a/scripts/qapi/common.py
+++ b/scripts/qapi/common.py
@@ -200,7 +200,7 @@ def guardend(name: str) -> str:
name=c_fname(name).upper())
-def cgen_ifcond(ifcond: Union[str, Dict[str, Any]]) -> str:
+def cgen_ifcond(ifcond: Optional[Union[str, Dict[str, Any]]]) -> str:
if not ifcond:
return ''
if isinstance(ifcond, str):
@@ -214,7 +214,7 @@ def cgen_ifcond(ifcond: Union[str, Dict[str, Any]]) -> str:
return '(' + (') ' + oper + ' (').join(operands) + ')'
-def docgen_ifcond(ifcond: Union[str, Dict[str, Any]]) -> str:
+def docgen_ifcond(ifcond: Optional[Union[str, Dict[str, Any]]]) -> str:
# TODO Doc generated for conditions needs polish
if not ifcond:
return ''
diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py
index 1451cdec81..3d72c7dfc9 100644
--- a/scripts/qapi/schema.py
+++ b/scripts/qapi/schema.py
@@ -34,7 +34,7 @@
class QAPISchemaIfCond:
def __init__(self, ifcond=None):
- self.ifcond = ifcond or {}
+ self.ifcond = ifcond
def _cgen(self):
return cgen_ifcond(self.ifcond)
--
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, 2021/08/31
- [PATCH 02/12] qapi: Simplify how QAPISchemaIfCond represents "no condition",
Markus Armbruster <=
- [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