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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 562AAC636CC for ; Wed, 8 Feb 2023 16:10:13 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPn0P-0002Lv-Bw; Wed, 08 Feb 2023 11:09:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPn0N-0002Lc-JY for qemu-devel@nongnu.org; Wed, 08 Feb 2023 11:09:07 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPn0L-0004Kn-DE for qemu-devel@nongnu.org; Wed, 08 Feb 2023 11:09:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675872543; 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=3orZijnDG8LxuRtLQzYFr09m66xEARUGo2jtFi21090=; b=gu0CAcEZrbKOXFUT2tbY7Q3D60XEQSFUQiQcmx+1u/KycPqEco1V+gLvJePzQtTFDxlStS 2w5Hdb6CL+6/dMsMaFfxamOyhmaV6p77QFIF6dSgv+eAiUoLsJBJPHIZ26q/Y/ZDJJzNEp eZ4Xb2n1Zd5skU6MomI0cPa0RQiVeII= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-637-3jhuqaZTPUui4Kq-LLfV4g-1; Wed, 08 Feb 2023 11:08:53 -0500 X-MC-Unique: 3jhuqaZTPUui4Kq-LLfV4g-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BC7561C04B67; Wed, 8 Feb 2023 16:08:51 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.193.101]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 90FD940398A0; Wed, 8 Feb 2023 16:08:51 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 77A3421E6A1F; Wed, 8 Feb 2023 17:08:50 +0100 (CET) From: Markus Armbruster To: John Snow Cc: qemu-devel@nongnu.org, Michael Roth Subject: Re: [PATCH v2 1/7] qapi/expr: Split check_expr out from check_exprs References: <20230208021306.870657-1-jsnow@redhat.com> <20230208021306.870657-2-jsnow@redhat.com> Date: Wed, 08 Feb 2023 17:08:50 +0100 In-Reply-To: <20230208021306.870657-2-jsnow@redhat.com> (John Snow's message of "Tue, 7 Feb 2023 21:13:00 -0500") Message-ID: <87v8kcuokt.fsf@pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org John Snow writes: > Primarily, this reduces a nesting level of a particularly long > block. It's mostly code movement, but a new docstring is created. > > It also has the effect of creating a fairly convenient "catch point" in > check_exprs for exception handling without making the nesting level even > worse. > > Signed-off-by: John Snow > > --- > > This patch was originally written as part of my effort to factor out > QAPISourceInfo from this file by having expr.py raise a simple > exception, then catch and wrap it at the higher level. > > This series doesn't do that anymore, but reducing the nesting level > still seemed subjectively nice. It's not crucial. Drawback: git-blame can't see through the move, and blames *you* for that. > Signed-off-by: John Snow > --- > scripts/qapi/expr.py | 179 +++++++++++++++++++++++-------------------- > 1 file changed, 95 insertions(+), 84 deletions(-) > > diff --git a/scripts/qapi/expr.py b/scripts/qapi/expr.py > index 5a1782b57ea..d01543006d8 100644 > --- a/scripts/qapi/expr.py > +++ b/scripts/qapi/expr.py > @@ -595,6 +595,99 @@ def check_event(expr: _JSONObject, info: QAPISourceInfo) -> None: > check_type(args, info, "'data'", allow_dict=not boxed) > > > +def check_expr(expr_elem: _JSONObject) -> None: > + """ > + Validate and normalize a parsed QAPI schema expression. > + > + :param expr_elem: The parsed expression to normalize and validate. > + > + :raise QAPISemError: When this expression fails validation. > + :return: None, ``expr`` is normalized in-place as needed. ``expr`` is not defined here. Suggest ", the expression is normalized". > + """ > + # Expression > + assert isinstance(expr_elem['expr'], dict) > + for key in expr_elem['expr'].keys(): > + assert isinstance(key, str) > + expr: _JSONObject = expr_elem['expr'] [...]