[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 5/9] qapi: introduce IfPredicateList and IfAny
From: |
marcandre . lureau |
Subject: |
[PATCH v5 5/9] qapi: introduce IfPredicateList and IfAny |
Date: |
Tue, 8 Jun 2021 16:07:19 +0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Refactor IfAll class, to introduce a base class IfPredicateList and add
IfAny for the 'any' conditions.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Tested-by: John Snow <jsnow@redhat.com>
---
scripts/qapi/common.py | 29 +++++++++++++++++++++++++----
1 file changed, 25 insertions(+), 4 deletions(-)
diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py
index 01e3203545..a4a41c23bc 100644
--- a/scripts/qapi/common.py
+++ b/scripts/qapi/common.py
@@ -245,15 +245,26 @@ def __eq__(self, other: object) -> bool:
return self.option == other.option
-class IfAll(IfPredicate):
+class IfPredicateList(IfPredicate):
+ C_SEP = ""
+ DOC_SEP = ""
+
def __init__(self, pred_list: Sequence[IfPredicate]):
self.pred_list = pred_list
def cgen(self) -> str:
- return " && ".join([p.cgen() for p in self.pred_list])
+ sep = " " + self.C_SEP + " "
+ gen = sep.join([p.cgen() for p in self.pred_list])
+ if len(self.pred_list) <= 1:
+ return gen
+ return "(%s)" % gen
def docgen(self) -> str:
- return " and ".join([p.docgen() for p in self.pred_list])
+ sep = " " + self.DOC_SEP + " "
+ gen = sep.join([p.docgen() for p in self.pred_list])
+ if len(self.pred_list) <= 1:
+ return gen
+ return "(%s)" % gen
def __bool__(self) -> bool:
return bool(self.pred_list)
@@ -262,6 +273,16 @@ def __repr__(self) -> str:
return f"{type(self).__name__}({self.pred_list!r})"
def __eq__(self, other: object) -> bool:
- if not isinstance(other, IfAll):
+ if not isinstance(other, type(self)):
return NotImplemented
return self.pred_list == other.pred_list
+
+
+class IfAll(IfPredicateList):
+ C_SEP = "&&"
+ DOC_SEP = "and"
+
+
+class IfAny(IfPredicateList):
+ C_SEP = "||"
+ DOC_SEP = "or"
--
2.29.0
- Re: [PATCH v5 2/9] qapi: replace List[str] by QAPISchemaIfCond, (continued)
[PATCH v5 3/9] qapi: make gen_if/gen_endif take a simple string, marcandre . lureau, 2021/06/08
[PATCH v5 4/9] qapi: start building an 'if' predicate tree, marcandre . lureau, 2021/06/08
[PATCH v5 5/9] qapi: introduce IfPredicateList and IfAny,
marcandre . lureau <=
[PATCH v5 6/9] qapi: add IfNot, marcandre . lureau, 2021/06/08
[PATCH v5 7/9] qapi: normalize 'if' condition to IfPredicate tree, marcandre . lureau, 2021/06/08
[PATCH v5 8/9] qapi: convert 'if' C-expressions to the new syntax tree, marcandre . lureau, 2021/06/08
[PATCH v5 9/9] qapi: make 'if' condition strings simple identifiers, marcandre . lureau, 2021/06/08
Re: [PATCH v5 0/9] qapi: untie 'if' conditions from C preprocessor, Markus Armbruster, 2021/06/15