From 44bd1276a7dea747c41f250cb71ab65965343a7f Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Mon, 4 May 2015 09:05:08 -0600 Subject: 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 Reviewed-by: Markus Armbruster Signed-off-by: Markus Armbruster --- tests/qapi-schema/alternate-array.err | 1 + tests/qapi-schema/alternate-array.exit | 2 +- tests/qapi-schema/alternate-array.json | 2 +- tests/qapi-schema/alternate-array.out | 4 ---- tests/qapi-schema/alternate-base.err | 1 + tests/qapi-schema/alternate-base.exit | 2 +- tests/qapi-schema/alternate-base.json | 2 +- tests/qapi-schema/alternate-base.out | 4 ---- tests/qapi-schema/alternate-clash.err | 1 + tests/qapi-schema/alternate-clash.exit | 2 +- tests/qapi-schema/alternate-clash.json | 2 +- tests/qapi-schema/alternate-clash.out | 3 --- tests/qapi-schema/alternate-conflict-dict.err | 1 + tests/qapi-schema/alternate-conflict-dict.exit | 2 +- tests/qapi-schema/alternate-conflict-dict.json | 2 +- tests/qapi-schema/alternate-conflict-dict.out | 6 ------ tests/qapi-schema/alternate-conflict-string.err | 1 + tests/qapi-schema/alternate-conflict-string.exit | 2 +- tests/qapi-schema/alternate-conflict-string.json | 2 +- tests/qapi-schema/alternate-conflict-string.out | 5 ----- tests/qapi-schema/alternate-nested.err | 1 + tests/qapi-schema/alternate-nested.exit | 2 +- tests/qapi-schema/alternate-nested.json | 2 +- tests/qapi-schema/alternate-nested.out | 5 ----- tests/qapi-schema/alternate-unknown.err | 1 + tests/qapi-schema/alternate-unknown.exit | 2 +- tests/qapi-schema/alternate-unknown.json | 2 +- tests/qapi-schema/alternate-unknown.out | 3 --- tests/qapi-schema/flat-union-bad-base.err | 2 +- tests/qapi-schema/flat-union-bad-base.json | 2 +- tests/qapi-schema/flat-union-bad-discriminator.err | 1 + tests/qapi-schema/flat-union-bad-discriminator.exit | 2 +- tests/qapi-schema/flat-union-bad-discriminator.json | 2 +- tests/qapi-schema/flat-union-bad-discriminator.out | 10 ---------- tests/qapi-schema/flat-union-inline.err | 2 +- tests/qapi-schema/flat-union-inline.json | 2 +- tests/qapi-schema/flat-union-no-base.err | 2 +- tests/qapi-schema/flat-union-no-base.json | 2 +- tests/qapi-schema/union-bad-branch.err | 1 + tests/qapi-schema/union-bad-branch.exit | 2 +- tests/qapi-schema/union-bad-branch.json | 2 +- tests/qapi-schema/union-bad-branch.out | 6 ------ tests/qapi-schema/union-max.err | 1 + tests/qapi-schema/union-max.exit | 2 +- tests/qapi-schema/union-max.json | 2 +- tests/qapi-schema/union-max.out | 3 --- 46 files changed, 36 insertions(+), 75 deletions(-) (limited to 'tests/qapi-schema') diff --git a/tests/qapi-schema/alternate-array.err b/tests/qapi-schema/alternate-array.err index e69de29..8d6ccc7 100644 --- a/tests/qapi-schema/alternate-array.err +++ b/tests/qapi-schema/alternate-array.err @@ -0,0 +1 @@ +tests/qapi-schema/alternate-array.json:5: Anonymous union 'MyUnion' member 'two' must not be array type diff --git a/tests/qapi-schema/alternate-array.exit b/tests/qapi-schema/alternate-array.exit index 573541a..d00491f 100644 --- a/tests/qapi-schema/alternate-array.exit +++ b/tests/qapi-schema/alternate-array.exit @@ -1 +1 @@ -0 +1 diff --git a/tests/qapi-schema/alternate-array.json b/tests/qapi-schema/alternate-array.json index 25224c6..0da1a64 100644 --- a/tests/qapi-schema/alternate-array.json +++ b/tests/qapi-schema/alternate-array.json @@ -1,4 +1,4 @@ -# FIXME: we should not allow array branches in anonymous unions +# we do not allow array branches in anonymous unions # TODO: should we support this? { 'type': 'One', 'data': { 'name': 'str' } } diff --git a/tests/qapi-schema/alternate-array.out b/tests/qapi-schema/alternate-array.out index 90dc22c..e69de29 100644 --- a/tests/qapi-schema/alternate-array.out +++ b/tests/qapi-schema/alternate-array.out @@ -1,4 +0,0 @@ -[OrderedDict([('type', 'One'), ('data', OrderedDict([('name', 'str')]))]), - OrderedDict([('union', 'MyUnion'), ('discriminator', OrderedDict()), ('data', OrderedDict([('one', 'One'), ('two', ['int'])]))])] -[{'enum_name': 'MyUnionKind', 'enum_values': None}] -[OrderedDict([('type', 'One'), ('data', OrderedDict([('name', 'str')]))])] diff --git a/tests/qapi-schema/alternate-base.err b/tests/qapi-schema/alternate-base.err index e69de29..85595b2 100644 --- a/tests/qapi-schema/alternate-base.err +++ b/tests/qapi-schema/alternate-base.err @@ -0,0 +1 @@ +tests/qapi-schema/alternate-base.json:4: Union 'MyUnion' must not have a base diff --git a/tests/qapi-schema/alternate-base.exit b/tests/qapi-schema/alternate-base.exit index 573541a..d00491f 100644 --- a/tests/qapi-schema/alternate-base.exit +++ b/tests/qapi-schema/alternate-base.exit @@ -1 +1 @@ -0 +1 diff --git a/tests/qapi-schema/alternate-base.json b/tests/qapi-schema/alternate-base.json index 2d36db1..dad7f02 100644 --- a/tests/qapi-schema/alternate-base.json +++ b/tests/qapi-schema/alternate-base.json @@ -1,4 +1,4 @@ -# FIXME: we should reject anonymous union with base type +# we reject anonymous union with base type { 'type': 'Base', 'data': { 'string': 'str' } } { 'union': 'MyUnion', diff --git a/tests/qapi-schema/alternate-base.out b/tests/qapi-schema/alternate-base.out index 7fb31f5..e69de29 100644 --- a/tests/qapi-schema/alternate-base.out +++ b/tests/qapi-schema/alternate-base.out @@ -1,4 +0,0 @@ -[OrderedDict([('type', 'Base'), ('data', OrderedDict([('string', 'str')]))]), - OrderedDict([('union', 'MyUnion'), ('base', 'Base'), ('discriminator', OrderedDict()), ('data', OrderedDict([('number', 'int')]))])] -[{'enum_name': 'MyUnionKind', 'enum_values': None}] -[OrderedDict([('type', 'Base'), ('data', OrderedDict([('string', 'str')]))])] diff --git a/tests/qapi-schema/alternate-clash.err b/tests/qapi-schema/alternate-clash.err index e69de29..1130c12 100644 --- a/tests/qapi-schema/alternate-clash.err +++ b/tests/qapi-schema/alternate-clash.err @@ -0,0 +1 @@ +tests/qapi-schema/alternate-clash.json:2: Union 'Union1' member 'ONE' clashes with 'one' diff --git a/tests/qapi-schema/alternate-clash.exit b/tests/qapi-schema/alternate-clash.exit index 573541a..d00491f 100644 --- a/tests/qapi-schema/alternate-clash.exit +++ b/tests/qapi-schema/alternate-clash.exit @@ -1 +1 @@ -0 +1 diff --git a/tests/qapi-schema/alternate-clash.json b/tests/qapi-schema/alternate-clash.json index 7e2ef23..fa2d27e 100644 --- a/tests/qapi-schema/alternate-clash.json +++ b/tests/qapi-schema/alternate-clash.json @@ -1,4 +1,4 @@ -# FIXME: we should detect C enum collisions in an anonymous union +# we detect C enum collisions in an anonymous union { 'union': 'Union1', 'discriminator': {}, 'data': { 'one': 'str', 'ONE': 'int' } } diff --git a/tests/qapi-schema/alternate-clash.out b/tests/qapi-schema/alternate-clash.out index c6687fa..e69de29 100644 --- a/tests/qapi-schema/alternate-clash.out +++ b/tests/qapi-schema/alternate-clash.out @@ -1,3 +0,0 @@ -[OrderedDict([('union', 'Union1'), ('discriminator', OrderedDict()), ('data', OrderedDict([('one', 'str'), ('ONE', 'int')]))])] -[{'enum_name': 'Union1Kind', 'enum_values': None}] -[] diff --git a/tests/qapi-schema/alternate-conflict-dict.err b/tests/qapi-schema/alternate-conflict-dict.err index e69de29..2d4550c 100644 --- a/tests/qapi-schema/alternate-conflict-dict.err +++ b/tests/qapi-schema/alternate-conflict-dict.err @@ -0,0 +1 @@ +tests/qapi-schema/alternate-conflict-dict.json:6: Anonymous union 'MyUnion' member 'two' can't be distinguished from member 'one' diff --git a/tests/qapi-schema/alternate-conflict-dict.exit b/tests/qapi-schema/alternate-conflict-dict.exit index 573541a..d00491f 100644 --- a/tests/qapi-schema/alternate-conflict-dict.exit +++ b/tests/qapi-schema/alternate-conflict-dict.exit @@ -1 +1 @@ -0 +1 diff --git a/tests/qapi-schema/alternate-conflict-dict.json b/tests/qapi-schema/alternate-conflict-dict.json index d2ed9de..ded302e 100644 --- a/tests/qapi-schema/alternate-conflict-dict.json +++ b/tests/qapi-schema/alternate-conflict-dict.json @@ -1,4 +1,4 @@ -# FIXME: we should reject anonymous unions with multiple object branches +# we reject anonymous unions with multiple object branches { 'type': 'One', 'data': { 'name': 'str' } } { 'type': 'Two', diff --git a/tests/qapi-schema/alternate-conflict-dict.out b/tests/qapi-schema/alternate-conflict-dict.out index b9ac945..e69de29 100644 --- a/tests/qapi-schema/alternate-conflict-dict.out +++ b/tests/qapi-schema/alternate-conflict-dict.out @@ -1,6 +0,0 @@ -[OrderedDict([('type', 'One'), ('data', OrderedDict([('name', 'str')]))]), - OrderedDict([('type', 'Two'), ('data', OrderedDict([('value', 'int')]))]), - OrderedDict([('union', 'MyUnion'), ('discriminator', OrderedDict()), ('data', OrderedDict([('one', 'One'), ('two', 'Two')]))])] -[{'enum_name': 'MyUnionKind', 'enum_values': None}] -[OrderedDict([('type', 'One'), ('data', OrderedDict([('name', 'str')]))]), - OrderedDict([('type', 'Two'), ('data', OrderedDict([('value', 'int')]))])] diff --git a/tests/qapi-schema/alternate-conflict-string.err b/tests/qapi-schema/alternate-conflict-string.err index e69de29..271ddcd 100644 --- a/tests/qapi-schema/alternate-conflict-string.err +++ b/tests/qapi-schema/alternate-conflict-string.err @@ -0,0 +1 @@ +tests/qapi-schema/alternate-conflict-string.json:4: Anonymous union 'MyUnion' member 'two' can't be distinguished from member 'one' diff --git a/tests/qapi-schema/alternate-conflict-string.exit b/tests/qapi-schema/alternate-conflict-string.exit index 573541a..d00491f 100644 --- a/tests/qapi-schema/alternate-conflict-string.exit +++ b/tests/qapi-schema/alternate-conflict-string.exit @@ -1 +1 @@ -0 +1 diff --git a/tests/qapi-schema/alternate-conflict-string.json b/tests/qapi-schema/alternate-conflict-string.json index 35245a3..3834a3d 100644 --- a/tests/qapi-schema/alternate-conflict-string.json +++ b/tests/qapi-schema/alternate-conflict-string.json @@ -1,4 +1,4 @@ -# FIXME: we should reject anonymous unions with multiple string-like branches +# we reject anonymous unions with multiple string-like branches { 'enum': 'Enum', 'data': [ 'hello', 'world' ] } { 'union': 'MyUnion', diff --git a/tests/qapi-schema/alternate-conflict-string.out b/tests/qapi-schema/alternate-conflict-string.out index e7b39a2..e69de29 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}] -[] diff --git a/tests/qapi-schema/alternate-nested.err b/tests/qapi-schema/alternate-nested.err index e69de29..59df96e 100644 --- a/tests/qapi-schema/alternate-nested.err +++ b/tests/qapi-schema/alternate-nested.err @@ -0,0 +1 @@ +tests/qapi-schema/alternate-nested.json:5: Anonymous union 'Union2' member 'nested' has invalid type 'Union1' diff --git a/tests/qapi-schema/alternate-nested.exit b/tests/qapi-schema/alternate-nested.exit index 573541a..d00491f 100644 --- a/tests/qapi-schema/alternate-nested.exit +++ b/tests/qapi-schema/alternate-nested.exit @@ -1 +1 @@ -0 +1 diff --git a/tests/qapi-schema/alternate-nested.json b/tests/qapi-schema/alternate-nested.json index d5812bf..ed2b6b7 100644 --- a/tests/qapi-schema/alternate-nested.json +++ b/tests/qapi-schema/alternate-nested.json @@ -1,4 +1,4 @@ -# FIXME: we should reject a nested anonymous union branch +# we reject a nested anonymous union branch { 'union': 'Union1', 'discriminator': {}, 'data': { 'name': 'str', 'value': 'int' } } diff --git a/tests/qapi-schema/alternate-nested.out b/tests/qapi-schema/alternate-nested.out index 0137c1f..e69de29 100644 --- a/tests/qapi-schema/alternate-nested.out +++ b/tests/qapi-schema/alternate-nested.out @@ -1,5 +0,0 @@ -[OrderedDict([('union', 'Union1'), ('discriminator', OrderedDict()), ('data', OrderedDict([('name', 'str'), ('value', 'int')]))]), - OrderedDict([('union', 'Union2'), ('discriminator', OrderedDict()), ('data', OrderedDict([('nested', 'Union1')]))])] -[{'enum_name': 'Union1Kind', 'enum_values': None}, - {'enum_name': 'Union2Kind', 'enum_values': None}] -[] diff --git a/tests/qapi-schema/alternate-unknown.err b/tests/qapi-schema/alternate-unknown.err index e69de29..bf8e9ae 100644 --- a/tests/qapi-schema/alternate-unknown.err +++ b/tests/qapi-schema/alternate-unknown.err @@ -0,0 +1 @@ +tests/qapi-schema/alternate-unknown.json:2: Anonymous union 'Union' member 'unknown' has invalid type 'MissingType' diff --git a/tests/qapi-schema/alternate-unknown.exit b/tests/qapi-schema/alternate-unknown.exit index 573541a..d00491f 100644 --- a/tests/qapi-schema/alternate-unknown.exit +++ b/tests/qapi-schema/alternate-unknown.exit @@ -1 +1 @@ -0 +1 diff --git a/tests/qapi-schema/alternate-unknown.json b/tests/qapi-schema/alternate-unknown.json index 0bab9c2..0c305c2 100644 --- a/tests/qapi-schema/alternate-unknown.json +++ b/tests/qapi-schema/alternate-unknown.json @@ -1,4 +1,4 @@ -# FIXME: we should reject an anonymous union with unknown type in branch +# we reject an anonymous union with unknown type in branch { 'union': 'Union', 'discriminator': {}, 'data': { 'unknown': 'MissingType' } } diff --git a/tests/qapi-schema/alternate-unknown.out b/tests/qapi-schema/alternate-unknown.out index 0911cdc..e69de29 100644 --- a/tests/qapi-schema/alternate-unknown.out +++ b/tests/qapi-schema/alternate-unknown.out @@ -1,3 +0,0 @@ -[OrderedDict([('union', 'Union'), ('discriminator', OrderedDict()), ('data', OrderedDict([('unknown', 'MissingType')]))])] -[{'enum_name': 'UnionKind', 'enum_values': None}] -[] diff --git a/tests/qapi-schema/flat-union-bad-base.err b/tests/qapi-schema/flat-union-bad-base.err index 5962ff4..f9c31b2 100644 --- a/tests/qapi-schema/flat-union-bad-base.err +++ b/tests/qapi-schema/flat-union-bad-base.err @@ -1 +1 @@ -tests/qapi-schema/flat-union-bad-base.json:9: Base 'OrderedDict([('enum1', 'TestEnum'), ('kind', 'str')])' is not a valid type +tests/qapi-schema/flat-union-bad-base.json:9: Flat union 'TestUnion' must have a string base field diff --git a/tests/qapi-schema/flat-union-bad-base.json b/tests/qapi-schema/flat-union-bad-base.json index 6c14132..bb0f02d 100644 --- a/tests/qapi-schema/flat-union-bad-base.json +++ b/tests/qapi-schema/flat-union-bad-base.json @@ -1,4 +1,4 @@ -# FIXME: poor message: we require the base to be an existing complex type +# we require the base to be an existing complex type # TODO: should we allow an anonymous inline base type? { 'enum': 'TestEnum', 'data': [ 'value1', 'value2' ] } diff --git a/tests/qapi-schema/flat-union-bad-discriminator.err b/tests/qapi-schema/flat-union-bad-discriminator.err index e69de29..1661c52 100644 --- a/tests/qapi-schema/flat-union-bad-discriminator.err +++ b/tests/qapi-schema/flat-union-bad-discriminator.err @@ -0,0 +1 @@ +tests/qapi-schema/flat-union-bad-discriminator.json:10: Flat union 'TestUnion' discriminator must be a string diff --git a/tests/qapi-schema/flat-union-bad-discriminator.exit b/tests/qapi-schema/flat-union-bad-discriminator.exit index 573541a..d00491f 100644 --- a/tests/qapi-schema/flat-union-bad-discriminator.exit +++ b/tests/qapi-schema/flat-union-bad-discriminator.exit @@ -1 +1 @@ -0 +1 diff --git a/tests/qapi-schema/flat-union-bad-discriminator.json b/tests/qapi-schema/flat-union-bad-discriminator.json index 1599a59..3ce43e8 100644 --- a/tests/qapi-schema/flat-union-bad-discriminator.json +++ b/tests/qapi-schema/flat-union-bad-discriminator.json @@ -1,4 +1,4 @@ -# FIXME: we should require the discriminator to be a string naming a base-type member +# we require the discriminator to be a string naming a base-type member { 'enum': 'TestEnum', 'data': [ 'value1', 'value2' ] } { 'type': 'TestBase', diff --git a/tests/qapi-schema/flat-union-bad-discriminator.out b/tests/qapi-schema/flat-union-bad-discriminator.out index b6ce217..e69de29 100644 --- a/tests/qapi-schema/flat-union-bad-discriminator.out +++ b/tests/qapi-schema/flat-union-bad-discriminator.out @@ -1,10 +0,0 @@ -[OrderedDict([('enum', 'TestEnum'), ('data', ['value1', 'value2'])]), - OrderedDict([('type', 'TestBase'), ('data', OrderedDict([('enum1', 'TestEnum'), ('kind', 'str')]))]), - OrderedDict([('type', 'TestTypeA'), ('data', OrderedDict([('string', 'str')]))]), - OrderedDict([('type', 'TestTypeB'), ('data', OrderedDict([('integer', 'int')]))]), - OrderedDict([('union', 'TestUnion'), ('base', 'TestBase'), ('discriminator', []), ('data', OrderedDict([('kind1', 'TestTypeA'), ('kind2', 'TestTypeB')]))])] -[{'enum_name': 'TestEnum', 'enum_values': ['value1', 'value2']}, - {'enum_name': 'TestUnionKind', 'enum_values': None}] -[OrderedDict([('type', 'TestBase'), ('data', OrderedDict([('enum1', 'TestEnum'), ('kind', 'str')]))]), - OrderedDict([('type', 'TestTypeA'), ('data', OrderedDict([('string', 'str')]))]), - OrderedDict([('type', 'TestTypeB'), ('data', OrderedDict([('integer', 'int')]))])] diff --git a/tests/qapi-schema/flat-union-inline.err b/tests/qapi-schema/flat-union-inline.err index 51fbe54..ec58627 100644 --- a/tests/qapi-schema/flat-union-inline.err +++ b/tests/qapi-schema/flat-union-inline.err @@ -1 +1 @@ -tests/qapi-schema/flat-union-inline.json:7: Base 'OrderedDict([('enum1', 'TestEnum'), ('kind', 'str')])' is not a valid type +tests/qapi-schema/flat-union-inline.json:7: Flat union 'TestUnion' must have a string base field diff --git a/tests/qapi-schema/flat-union-inline.json b/tests/qapi-schema/flat-union-inline.json index 2bdffeb..f3da117 100644 --- a/tests/qapi-schema/flat-union-inline.json +++ b/tests/qapi-schema/flat-union-inline.json @@ -1,4 +1,4 @@ -# FIXME: poor message: we require branches to be a complex type name +# we require branches to be a complex type name # TODO: should we allow anonymous inline types? { 'enum': 'TestEnum', 'data': [ 'value1', 'value2' ] } diff --git a/tests/qapi-schema/flat-union-no-base.err b/tests/qapi-schema/flat-union-no-base.err index 97323a0..bb3f708 100644 --- a/tests/qapi-schema/flat-union-no-base.err +++ b/tests/qapi-schema/flat-union-no-base.err @@ -1 +1 @@ -tests/qapi-schema/flat-union-no-base.json:9: Flat union 'TestUnion' must have a base field +tests/qapi-schema/flat-union-no-base.json:9: Flat union 'TestUnion' must have a string base field diff --git a/tests/qapi-schema/flat-union-no-base.json b/tests/qapi-schema/flat-union-no-base.json index 08a0247..9547bb8 100644 --- a/tests/qapi-schema/flat-union-no-base.json +++ b/tests/qapi-schema/flat-union-no-base.json @@ -1,4 +1,4 @@ -# FIXME: flat unions should require a base +# flat unions require a base # TODO: simple unions should be able to use an enum discriminator { 'type': 'TestTypeA', 'data': { 'string': 'str' } } diff --git a/tests/qapi-schema/union-bad-branch.err b/tests/qapi-schema/union-bad-branch.err index e69de29..8822735 100644 --- a/tests/qapi-schema/union-bad-branch.err +++ b/tests/qapi-schema/union-bad-branch.err @@ -0,0 +1 @@ +tests/qapi-schema/union-bad-branch.json:6: Union 'MyUnion' member 'ONE' clashes with 'one' diff --git a/tests/qapi-schema/union-bad-branch.exit b/tests/qapi-schema/union-bad-branch.exit index 573541a..d00491f 100644 --- a/tests/qapi-schema/union-bad-branch.exit +++ b/tests/qapi-schema/union-bad-branch.exit @@ -1 +1 @@ -0 +1 diff --git a/tests/qapi-schema/union-bad-branch.json b/tests/qapi-schema/union-bad-branch.json index 11e46de..4303666 100644 --- a/tests/qapi-schema/union-bad-branch.json +++ b/tests/qapi-schema/union-bad-branch.json @@ -1,4 +1,4 @@ -# FIXME: we should reject normal unions where branches would collide in C +# we reject normal unions where branches would collide in C { 'type': 'One', 'data': { 'string': 'str' } } { 'type': 'Two', diff --git a/tests/qapi-schema/union-bad-branch.out b/tests/qapi-schema/union-bad-branch.out index 6baf01b..e69de29 100644 --- a/tests/qapi-schema/union-bad-branch.out +++ b/tests/qapi-schema/union-bad-branch.out @@ -1,6 +0,0 @@ -[OrderedDict([('type', 'One'), ('data', OrderedDict([('string', 'str')]))]), - OrderedDict([('type', 'Two'), ('data', OrderedDict([('number', 'int')]))]), - OrderedDict([('union', 'MyUnion'), ('data', OrderedDict([('one', 'One'), ('ONE', 'Two')]))])] -[{'enum_name': 'MyUnionKind', 'enum_values': None}] -[OrderedDict([('type', 'One'), ('data', OrderedDict([('string', 'str')]))]), - OrderedDict([('type', 'Two'), ('data', OrderedDict([('number', 'int')]))])] diff --git a/tests/qapi-schema/union-max.err b/tests/qapi-schema/union-max.err index e69de29..55ce439 100644 --- a/tests/qapi-schema/union-max.err +++ b/tests/qapi-schema/union-max.err @@ -0,0 +1 @@ +tests/qapi-schema/union-max.json:2: Union 'Union' member 'max' clashes with '(automatic)' diff --git a/tests/qapi-schema/union-max.exit b/tests/qapi-schema/union-max.exit index 573541a..d00491f 100644 --- a/tests/qapi-schema/union-max.exit +++ b/tests/qapi-schema/union-max.exit @@ -1 +1 @@ -0 +1 diff --git a/tests/qapi-schema/union-max.json b/tests/qapi-schema/union-max.json index 45648c4..d6ad986 100644 --- a/tests/qapi-schema/union-max.json +++ b/tests/qapi-schema/union-max.json @@ -1,3 +1,3 @@ -# FIXME: we should reject 'max' branch in a union, for collision with C enum +# we reject 'max' branch in a union, for collision with C enum { 'union': 'Union', 'data': { 'max': 'int' } } diff --git a/tests/qapi-schema/union-max.out b/tests/qapi-schema/union-max.out index 2757d36..e69de29 100644 --- a/tests/qapi-schema/union-max.out +++ b/tests/qapi-schema/union-max.out @@ -1,3 +0,0 @@ -[OrderedDict([('union', 'Union'), ('data', OrderedDict([('max', 'int')]))])] -[{'enum_name': 'UnionKind', 'enum_values': None}] -[] -- cgit v1.1