diff options
| author | Eric Blake | 2015-10-26 23:34:43 +0100 |
|---|---|---|
| committer | Markus Armbruster | 2015-11-02 08:30:26 +0100 |
| commit | 255960dd374d4497d6ea537305f1b0d8a3433789 (patch) | |
| tree | 49b56b41812702438ef9f3441c61d8efd84a86c9 /tests | |
| parent | qapi: More robust conditions for when labels are needed (diff) | |
| download | qemu-255960dd374d4497d6ea537305f1b0d8a3433789.tar.gz qemu-255960dd374d4497d6ea537305f1b0d8a3433789.tar.xz qemu-255960dd374d4497d6ea537305f1b0d8a3433789.zip | |
qapi: Reserve '*List' type names for list types
Type names ending in 'List' can clash with qapi list types in
generated C. We don't currently use such names. It is easier to
outlaw them now than to worry about how to resolve such a clash
in the future. For precedence, see commit 4dc2e69, which did the
same for names ending in 'Kind' versus implicit enum types for
qapi unions.
Update the testsuite to match.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1445898903-12082-5-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/qapi-schema/reserved-type-list.err | 1 | ||||
| -rw-r--r-- | tests/qapi-schema/reserved-type-list.exit | 2 | ||||
| -rw-r--r-- | tests/qapi-schema/reserved-type-list.json | 6 | ||||
| -rw-r--r-- | tests/qapi-schema/reserved-type-list.out | 3 |
4 files changed, 5 insertions, 7 deletions
diff --git a/tests/qapi-schema/reserved-type-list.err b/tests/qapi-schema/reserved-type-list.err index e69de29bb2..4510fa6d90 100644 --- a/tests/qapi-schema/reserved-type-list.err +++ b/tests/qapi-schema/reserved-type-list.err @@ -0,0 +1 @@ +tests/qapi-schema/reserved-type-list.json:5: struct 'FooList' should not end in 'List' diff --git a/tests/qapi-schema/reserved-type-list.exit b/tests/qapi-schema/reserved-type-list.exit index 573541ac97..d00491fd7e 100644 --- a/tests/qapi-schema/reserved-type-list.exit +++ b/tests/qapi-schema/reserved-type-list.exit @@ -1 +1 @@ -0 +1 diff --git a/tests/qapi-schema/reserved-type-list.json b/tests/qapi-schema/reserved-type-list.json index 5b7d0f995f..98d53bf808 100644 --- a/tests/qapi-schema/reserved-type-list.json +++ b/tests/qapi-schema/reserved-type-list.json @@ -1,5 +1,5 @@ # Potential C name collision -# FIXME - This parses and compiles on its own, but prevents the user from -# creating a type named 'Foo' and using ['Foo'] for an array. We should -# reject the use of any type names ending in 'List'. +# We reserve names ending in 'List' for use by array types. +# TODO - we could choose array names to avoid collision with user types, +# in order to let this compile { 'struct': 'FooList', 'data': { 's': 'str' } } diff --git a/tests/qapi-schema/reserved-type-list.out b/tests/qapi-schema/reserved-type-list.out index 0406bfe319..e69de29bb2 100644 --- a/tests/qapi-schema/reserved-type-list.out +++ b/tests/qapi-schema/reserved-type-list.out @@ -1,3 +0,0 @@ -object :empty -object FooList - member s: str optional=False |