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=-15.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,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 56586C433C1 for ; Tue, 23 Mar 2021 21:48:11 +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 AB323619CE for ; Tue, 23 Mar 2021 21:48:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AB323619CE 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]:40334 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOosj-00059x-F3 for qemu-devel@archiver.kernel.org; Tue, 23 Mar 2021 17:48:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44464) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOop8-0002gO-Kc for qemu-devel@nongnu.org; Tue, 23 Mar 2021 17:44:26 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:52262) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOop4-0005Gt-Dx for qemu-devel@nongnu.org; Tue, 23 Mar 2021 17:44:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616535860; 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=G7xiLmHAwYiSX4aPR5rG4BcMGU1A/nXGSJjbmVcCM48=; b=MCbjK21QVZn6iHgURz0IcjGj/Zdt7a0oo43WOXZsN6Q6YGmJVlopn2fv1esoKfo2rlFhO7 +y/ZqfFTxlfS9Ij/ic8L4RDceilkIfJf/4kkE+iDuzpmfZuWY6l5HMZ2uiaGNUnjfYaeG2 QYh0WGS4lXQLm1z2kVz03vPOOC5DgNI= 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-119-nhl6jYV2NOyHfmcss7NScw-1; Tue, 23 Mar 2021 17:44:18 -0400 X-MC-Unique: nhl6jYV2NOyHfmcss7NScw-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CB17F101371B; Tue, 23 Mar 2021 21:44:16 +0000 (UTC) Received: from [10.10.117.181] (ovpn-117-181.rdu2.redhat.com [10.10.117.181]) by smtp.corp.redhat.com (Postfix) with ESMTP id F0CD71A879; Tue, 23 Mar 2021 21:44:12 +0000 (UTC) Subject: Re: [PATCH 09/28] qapi: Lift enum-specific code out of check_name_str() To: Markus Armbruster , qemu-devel@nongnu.org References: <20210323094025.3569441-1-armbru@redhat.com> <20210323094025.3569441-10-armbru@redhat.com> From: John Snow Message-ID: <4508fd43-6b82-e87b-4f8c-23c727f9557b@redhat.com> Date: Tue, 23 Mar 2021 17:44:12 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.0 MIME-Version: 1.0 In-Reply-To: <20210323094025.3569441-10-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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-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, NICE_REPLY_A=-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: michael.roth@amd.com, marcandre.lureau@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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 Sure. Reviewed-by: John Snow > --- > 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 > + check_name_str(member_name, info, source, > + permit_upper=permit_upper) > check_if(member, info, source) > > >