From: Markus Armbruster <armbru@redhat.com>
To: Eric Blake <eblake@redhat.com>
Cc: michael.roth@amd.com, jsnow@redhat.com, qemu-devel@nongnu.org,
marcandre.lureau@redhat.com
Subject: Re: [PATCH 14/28] qapi: Enforce type naming rules
Date: Tue, 23 Mar 2021 17:27:43 +0100 [thread overview]
Message-ID: <87pmzpomww.fsf@dusky.pond.sub.org> (raw)
In-Reply-To: <d2b8e84e-74d8-553c-681e-b0c8a3ae3934@redhat.com> (Eric Blake's message of "Tue, 23 Mar 2021 09:50:22 -0500")
Eric Blake <eblake@redhat.com> writes:
> On 3/23/21 4:40 AM, Markus Armbruster wrote:
>> Type names should be CamelCase. Enforce this. The only offenders are
>> in tests/. Fix them. Add test type-case to cover the new error.
>>
>> Signed-off-by: Markus Armbruster <armbru@redhat.com>
>> ---
>
>> +++ b/scripts/qapi/expr.py
>> @@ -61,7 +61,8 @@ def check_name_lower(name, info, source,
>>
>> def check_name_camel(name, info, source):
>> stem = check_name_str(name, info, source)
>> - # TODO reject '[_-]' in stem, require CamelCase
>> + if not re.match(r'[A-Z]+[A-Za-z0-9]*[a-z][A-Za-z0-9]*$', stem):
>
> Requires one or more leading capital, and at least one lowercase. This
> permits oddballs like PCIELinkSpeed in common.json that are eventually
> camel case but with a rather long all-caps start.
>
> As written, the + isn't necessary, you'd match the same set of strings
> with it omitted. But leaving it doesn't hurt.
I'll drop it.
>> +++ b/tests/qapi-schema/doc-bad-union-member.json
>> @@ -11,9 +11,9 @@
>> 'data': { 'nothing': 'Empty' } }
>>
>> { 'struct': 'Base',
>> - 'data': { 'type': 'T' } }
>> + 'data': { 'type': 'FrobType' } }
>
> No single-character type names is fallout from the tighter rules, but is
> fine with me.
I was unsure whether to complicate the regexp slightly so
single-character type names keep working. Then I decided against it.
>> +++ b/tests/qapi-schema/type-case.json
>> @@ -0,0 +1,2 @@
>> +# Type names should use CamelCase
>> +{ 'struct': 'not-a-camel' }
>
> You should probably include a 'data':{...} here, to ensure that we
> aren't rejecting this for missing data (yes, the .err file does test our
> actual error message, but no reason to not be otherwise compliant to
> what we normally expect).
Yes, that's prudent.
> Such a tweak is minor enough that I'm fine with
>
> Reviewed-by: Eric Blake <eblake@redhat.com>
Thanks!
next prev parent reply other threads:[~2021-03-23 17:22 UTC|newest]
Thread overview: 93+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-23 9:39 [PATCH 00/28] qapi: Enforce naming rules Markus Armbruster
2021-03-23 9:39 ` [PATCH 01/28] qapi/pragma: Tidy up after removal of deprecated commands Markus Armbruster
2021-03-23 12:50 ` John Snow
2021-03-23 9:39 ` [PATCH 02/28] tests/qapi-schema: Drop redundant flat-union-inline test Markus Armbruster
2021-03-23 12:54 ` John Snow
2021-03-23 9:40 ` [PATCH 03/28] tests/qapi-schema: Rework comments on longhand member definitions Markus Armbruster
2021-03-23 13:00 ` John Snow
2021-03-23 13:58 ` Eric Blake
2021-03-23 14:25 ` John Snow
2021-03-23 13:59 ` Eric Blake
2021-03-23 14:27 ` John Snow
2021-03-23 9:40 ` [PATCH 04/28] tests/qapi-schema: Belatedly update comment on alternate clash Markus Armbruster
2021-03-23 13:12 ` John Snow
2021-03-23 9:40 ` [PATCH 05/28] tests/qapi-schema: Drop TODO comment on simple unions Markus Armbruster
2021-03-23 13:16 ` John Snow
2021-03-23 9:40 ` [PATCH 06/28] tests/qapi-schema: Tweak to demonstrate buggy member name check Markus Armbruster
2021-03-23 13:20 ` John Snow
2021-03-23 15:44 ` Markus Armbruster
2021-03-23 17:09 ` John Snow
2021-03-23 20:42 ` Markus Armbruster
2021-03-23 9:40 ` [PATCH 07/28] qapi: Fix to reject optional members with reserved names Markus Armbruster
2021-03-23 13:27 ` John Snow
2021-03-23 15:50 ` Markus Armbruster
2021-03-23 9:40 ` [PATCH 08/28] qapi: Support flat unions tag values with leading digit Markus Armbruster
2021-03-23 14:11 ` Eric Blake
2021-03-23 14:49 ` John Snow
2021-03-23 16:18 ` Markus Armbruster
2021-03-23 21:07 ` Markus Armbruster
2021-03-23 9:40 ` [PATCH 09/28] qapi: Lift enum-specific code out of check_name_str() Markus Armbruster
2021-03-23 14:13 ` Eric Blake
2021-03-23 21:44 ` John Snow
2021-03-23 22:11 ` John Snow
2021-03-24 5:55 ` Markus Armbruster
2021-03-23 9:40 ` [PATCH 10/28] qapi: Rework name checking in preparation of stricter checking Markus Armbruster
2021-03-23 14:20 ` Eric Blake
2021-03-23 14:30 ` John Snow
2021-03-23 14:40 ` Eric Blake
2021-03-23 16:25 ` Markus Armbruster
2021-03-23 21:14 ` Markus Armbruster
2021-03-23 22:15 ` John Snow
2021-03-24 5:57 ` Markus Armbruster
2021-03-24 20:11 ` John Snow
2021-03-25 6:18 ` Markus Armbruster
2021-03-25 17:48 ` John Snow
2021-03-26 5:25 ` Markus Armbruster
2021-03-23 9:40 ` [PATCH 11/28] qapi: Move uppercase rejection to check_name_lower() Markus Armbruster
2021-03-23 14:29 ` Eric Blake
2021-03-23 22:21 ` John Snow
2021-03-23 9:40 ` [PATCH 12/28] qapi: Consistently permit any case in downstream prefixes Markus Armbruster
2021-03-23 14:30 ` Eric Blake
2021-03-23 22:26 ` John Snow
2021-03-23 9:40 ` [PATCH 13/28] qapi: Enforce event naming rules Markus Armbruster
2021-03-23 14:32 ` Eric Blake
2021-03-23 22:31 ` John Snow
2021-03-24 6:22 ` Markus Armbruster
2021-03-24 20:07 ` John Snow
2021-03-25 6:22 ` Markus Armbruster
2021-03-25 17:50 ` John Snow
2021-03-23 9:40 ` [PATCH 14/28] qapi: Enforce type " Markus Armbruster
2021-03-23 14:50 ` Eric Blake
2021-03-23 16:27 ` Markus Armbruster [this message]
2021-03-23 9:40 ` [PATCH 15/28] tests/qapi-schema: Rename redefined-builtin to redefined-predefined Markus Armbruster
2021-03-23 14:55 ` Eric Blake
2021-03-23 9:40 ` [PATCH 16/28] qapi: Factor out QAPISchemaParser._check_pragma_list_of_str() Markus Armbruster
2021-03-23 15:01 ` Eric Blake
2021-03-23 9:40 ` [PATCH 17/28] tests/qapi-schema: Rename pragma-*-crap to pragma-value-not-* Markus Armbruster
2021-03-23 15:02 ` Eric Blake
2021-03-23 9:40 ` [PATCH 18/28] tests/qapi-schema: Rename returns-whitelist to returns-bad-type Markus Armbruster
2021-03-23 15:06 ` Eric Blake
2021-03-23 9:40 ` [PATCH 19/28] qapi: Rename pragma *-whitelist to *-exceptions Markus Armbruster
2021-03-23 15:09 ` Eric Blake
2021-03-23 16:35 ` Markus Armbruster
2021-03-23 9:40 ` [PATCH 20/28] qapi/pragma: Streamline comments on member-name-exceptions Markus Armbruster
2021-03-23 15:10 ` Eric Blake
2021-03-23 9:40 ` [PATCH 21/28] tests-qmp-cmds: Drop unused and incorrect qmp_TestIfCmd() Markus Armbruster
2021-03-23 15:11 ` Eric Blake
2021-03-23 9:40 ` [PATCH 22/28] qapi: Prepare for rejecting underscore in command and member names Markus Armbruster
2021-03-23 15:15 ` Eric Blake
2021-03-23 9:40 ` [PATCH 23/28] qapi: Enforce feature naming rules Markus Armbruster
2021-03-23 15:16 ` Eric Blake
2021-03-23 9:40 ` [PATCH 24/28] qapi: Enforce command " Markus Armbruster
2021-03-23 15:23 ` Eric Blake
2021-03-23 21:19 ` Markus Armbruster
2021-03-23 9:40 ` [PATCH 25/28] tests/qapi-schema: Switch member name clash test to struct Markus Armbruster
2021-03-23 15:42 ` Eric Blake
2021-03-23 9:40 ` [PATCH 26/28] qapi: Enforce struct member naming rules Markus Armbruster
2021-03-23 15:46 ` Eric Blake
2021-03-23 21:23 ` Markus Armbruster
2021-03-23 9:40 ` [PATCH 27/28] qapi: Enforce enum " Markus Armbruster
2021-03-23 15:47 ` Eric Blake
2021-03-23 9:40 ` [PATCH 28/28] qapi: Enforce union and alternate branch " Markus Armbruster
2021-03-23 16:05 ` Eric Blake
2021-03-23 21:24 ` Markus Armbruster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87pmzpomww.fsf@dusky.pond.sub.org \
--to=armbru@redhat.com \
--cc=eblake@redhat.com \
--cc=jsnow@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=michael.roth@amd.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).