From nobody Mon Feb 9 21:12:16 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1630698050; cv=none; d=zohomail.com; s=zohoarc; b=E/3FyI6bflRTpiBusywV/5dVIxcKNYE7zsywGN6BQx2gLLHr7IYQHGXTQs19D+9LJ0uFo+GNmOqGa/zXL6tKf+jf5HINx/+y1h+I48mP2t1tv3G7cx/ZO+V0O7CUQKhQra3jm7no81qB0ZcCDFolmzDnn0wVWtPWxwE2vUlmlN4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1630698050; 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=ZXTLMG5iR8j6xRJCwNT4ENeKijW35IpjnkBnkIwO/qc=; b=eyfxotpQHeBjgxNSon2rFCarCvICSP6oT+0DjwCmLTLClY6CuO7DcN3Ah3+hvLpD/L/W2F/XwPWnmVS+wbBkNPdmhKZzWW2Il8dnuw5oCZO12fL6Sw6BFjaXbMcI0gzEtSytXQ+nEdECeoxHN9kCXDIPtv0baZQe3tH/oxPS9N0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1630698050615457.8691793113436; Fri, 3 Sep 2021 12:40:50 -0700 (PDT) Received: from localhost ([::1]:57104 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mMF3R-0001kL-HR for importer@patchew.org; Fri, 03 Sep 2021 15:40:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42664) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mMEvJ-0005ot-9d for qemu-devel@nongnu.org; Fri, 03 Sep 2021 15:32:25 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:42991) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mMEvF-0003d7-US for qemu-devel@nongnu.org; Fri, 03 Sep 2021 15:32:24 -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-362-tfNqBwtANpG-iGVua1NXeA-1; Fri, 03 Sep 2021 15:32:19 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 210FC84A5E1; Fri, 3 Sep 2021 19:32:19 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-13.ams2.redhat.com [10.36.112.13]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8DDDA5D6A1; Fri, 3 Sep 2021 19:32:12 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id D624B1138224; Fri, 3 Sep 2021 21:32:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630697541; 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=ZXTLMG5iR8j6xRJCwNT4ENeKijW35IpjnkBnkIwO/qc=; b=XrUWOKafF2y9Hyz1+6R4Wx7ZgidOf+VCbdwxpKwPoRcx43ywddrs10dfcvms6jGOeqZt3i yDqF07Aij4hAVOVF/ieKDW3JTqUJxy/CdjAm2mT03tqLMZfyMEQAr9tdEeWOD6ECTwuKDa 5yb+yZmchG99pB4+FCtqwmngME7ou7Y= X-MC-Unique: tfNqBwtANpG-iGVua1NXeA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 07/13] qapi: Factor common recursion out of cgen_ifcond(), docgen_ifcond() Date: Fri, 3 Sep 2021 21:32:03 +0200 Message-Id: <20210903193209.1426791-8-armbru@redhat.com> In-Reply-To: <20210903193209.1426791-1-armbru@redhat.com> References: <20210903193209.1426791-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.392, 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_H2=-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: peter.maydell@linaro.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1630698052543100001 Signed-off-by: Markus Armbruster Message-Id: <20210831123809.1107782-7-armbru@redhat.com> Reviewed-by: Marc-Andr=C3=A9 Lureau --- scripts/qapi/common.py | 45 +++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py index f31e077d7b..df92cff852 100644 --- a/scripts/qapi/common.py +++ b/scripts/qapi/common.py @@ -17,6 +17,7 @@ Dict, Match, Optional, + Sequence, Union, ) =20 @@ -200,33 +201,37 @@ def guardend(name: str) -> str: name=3Dc_fname(name).upper()) =20 =20 -def cgen_ifcond(ifcond: Optional[Union[str, Dict[str, Any]]]) -> str: +def gen_ifcond(ifcond: Optional[Union[str, Dict[str, Any]]], + cond_fmt: str, not_fmt: str, + all_operator: str, any_operator: str) -> str: + + def do_gen(ifcond: Union[str, Dict[str, Any]]): + if isinstance(ifcond, str): + return cond_fmt % ifcond + assert isinstance(ifcond, dict) and len(ifcond) =3D=3D 1 + if 'not' in ifcond: + return not_fmt % do_gen(ifcond['not']) + if 'all' in ifcond: + gen =3D gen_infix(all_operator, ifcond['all']) + else: + gen =3D gen_infix(any_operator, ifcond['any']) + return gen + + def gen_infix(operator: str, operands: Sequence[Any]) -> str: + return '(' + operator.join([do_gen(o) for o in operands]) + ')' + if not ifcond: return '' - if isinstance(ifcond, str): - return 'defined(' + ifcond + ')' + return do_gen(ifcond) =20 - oper, operands =3D next(iter(ifcond.items())) - if oper =3D=3D 'not': - return '!' + cgen_ifcond(operands) - oper =3D {'all': ' && ', 'any': ' || '}[oper] - operands =3D [cgen_ifcond(o) for o in operands] - return '(' + oper.join(operands) + ')' + +def cgen_ifcond(ifcond: Optional[Union[str, Dict[str, Any]]]) -> str: + return gen_ifcond(ifcond, 'defined(%s)', '!%s', ' && ', ' || ') =20 =20 def docgen_ifcond(ifcond: Optional[Union[str, Dict[str, Any]]]) -> str: # TODO Doc generated for conditions needs polish - if not ifcond: - return '' - if isinstance(ifcond, str): - return ifcond - - oper, operands =3D next(iter(ifcond.items())) - if oper =3D=3D 'not': - return '!' + docgen_ifcond(operands) - oper =3D {'all': ' and ', 'any': ' or '}[oper] - operands =3D [docgen_ifcond(o) for o in operands] - return '(' + oper.join(operands) + ')' + return gen_ifcond(ifcond, '%s', '!%s', ' and ', ' or ') =20 =20 def gen_if(cond: str) -> str: --=20 2.31.1