diff options
| author | Markus Armbruster <armbru@redhat.com> | 2019-09-27 15:46:29 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2019-09-28 17:17:19 +0200 |
| commit | fa110c6a9e6c0ae0ce2d4bcf5771cdb8c3e53a7e (patch) | |
| tree | 6f9a4338cdd579a82e4144a0b04eabce8b7ae5e3 /tests/qapi-schema/alternate-conflict-dict.err | |
| parent | 77daece3d95dc7edaa5982fbbfd7afe3bc4121ac (diff) | |
qapi: Move context-sensitive checking to the proper place
When we introduced the QAPISchema intermediate representation (commit
ac88219a6c7), we took a shortcut: we left check_exprs() & friends
alone instead of moving semantic checks into the
QAPISchemaFOO.check(). The .check() assert check_exprs() did its job.
Time to finish the conversion job. Move exactly the context-sensitive
checks to the .check(). They replace assertions there. Context-free
checks stay put.
Fixes the misleading optional tag error demonstrated by test
flat-union-optional-discriminator.
A few other error message improve.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20190927134639.4284-17-armbru@redhat.com>
Diffstat (limited to 'tests/qapi-schema/alternate-conflict-dict.err')
| -rw-r--r-- | tests/qapi-schema/alternate-conflict-dict.err | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/qapi-schema/alternate-conflict-dict.err b/tests/qapi-schema/alternate-conflict-dict.err index e3f7d9072d..e5b42d04c9 100644 --- a/tests/qapi-schema/alternate-conflict-dict.err +++ b/tests/qapi-schema/alternate-conflict-dict.err @@ -1,2 +1,2 @@ tests/qapi-schema/alternate-conflict-dict.json: In alternate 'Alt': -tests/qapi-schema/alternate-conflict-dict.json:6: alternate 'Alt' member 'two' can't be distinguished from member 'one' +tests/qapi-schema/alternate-conflict-dict.json:6: branch 'two' can't be distinguished from 'one' |