[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 4/9] qapi: introduce IfPredicateList and IfAny
From: |
marcandre . lureau |
Subject: |
[PATCH 4/9] qapi: introduce IfPredicateList and IfAny |
Date: |
Thu, 15 Oct 2020 20:52:50 +0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Generalize IfAll to allow 'any' conditions.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
scripts/qapi/common.py | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py
index 29e0697c27..f5166e0bad 100644
--- a/scripts/qapi/common.py
+++ b/scripts/qapi/common.py
@@ -215,25 +215,37 @@ class IfOption(IfPredicate):
return self.option == other.option
-class IfAll(IfPredicate):
+class IfPredicateList(IfPredicate):
+ C_OP = ""
+
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])
+ op = " " + self.C_OP + " "
+ return "(%s)" % op.join([p.cgen() for p in self.pred_list])
def __bool__(self) -> bool:
return bool(self.pred_list)
def __repr__(self) -> str:
- return f"IfAll({self.pred_list})"
+ ty = type(self)
+ return f"{ty.__qualname__}({self.pred_list})"
def __eq__(self, other: object) -> bool:
- if not isinstance(other, IfAll):
+ if not isinstance(other, type(self)):
return False
return self.pred_list == other.pred_list
+class IfAll(IfPredicateList):
+ C_OP = "&&"
+
+
+class IfAny(IfPredicateList):
+ C_OP = "||"
+
+
class IfCond:
def __init__(self, ifcond: Optional[Sequence[str]] = None):
pred_list = [IfOption(opt) for opt in ifcond or []]
--
2.28.0
- [PATCH 0/9] qapi: untie 'if' conditions from C preprocessor, marcandre . lureau, 2020/10/15
- [PATCH 1/9] qapi: replace List[str] by IfCond, marcandre . lureau, 2020/10/15
- [PATCH 2/9] qapi: move gen_if/gen_endif to IfCond, marcandre . lureau, 2020/10/15
- [PATCH 3/9] qapi: start building an 'if' predicate tree, marcandre . lureau, 2020/10/15
- [PATCH 4/9] qapi: introduce IfPredicateList and IfAny,
marcandre . lureau <=
- [PATCH 5/9] qapi: add IfNot, marcandre . lureau, 2020/10/15
- [PATCH 6/9] qapi: normalize 'if' condition to IfPredicate, marcandre . lureau, 2020/10/15
- [PATCH 7/9] qapi: convert 'if' C expressions to literal form, marcandre . lureau, 2020/10/15
- [PATCH 9/9] docs: update the documentation about schema configuration, marcandre . lureau, 2020/10/15
- [PATCH 8/9] qapi: make 'if' condition strings simple identifiers, marcandre . lureau, 2020/10/15