This website requires JavaScript.
Explore
Help
Sign In
haraldwolff
/
qemu-patch-raspberry4
Watch
1
Star
0
Fork
You've already forked qemu-patch-raspberry4
0
Code
Issues
Pull requests
Packages
Projects
Releases
Wiki
Activity
8f972e5b4b
qemu-patch-raspberry4
/
tests
/
qapi-schema
/
bad-ident.json
3 lines
93 B
JSON
Raw
Normal View
History
Unescape
Escape
qapi: Require valid names Previous commits demonstrated that the generator overlooked various bad naming situations: - types, commands, and events need a valid name - enum members must be valid names, when combined with prefix - union and alternate branches cannot be marked optional Valid upstream names match [a-zA-Z][a-zA-Z0-9_-]*; valid downstream names match __[a-zA-Z][a-zA-Z0-9._-]*. Enumerations match the weaker [a-zA-Z0-9._-]+ (in part thanks to QKeyCode picking an enum that starts with a digit, which we can't change now due to backwards compatibility). Rather than call out three separate regex, this patch just uses a broader combination that allows both upstream and downstream names, as well as a small hack that realizes that any enum name is merely a suffix to an already valid name prefix (that is, any enum name is valid if prepending _ fits the normal rules). We could reject new enumeration names beginning with a digit by whitelisting existing exceptions. We could also be stricter about the distinction between upstream names (no leading underscore, no use of dot) and downstream (mandatory leading double underscore), but it is probably not worth the bother. Signed-off-by: Eric Blake <eblake@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
2015-05-04 17:05:22 +02:00
#
w
e
r
e
j
e
c
t
c
r
e
a
t
i
n
g
a
t
y
p
e
n
a
m
e
w
i
t
h
b
a
d
n
a
m
e
qapi: Use 'struct' instead of 'type' in schema Referring to "type" as both a meta-type (built-in, enum, union, alternate, or struct) and a specific type (the name that the schema uses for declaring structs) is confusing. Do the bulk of the conversion to "struct" in qapi schema, with a fairly mechanical: for f in `find -name '*.json'; do sed -i "s/'type'/'struct'/"; done followed by manually filtering out the places where we have a 'type' embedded in 'data'. Then tweak a couple of tests whose output changes slightly due to longer lines. I also verified that the generated files for QMP and QGA (such as qmp-commands.h) are the same before and after, as assurance that I didn't leave in any accidental member name changes. Signed-off-by: Eric Blake <eblake@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
2015-05-04 17:05:27 +02:00
{
'
s
t
r
u
c
t
'
:
'
*
o
o
p
s
'
,
'
d
a
t
a
'
:
{
'
i
'
:
'
i
n
t
'
}
}
Reference in a new issue
Copy permalink