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=-11.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 09578C47435 for ; Wed, 7 Oct 2020 16:45:04 +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 7F00D21582 for ; Wed, 7 Oct 2020 16:45:03 +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="R9Bg4SUP" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7F00D21582 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]:45586 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kQCYo-0003bn-5b for qemu-devel@archiver.kernel.org; Wed, 07 Oct 2020 12:45:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45614) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQCUY-0005zB-Fm for qemu-devel@nongnu.org; Wed, 07 Oct 2020 12:40:38 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:40350) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kQCUV-0000HC-O4 for qemu-devel@nongnu.org; Wed, 07 Oct 2020 12:40:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602088834; 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=M4rammhDVci7tljBWsSpaZJZ8jEXATguLqcHs7Dw7/U=; b=R9Bg4SUPyEJ6Sa1F1sg3FgtUIugZBEUfHMHbxlr5je7UE1m6cXFfcBAA0/yAihbz9gFdg8 HUSfOO8xCUwU9wIRRrX4lP9ytfpHJWFm987DbZiSRoc7v3jBRFb4rjpzdq9UpHFmMuHY6O NOpD8r16u1VosrS+Xn4mNKJYul5Yy4E= 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-593-3-xxFEHmMS2EG1fY8rbfYQ-1; Wed, 07 Oct 2020 12:40:31 -0400 X-MC-Unique: 3-xxFEHmMS2EG1fY8rbfYQ-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 F25EF1888A32 for ; Wed, 7 Oct 2020 16:40:30 +0000 (UTC) Received: from [10.10.120.38] (ovpn-120-38.rdu2.redhat.com [10.10.120.38]) by smtp.corp.redhat.com (Postfix) with ESMTP id 73B3F76653; Wed, 7 Oct 2020 16:40:30 +0000 (UTC) Subject: Re: [PATCH v5 34/36] qapi/visit.py: assert tag_member contains a QAPISchemaEnumType To: Markus Armbruster References: <20201005195158.2348217-1-jsnow@redhat.com> <20201005195158.2348217-35-jsnow@redhat.com> <87mu0yb40j.fsf@dusky.pond.sub.org> From: John Snow Message-ID: Date: Wed, 7 Oct 2020 12:40:29 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 MIME-Version: 1.0 In-Reply-To: <87mu0yb40j.fsf@dusky.pond.sub.org> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jsnow@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=jsnow@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, NICE_REPLY_A=-0.001, 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" On 10/7/20 8:43 AM, Markus Armbruster wrote: > 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? > No, but it only sticks to the binding and not the data. i.e. assertions to downcast work on the *name*. (This comes up somewhere in the schema.py patches where I make a change that looks completely pointless, but it makes mypy happy.) I could have left it alone. I just saw a lot of repeated multi-dots and habitually created a temporary local for the purpose. >> + >> 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