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 EC1F5C433DB for ; Wed, 24 Mar 2021 05:58: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 78C04619E1 for ; Wed, 24 Mar 2021 05:58:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 78C04619E1 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]:49842 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOwXB-0001yI-Hi for qemu-devel@archiver.kernel.org; Wed, 24 Mar 2021 01:58:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32856) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOwWJ-00014w-2i for qemu-devel@nongnu.org; Wed, 24 Mar 2021 01:57:31 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:33860) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOwWH-0007hn-F7 for qemu-devel@nongnu.org; Wed, 24 Mar 2021 01:57:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616565448; 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=TtBUWaEPatogW32/HO91QLjke3HGuhLdrWukd5eUSVw=; b=PARgdU5YW6o83FNRfvKg91qPp/wYDqZLBOHtAsa9w7BKMFEgd2qJyUDvZ/Qqn4oYDeRgCF cLcD48kU1sJPCsVOIAJW1/zQrAwaquBnaf0dLq46L0JtC+fgt7kycEPDNY399jw51z0sjX rM6Ue5WVyCvNJXPoYGE7wYE9salUcso= 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-433-l9Br_vvXMkSKGPC0wCjBaw-1; Wed, 24 Mar 2021 01:57:26 -0400 X-MC-Unique: l9Br_vvXMkSKGPC0wCjBaw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 092F61005D4F; Wed, 24 Mar 2021 05:57:25 +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 CB8F460C05; Wed, 24 Mar 2021 05:57:21 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 6082311327E1; Wed, 24 Mar 2021 06:57:20 +0100 (CET) From: Markus Armbruster To: John Snow Subject: Re: [PATCH 10/28] qapi: Rework name checking in preparation of stricter checking References: <20210323094025.3569441-1-armbru@redhat.com> <20210323094025.3569441-11-armbru@redhat.com> Date: Wed, 24 Mar 2021 06:57:20 +0100 In-Reply-To: (John Snow's message of "Tue, 23 Mar 2021 18:15:42 -0400") Message-ID: <87v99hf60v.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.12 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-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: >> Naming rules differ for the various kinds of names. To prepare >> enforcing them, define functions to check them: check_name_upper(), >> check_name_lower(), and check_name_camel(). For now, these merely >> wrap around check_name_str(), but that will change shortly. Replace >> the other uses of check_name_str() by appropriate uses of the >> wrappers. No change in behavior just yet. >> Signed-off-by: Markus Armbruster >> --- >> scripts/qapi/expr.py | 51 +++++++++++++++++++++++++++++++------------- >> 1 file changed, 36 insertions(+), 15 deletions(-) >> diff --git a/scripts/qapi/expr.py b/scripts/qapi/expr.py >> index e00467636c..30285fe334 100644 >> --- a/scripts/qapi/expr.py >> +++ b/scripts/qapi/expr.py >> @@ -21,11 +21,12 @@ >> from .error import QAPISemError >> >> -# Names must be letters, numbers, -, and _. They must start with letter, >> -# except for downstream extensions which must start with __RFQDN_. >> -# Dots are only valid in the downstream extension prefix. >> -valid_name = re.compile(r'^(__[a-zA-Z0-9.-]+_)?' >> - '[a-zA-Z][a-zA-Z0-9_-]*$') >> +# Names consist of letters, digits, -, and _, starting with a letter. >> +# An experimental name is prefixed with x-. A name of a downstream >> +# extension is prefixed with __RFQDN_. The latter prefix goes first. >> +valid_name = re.compile(r'(__[a-z0-9.-]+_)?' >> + r'(x-)?' >> + r'([a-z][a-z0-9_-]*)$', re.IGNORECASE) >> >> def check_name_is_str(name, info, source): >> @@ -37,16 +38,38 @@ def check_name_str(name, info, source, >> permit_upper=False): >> # Reserve the entire 'q_' namespace for c_name(), and for 'q_empty' >> # and 'q_obj_*' implicit type names. >> - if not valid_name.match(name) or \ >> - c_name(name, False).startswith('q_'): >> + match = valid_name.match(name) >> + if not match 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( >> info, "%s uses uppercase in name" % source) >> + return match.group(3) >> + >> + >> +def check_name_upper(name, info, source): >> + stem = check_name_str(name, info, source, permit_upper=True) >> + # TODO reject '[a-z-]' in @stem >> + > > Creates (presumably) temporary errors in flake8 for the dead > assignment here and below. All gone by the end of the series. "make check" and checkpatch were content. Anything else you'd like me to run?