aboutsummaryrefslogtreecommitdiff
path: root/tests/qapi-schema/enum-clash-member.json
diff options
context:
space:
mode:
authorEric Blake <eblake@redhat.com>2015-12-01 22:20:58 -0700
committerMarkus Armbruster <armbru@redhat.com>2015-12-17 08:21:29 +0100
commit01cfbaa4c36ecd9f1c7bcbad50c92758e1d147c4 (patch)
tree331acd61966951feca3191ff1aade763056a2b49 /tests/qapi-schema/enum-clash-member.json
parent893e1f2c5170d54316f1dcf3fefae679175622fc (diff)
qapi: Move duplicate collision checks to schema check()
With the recent commit 'qapi: Detect collisions in C member names', we have two different locations for detecting clashes - one at parse time, and another at QAPISchema*.check() time. Remove all of the ad hoc parser checks, and delete associated code (for example, the global check_member_clash() method is no longer needed). Testing this showed that the test union-bad-branch wasn't adding much: union-clash-branches also exposes the error message when branches collide, and we've recently fixed things to avoid an implicit collision with max. Likewise, the error for enum-clash-member changes to report our new detection of upper case in a value name, unless we modify the test to use all lower case. The wording of several error messages has changed, but the change is generally an improvement rather than a regression. No change to generated code. Signed-off-by: Eric Blake <eblake@redhat.com> Message-Id: <1449033659-25497-15-git-send-email-eblake@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'tests/qapi-schema/enum-clash-member.json')
-rw-r--r--tests/qapi-schema/enum-clash-member.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/qapi-schema/enum-clash-member.json b/tests/qapi-schema/enum-clash-member.json
index b7dc02a28d..b6928b8bfd 100644
--- a/tests/qapi-schema/enum-clash-member.json
+++ b/tests/qapi-schema/enum-clash-member.json
@@ -1,2 +1,2 @@
# we reject enums where members will clash when mapped to C enum
-{ 'enum': 'MyEnum', 'data': [ 'one', 'ONE' ] }
+{ 'enum': 'MyEnum', 'data': [ 'one-two', 'one_two' ] }