7b2a5c2f9a
The previous commit added two tests that triggered an assertion failure. It's fairly straightforward to avoid the failure by just outright forbidding the collision between a union's tag values and its discriminator name (including the implicit name 'kind' supplied for simple unions [*]). Ultimately, we'd like to move the collision detection into QAPISchema*.check(), but for now it is easier just to enhance the existing checks. [*] Of course, down the road, we have plans to rename the simple union tag name to 'type' to match the QMP wire name, but the idea of the collision will still be present even then. Technically, we could avoid the collision by naming the C union members representing each enum value as '_case_value' rather than 'value'; but until we have an actual qapi client (and not just our testsuite) that has a legitimate reason to match a case label to the name of a QMP key and needs the name munging to satisfy the compiler, it's easier to just reject the qapi as invalid. Signed-off-by: Eric Blake <eblake@redhat.com> Message-Id: <1443565276-4535-7-git-send-email-eblake@redhat.com> [Polished a few comments] Signed-off-by: Markus Armbruster <armbru@redhat.com>
15 lines
492 B
JSON
15 lines
492 B
JSON
# Flat union branch 'type'
|
|
# Reject this, because we would have a clash in generated C, between the
|
|
# outer tag 'type' and the branch name 'type' within the union.
|
|
# TODO: We could munge the generated C branch name to let it compile.
|
|
{ 'enum': 'TestEnum',
|
|
'data': [ 'type' ] }
|
|
{ 'struct': 'Base',
|
|
'data': { 'type': 'TestEnum' } }
|
|
{ 'struct': 'Branch1',
|
|
'data': { 'string': 'str' } }
|
|
{ 'union': 'TestUnion',
|
|
'base': 'Base',
|
|
'discriminator': 'type',
|
|
'data': { 'type': 'Branch1' } }
|