]> git.proxmox.com Git - mirror_qemu.git/commit - scripts/qapi.py
qapi: Prefer 'struct' over 'type' in generator
authorEric Blake <eblake@redhat.com>
Mon, 4 May 2015 15:05:25 +0000 (09:05 -0600)
committerMarkus Armbruster <armbru@redhat.com>
Tue, 5 May 2015 16:39:01 +0000 (18:39 +0200)
commitfd41dd4eae5f7ea92f10c04cb3f217727fcee91f
tree04cf70812be04f55d4a4aa5cd770a7ab5b1ec6eb
parent2cbf09925ad45401673a79ab77f67de2f04a826c
qapi: Prefer 'struct' over 'type' in generator

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.  The confusion
is only made worse by the fact that the generator mostly already
refers to struct even when dealing with expr['type'].  This
commit changes the generator to consistently refer to it as
struct everywhere, plus a single back-compat tweak that allows
accepting the existing .json files as-is, so that the meat of
this change is separate from the mindless churn of that change.

Fix the testsuite fallout for error messages that change, and
in some cases, become more legible.  Improve comments to better
match our intentions where a struct (rather than any complex
type) is required.  Note that in some cases, an error message
now refers to 'struct' while the schema still refers to 'type';
that will be cleaned up in the later commit to the schema.

Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
22 files changed:
scripts/qapi-types.py
scripts/qapi-visit.py
scripts/qapi.py
tests/qapi-schema/alternate-good.out
tests/qapi-schema/bad-base.err
tests/qapi-schema/bad-ident.err
tests/qapi-schema/bad-type-bool.err
tests/qapi-schema/data-member-array.out
tests/qapi-schema/double-type.err
tests/qapi-schema/flat-union-bad-base.json
tests/qapi-schema/flat-union-base-star.err
tests/qapi-schema/flat-union-base-star.json
tests/qapi-schema/flat-union-base-union.err
tests/qapi-schema/flat-union-base-union.json
tests/qapi-schema/flat-union-branch-clash.out
tests/qapi-schema/flat-union-inline.json
tests/qapi-schema/flat-union-int-branch.json
tests/qapi-schema/flat-union-invalid-discriminator.err
tests/qapi-schema/flat-union-reverse-define.out
tests/qapi-schema/qapi-schema-test.out
tests/qapi-schema/union-invalid-base.err
tests/qapi-schema/unknown-expr-key.err