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.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,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 9E8A7C433DB for ; Wed, 24 Mar 2021 05:57:32 +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 2C3AC6198C for ; Wed, 24 Mar 2021 05:57:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2C3AC6198C 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]:47638 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOwWJ-0000vt-72 for qemu-devel@archiver.kernel.org; Wed, 24 Mar 2021 01:57:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60662) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOwUB-0008Il-J7 for qemu-devel@nongnu.org; Wed, 24 Mar 2021 01:55:19 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:22415) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOwU9-0006SO-6H for qemu-devel@nongnu.org; Wed, 24 Mar 2021 01:55:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616565316; 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=2pV+1/GbxQ44p/xW1H6Dv3SkFHEC9bmwrYhBP2f/vOg=; b=Wxdc3OXZXK4hRqRvRAcfll0QIyAYTm6Sh9N8bDVtHkOXxD0quAoHeD7acaIwvamsXLCm2s jtk1Ap29fryFvudX1110v0caxIdqf5UDGPt2K/6mKqzVhkS0ntszDORkD0x57CSs394Z9F zSVaqb/TYYAFb3jUwF3tuYF5xBBzVmA= 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-32-d_uxQ41qN8KEthZy1P_S3w-1; Wed, 24 Mar 2021 01:55:10 -0400 X-MC-Unique: d_uxQ41qN8KEthZy1P_S3w-1 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 AEDB51005D4F; Wed, 24 Mar 2021 05:55:09 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-114-17.ams2.redhat.com [10.36.114.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3EBCB6A8ED; Wed, 24 Mar 2021 05:55:06 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id AC08D11327E1; Wed, 24 Mar 2021 06:55:04 +0100 (CET) From: Markus Armbruster To: John Snow Subject: Re: [PATCH 09/28] qapi: Lift enum-specific code out of check_name_str() References: <20210323094025.3569441-1-armbru@redhat.com> <20210323094025.3569441-10-armbru@redhat.com> <53a39239-97e4-c8f1-f481-4eba98dbdf38@redhat.com> Date: Wed, 24 Mar 2021 06:55:04 +0100 In-Reply-To: <53a39239-97e4-c8f1-f481-4eba98dbdf38@redhat.com> (John Snow's message of "Tue, 23 Mar 2021 18:11:26 -0400") Message-ID: <87zgytf64n.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.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 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: -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.001, 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_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: michael.roth@amd.com, qemu-devel@nongnu.org, marcandre.lureau@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" John Snow writes: > On 3/23/21 5:40 AM, Markus Armbruster wrote: >> check_name_str() masks leading digits when passed enum_member=True. >> Only check_enum() does. Lift the masking into check_enum(). >> Signed-off-by: Markus Armbruster >> --- >> scripts/qapi/expr.py | 23 ++++++++++------------- >> 1 file changed, 10 insertions(+), 13 deletions(-) >> diff --git a/scripts/qapi/expr.py b/scripts/qapi/expr.py >> index 507550c340..e00467636c 100644 >> --- a/scripts/qapi/expr.py >> +++ b/scripts/qapi/expr.py >> @@ -34,18 +34,11 @@ def check_name_is_str(name, info, source): >> >> def check_name_str(name, info, source, >> - enum_member=False, >> permit_upper=False): >> - membername = name >> - >> - # Enum members can start with a digit, because the generated C >> - # code always prefixes it with the enum name >> - if enum_member and membername[0].isdigit(): >> - membername = 'D' + membername >> # Reserve the entire 'q_' namespace for c_name(), and for 'q_empty' >> # and 'q_obj_*' implicit type names. >> - if not valid_name.match(membername) or \ >> - c_name(membername, False).startswith('q_'): >> + if not valid_name.match(name) or \ >> + c_name(name, False).startswith('q_'): >> raise QAPISemError(info, "%s has an invalid name" % source) >> if not permit_upper and name.lower() != name: >> raise QAPISemError( >> @@ -213,11 +206,15 @@ def check_enum(expr, info): >> for m in members] >> for member in members: >> source = "'data' member" >> + member_name = member['name'] >> check_keys(member, info, source, ['name'], ['if']) >> - check_name_is_str(member['name'], info, source) >> - source = "%s '%s'" % (source, member['name']) >> - check_name_str(member['name'], info, source, >> - enum_member=True, permit_upper=permit_upper) >> + check_name_is_str(member_name, info, source) >> + source = "%s '%s'" % (source, member_name) >> + # Enum members may start with a digit >> + if member_name[0].isdigit(): >> + member_name = 'd' + member_name # Hack: hide the digit > > Actually, can you put in one more space here? ^ Too late, pull request is out, I should've waited for your review. We'll need to tidy up on top. I'm prone to this style mistake, because Emacs M-; makes it. >> + check_name_str(member_name, info, source, >> + permit_upper=permit_upper) >> check_if(member, info, source) >> >>