From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DAA2BC4743E for ; Tue, 8 Jun 2021 12:09:33 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A07D76128D for ; Tue, 8 Jun 2021 12:09:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A07D76128D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:50356 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqaY0-0001DI-Pu for qemu-devel@archiver.kernel.org; Tue, 08 Jun 2021 08:09:32 -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 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= 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 X-MC-Unique: vwHko3tON6mcoZw9zQebXw-1 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) 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: 8bit 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Refactor IfAll class, to introduce a base class IfPredicateList and add IfAny for the 'any' conditions. Signed-off-by: Marc-André 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 == 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