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=-9.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 EB7F4C4363D for ; Wed, 7 Oct 2020 12:44:26 +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 65D2D20789 for ; Wed, 7 Oct 2020 12:44:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="AHhTrnjY" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 65D2D20789 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]:35124 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kQ8nx-0002MA-BG for qemu-devel@archiver.kernel.org; Wed, 07 Oct 2020 08:44:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46148) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQ8n7-0001t6-6k for qemu-devel@nongnu.org; Wed, 07 Oct 2020 08:43:33 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:56918) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kQ8n5-0007pD-Gl for qemu-devel@nongnu.org; Wed, 07 Oct 2020 08:43:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602074610; 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=wAM+M3n45h7dLzkks/xystLSo8KoNtfxmxDdA78O+Vc=; b=AHhTrnjYLpYyN2eYjsNoVmqxckqwwKO1m+5Pg+z0O2+IyDaj9bcj6f7HyESzuCQZV2hZqm fMK4dXT/pDAR1jxLr3hicgxXVtMa40waGiCfF/yVJ/zO5LXBvB80eKENnZmzZh1g3tiXxk VUNYzzl23PnZ6rTuEXR3Re1sJAaEpn0= 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-191-WBq3Vt8wPK2yi7wIukEc9g-1; Wed, 07 Oct 2020 08:43:27 -0400 X-MC-Unique: WBq3Vt8wPK2yi7wIukEc9g-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 8844918C5204 for ; Wed, 7 Oct 2020 12:43:26 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-182.ams2.redhat.com [10.36.112.182]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 58A6C702E7; Wed, 7 Oct 2020 12:43:26 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id DB97C11329C1; Wed, 7 Oct 2020 14:43:24 +0200 (CEST) From: Markus Armbruster To: John Snow Subject: Re: [PATCH v5 34/36] qapi/visit.py: assert tag_member contains a QAPISchemaEnumType References: <20201005195158.2348217-1-jsnow@redhat.com> <20201005195158.2348217-35-jsnow@redhat.com> Date: Wed, 07 Oct 2020 14:43:24 +0200 In-Reply-To: <20201005195158.2348217-35-jsnow@redhat.com> (John Snow's message of "Mon, 5 Oct 2020 15:51:56 -0400") Message-ID: <87mu0yb40j.fsf@dusky.pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) 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=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Received-SPF: pass client-ip=216.205.24.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/07 00:54:30 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.742, 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_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@nongnu.org, Eduardo Habkost , Cleber Rosa Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" John Snow writes: > This is true by design, but not presently able to be expressed in the > type system. An assertion helps mypy understand our constraints. > > Signed-off-by: John Snow > Reviewed-by: Eduardo Habkost > Reviewed-by: Cleber Rosa > --- > scripts/qapi/visit.py | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > > diff --git a/scripts/qapi/visit.py b/scripts/qapi/visit.py > index 14f30c228b7..4f11fd325b8 100644 > --- a/scripts/qapi/visit.py > +++ b/scripts/qapi/visit.py > @@ -22,7 +22,7 @@ > mcgen, > ) > from .gen import QAPISchemaModularCVisitor, ifcontext > -from .schema import QAPISchemaObjectType > +from .schema import QAPISchemaEnumType, QAPISchemaObjectType > > > def gen_visit_decl(name, scalar=False): > @@ -84,15 +84,17 @@ def gen_visit_object_members(name, base, members, variants): > ret += gen_endif(memb.ifcond) > > if variants: > + tag_member = variants.tag_member > + assert isinstance(tag_member.type, QAPISchemaEnumType) I'm curious: do you need the local variable to make the assertion stick? > + > ret += mcgen(''' > switch (obj->%(c_name)s) { > ''', > - c_name=c_name(variants.tag_member.name)) > + c_name=c_name(tag_member.name)) > > for var in variants.variants: > - case_str = c_enum_const(variants.tag_member.type.name, > - var.name, > - variants.tag_member.type.prefix) > + case_str = c_enum_const(tag_member.type.name, var.name, > + tag_member.type.prefix) > ret += gen_if(var.ifcond) > if var.type.name == 'q_empty': > # valid variant and nothing to do