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.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, HTML_MESSAGE,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 21F17C433ED for ; Mon, 17 May 2021 11:24:22 +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 9E94661029 for ; Mon, 17 May 2021 11:24:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9E94661029 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]:32926 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1libMC-00047N-PH for qemu-devel@archiver.kernel.org; Mon, 17 May 2021 07:24:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35570) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1libH8-0004s6-Ms for qemu-devel@nongnu.org; Mon, 17 May 2021 07:19:08 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:53365) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1libH1-0005Mo-2w for qemu-devel@nongnu.org; Mon, 17 May 2021 07:19:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621250338; 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: in-reply-to:in-reply-to:references:references; bh=FHCDIPBzL9RFLpQLPMYOfQjKdAS4JBaOJX8aHKySUZI=; b=hdAvhlzdgjq9rFSuKhmT6bQ2YecccEycRWGNBNxwtvijvqrW/P1otB7vLQwJXTbIWFsTr0 XosnxNfS+HpZreKdoGT9aZWymGkWiSB0soFMX3lUiGnyzwhOtEKsjH1pOR+T7OUiKcX2xF dfrnIEH3TCHzpG6HWPEOu0rp1D2MlWA= Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-59-XVQgGLIGOv2pc1TRz-dkmQ-1; Mon, 17 May 2021 07:18:56 -0400 X-MC-Unique: XVQgGLIGOv2pc1TRz-dkmQ-1 Received: by mail-pj1-f71.google.com with SMTP id r91-20020a17090a1864b029015da4ff1c12so97547pja.4 for ; Mon, 17 May 2021 04:18:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=FHCDIPBzL9RFLpQLPMYOfQjKdAS4JBaOJX8aHKySUZI=; b=flc931DFF9Q+g8pJeOPmGtYGVLcix6HMemujUEXARiCOSoX/+9QPnzaKPLYyrSFowp 7+323v2uXo61q2m5wiHUWC3820TxQ2Rt6Jk3G9ZoYdaEdOH9ABjSgVm84FPPkCOjHGk6 FN62f8oK4ep2pJIDVyij/7qpVJhDTAGuy76Fy4BZo7JnvKT0vXGaAyaNysTnxoG9LTvx HIZ7P2/BFDHda3uqnQ91DnQGSlDpEV7IsmtnHLM+ig8Fq3JKSMza6/vH2SCLKtH7cTpL dp3PLtTwq0L5WZfw3Z9HUqJTiRIWZXuVlQiJGg5j0b6f6tHk/wGcRWuufsKbQTqIgWLM 7rWQ== X-Gm-Message-State: AOAM530BQ30StnbnsM4uQBnCxFziw1t+1ngstYUtfz0Bivj+9WlfcNBs PPQiQNYuw0bgQAXBsZ0+uzKY4z4hNbdRTl6S8/dOOhO7GvkyWkY+LRuDDpz607swwoZgF//JaPP 1KU82zH4OWzSE76B97Lfap9nq5gcjfSg= X-Received: by 2002:a62:aa12:0:b029:28e:7580:8f3d with SMTP id e18-20020a62aa120000b029028e75808f3dmr59639526pff.42.1621250334805; Mon, 17 May 2021 04:18:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwTwP/Uv4UHgFX8FZSqxdTZRqsptMlX0CNJuRhwRKnp4jRMAFV2qbfwrAwMpbqDVraX3QXABGMSqjqRQXYcsr0= X-Received: by 2002:a62:aa12:0:b029:28e:7580:8f3d with SMTP id e18-20020a62aa120000b029028e75808f3dmr59639515pff.42.1621250334602; Mon, 17 May 2021 04:18:54 -0700 (PDT) MIME-Version: 1.0 References: <20210429134032.1125111-1-marcandre.lureau@redhat.com> <20210429134032.1125111-5-marcandre.lureau@redhat.com> In-Reply-To: From: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= Date: Mon, 17 May 2021 15:18:43 +0400 Message-ID: Subject: Re: [PATCH v3 4/9] qapi: introduce IfPredicateList and IfAny To: John Snow Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mlureau@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/alternative; boundary="000000000000494da705c284c29e" Received-SPF: pass client-ip=216.205.24.124; envelope-from=mlureau@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.374, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, HTML_MESSAGE=0.001, 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: qemu-devel , "Armbruster, Markus" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" --000000000000494da705c284c29e Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi On Thu, May 13, 2021 at 3:26 AM John Snow wrote: > On 4/29/21 9:40 AM, marcandre.lureau@redhat.com wrote: > > 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 > > --- > > scripts/qapi/common.py | 32 +++++++++++++++++++++++++++----- > > 1 file changed, 27 insertions(+), 5 deletions(-) > > > > diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py > > index 59a7ee2f32..102d347348 100644 > > --- a/scripts/qapi/common.py > > +++ b/scripts/qapi/common.py > > @@ -224,23 +224,45 @@ def __eq__(self, other: object) -> bool: > > return self.option =3D=3D other.option > > > > > > -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 > > > > 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=3D 1: > > + return gen > > + return "(%s)" % gen > > > > 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=3D 1: > > + return gen > > + return "(%s)" % gen > > > > def __bool__(self) -> bool: > > return bool(self.pred_list) > > > > def __repr__(self) -> str: > > - return f"IfAll({self.pred_list})" > > + ty =3D 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 =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" > > > > I do like the way these get combined. Is there a reason it's not > squashed into the earlier commit? > > No, just the sake of doing things iteratively. (Qualms about not having a visitor or a callback or whatever you want to > call it remain, but I'll stop remarking on that for the rest of this > series.) > > thanks :) Tested-by: John Snow > > --000000000000494da705c284c29e Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi

