diff options
author | Eric Blake <eblake@redhat.com> | 2015-05-04 09:05:08 -0600 |
---|---|---|
committer | Markus Armbruster <armbru@redhat.com> | 2015-05-05 18:39:00 +0200 |
commit | 44bd1276a7dea747c41f250cb71ab65965343a7f (patch) | |
tree | 894d69d943b040b621e1eff76edd5532de3e212d /tests/qapi-schema/alternate-conflict-string.out | |
parent | a8d4a2e4d7e1a0207699de47142c9bdbf2cc8675 (diff) |
qapi: Tighten checking of unions
Previous commits demonstrated that the generator had several
flaws with less-than-perfect unions:
- a simple union that listed the same branch twice (or two variant
names that map to the same C enumerator, including the implicit
MAX sentinel) ended up generating invalid C code
- an anonymous union that listed two branches with the same qtype
ended up generating invalid C code
- the generator crashed on anonymous union attempts to use an
array type
- the generator was silently ignoring a base type for anonymous
unions
- the generator allowed unknown types or nested anonymous unions
as a branch in an anonymous union
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'tests/qapi-schema/alternate-conflict-string.out')
-rw-r--r-- | tests/qapi-schema/alternate-conflict-string.out | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/tests/qapi-schema/alternate-conflict-string.out b/tests/qapi-schema/alternate-conflict-string.out index e7b39a2117..e69de29bb2 100644 --- a/tests/qapi-schema/alternate-conflict-string.out +++ b/tests/qapi-schema/alternate-conflict-string.out @@ -1,5 +0,0 @@ -[OrderedDict([('enum', 'Enum'), ('data', ['hello', 'world'])]), - OrderedDict([('union', 'MyUnion'), ('discriminator', OrderedDict()), ('data', OrderedDict([('one', 'str'), ('two', 'Enum')]))])] -[{'enum_name': 'Enum', 'enum_values': ['hello', 'world']}, - {'enum_name': 'MyUnionKind', 'enum_values': None}] -[] |