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>
10 lines
463 B
JSON
10 lines
463 B
JSON
# Union branch 'type'
|
|
# Reject this, because we would have a clash in generated C, between the
|
|
# simple union's implicit tag member 'kind' and the branch name 'kind'
|
|
# within the union.
|
|
# TODO: Even when the generated C is switched to use 'type' rather than
|
|
# 'kind', to match the QMP spelling, the collision should still be detected.
|
|
# Or, we could munge the branch name to allow compilation.
|
|
{ 'union': 'TestUnion',
|
|
'data': { 'kind': 'int', 'type': 'str' } }
|