On Thu, May 13, 2021 at 3:26 AM Joh= n Snow <jsnow@redh= at.com> wrote:
On 4/29/21 9:40 AM, marcandre.lureau@redhat.com wrote:
> From: Marc-Andr=C3=A9 Lureau <marcandre.lureau@redhat.com>
>
> Refactor IfAll class, to introduce a base class IfPredicateList and ad= d
> IfAny for the 'any' conditions.
>
> Signed-off-by: Marc-Andr=C3=A9 Lureau <marcandre.lureau@redhat.com> > ---
>=C2=A0 =C2=A0scripts/qapi/common.py | 32 +++++++++++++++++++++++++++---= --
>=C2=A0 =C2=A01 file changed, 27 insertions(+), 5 deletions(-)
>
> diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py
> index 59a7ee2f32..102d347348 100644
> --- a/scripts/qapi/common.py
> +++ b/scripts/qapi/common.py
> @@ -224,23 +224,45 @@ def __eq__(self, other: object) -> bool:
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return self.option =3D=3D othe= r.option
>=C2=A0 =C2=A0
>=C2=A0 =C2=A0
> -class IfAll(IfPredicate):
> +class IfPredicateList(IfPredicate):
> +=C2=A0 =C2=A0 C_SEP =3D ""
> +=C2=A0 =C2=A0 DOC_SEP =3D ""
> +
>=C2=A0 =C2=A0 =C2=A0 =C2=A0def __init__(self, pred_list: Sequence[IfPre= dicate]):
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0self.pred_list =3D pred_list >=C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 =C2=A0def cgen(self) -> str:
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 return " && ".join([p.c= gen() for p in self.pred_list])
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 sep =3D " " + self.C_SEP + &quo= t; "
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 gen =3D sep.join([p.cgen() for p in self.= pred_list])
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 if len(self.pred_list) =3D=3D 1:
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return gen
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 return "(%s)" % gen
>=C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 =C2=A0def docgen(self) -> str:
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 return " and ".join([p.docgen()= for p in self.pred_list])
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 sep =3D " " + self.DOC_SEP + &q= uot; "
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 gen =3D sep.join([p.docgen() for p in sel= f.pred_list])
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 if len(self.pred_list) =3D=3D 1:
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return gen
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 return "(%s)" % gen
>=C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 =C2=A0def __bool__(self) -> bool:
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return bool(self.pred_list) >=C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 =C2=A0def __repr__(self) -> str:
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 return f"IfAll({self.pred_list})&quo= t;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 ty =3D type(self)
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 return f"{ty.__qualname__}({self.pre= d_list})"
>=C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 =C2=A0def __eq__(self, other: object) -> bool:<= br> > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 if not isinstance(other, IfAll):
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 if not isinstance(other, type(self)):
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return False
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return self.pred_list =3D=3D o= ther.pred_list
> +
> +
> +class IfAll(IfPredicateList):
> +=C2=A0 =C2=A0 C_SEP =3D "&&"
> +=C2=A0 =C2=A0 DOC_SEP =3D "and"
> +
> +
> +class IfAny(IfPredicateList):
> +=C2=A0 =C2=A0 C_SEP =3D "||"
> +=C2=A0 =C2=A0 DOC_SEP =3D "or"
>

I do like the way these get combined. Is there a reason it's not
squashed into the earlier commit?


No, just the sake of doing things iter= atively.

(Qualms about not having a visitor or a callback or whatever you want to call it remain, but I'll stop remarking on that for the rest of this series.)


thanks :)

Tested-by: John Snow <jsnow@redhat.com>

--000000000000494da705c284c29e--