From nobody Wed Feb 11 05:30:33 2026 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1623154188; cv=none; d=zohomail.com; s=zohoarc; b=NLIpIvFYLmkj29uNlZ0Z67qWGxVVbzZyszDHKmDDtfDoIT4HfeSo/VEirZWc41kN4LUtPKFqAj1K+zGu3aUlnokZXOmSRobiHKZC/dLj3Ul/z5gN6rtEg6pTIx5txOrKiD6t1ZidgVO/zDGY+3H52eM3yYybHGN0AoZ4Y+NlBzM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623154188; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=bfdUWFWXW6jf2/9KyMsuMG7uUpq43nznvRfgpEIIcjc=; b=jhtH2aDJz4qD5D0P5bagd+5CV6MQfucMqJotCeNZHxss1D8iLI8NfDcOLqJpMVT37H8JyO7ytu8nGlYIngsUrmNQEz2gPk7Ezkv21P5mw6/VBwU9nszYtGqbnzxYqA7MmyGS91ZGY9gwo3oPVLwl0wqPA/6Deg0PRYCgt+2yEOI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623154188111224.8090701264839; Tue, 8 Jun 2021 05:09:48 -0700 (PDT) Received: from localhost ([::1]:50356 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqaYF-0001DI-2G for importer2@patchew.org; Tue, 08 Jun 2021 08:09:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55082) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqaWj-0006ry-2m for qemu-devel@nongnu.org; Tue, 08 Jun 2021 08:08:13 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:23116) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqaWh-0001Tj-Ci for qemu-devel@nongnu.org; Tue, 08 Jun 2021 08:08:12 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-211-vwHko3tON6mcoZw9zQebXw-1; Tue, 08 Jun 2021 08:08:09 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EC8F4803624 for ; Tue, 8 Jun 2021 12:08:07 +0000 (UTC) Received: from localhost (unknown [10.36.110.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id F061A620DE; Tue, 8 Jun 2021 12:08:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623154090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bfdUWFWXW6jf2/9KyMsuMG7uUpq43nznvRfgpEIIcjc=; b=F8XvfSP+IPhrPeOsWXwCFVKKIijD59ETAxk0blwpOyulLCRo2qq2Y0ZLchAA+KxKsQqD1Y s6mJeIO3HyV4rO3iHMLVL6PZ6Yfs7CaRtyru2dN1A248njEW4v2g7j2kNa+gcMJ0O3OYCw DmsVxSK7uR67YFCQDe3IosAKvALcbmE= X-MC-Unique: vwHko3tON6mcoZw9zQebXw-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH v5 5/9] qapi: introduce IfPredicateList and IfAny Date: Tue, 8 Jun 2021 16:07:19 +0400 Message-Id: <20210608120723.2268181-6-marcandre.lureau@redhat.com> In-Reply-To: <20210608120723.2268181-1-marcandre.lureau@redhat.com> References: <20210608120723.2268181-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.197, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eric Blake , jsnow@redhat.com, Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau Refactor IfAll class, to introduce a base class IfPredicateList and add IfAny for the 'any' conditions. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Stefan Hajnoczi Tested-by: John Snow --- 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 =3D=3D other.option =20 =20 -class IfAll(IfPredicate): +class IfPredicateList(IfPredicate): + C_SEP =3D "" + DOC_SEP =3D "" + def __init__(self, pred_list: Sequence[IfPredicate]): self.pred_list =3D pred_list =20 def cgen(self) -> str: - return " && ".join([p.cgen() for p in self.pred_list]) + sep =3D " " + self.C_SEP + " " + gen =3D sep.join([p.cgen() for p in self.pred_list]) + if len(self.pred_list) <=3D 1: + return gen + return "(%s)" % gen =20 def docgen(self) -> str: - return " and ".join([p.docgen() for p in self.pred_list]) + sep =3D " " + self.DOC_SEP + " " + gen =3D sep.join([p.docgen() for p in self.pred_list]) + if len(self.pred_list) <=3D 1: + return gen + return "(%s)" % gen =20 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})" =20 def __eq__(self, other: object) -> bool: - if not isinstance(other, IfAll): + if not isinstance(other, type(self)): return NotImplemented return self.pred_list =3D=3D other.pred_list + + +class IfAll(IfPredicateList): + C_SEP =3D "&&" + DOC_SEP =3D "and" + + +class IfAny(IfPredicateList): + C_SEP =3D "||" + DOC_SEP =3D "or" --=20 2.29.0