Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
qapi: Improve reporting of invalid 'if' errors
Move check_if() from check_keys() to check_exprs() and call it later, so its error messages gain an "in definition" line. Checking values in a function named check_keys() is unclean anyway. The original sin was commit 0545f6b "qapi: Better error messages for bad expressions", which checks the value of key 'name'. More sinning in commit 2cbf099 "qapi: More rigorous checking for type safety bypass", commit c818408 "qapi: Implement boxed types for commands/events", and commit 967c885 "qapi: add 'if' to top-level expressions". This commit does penance for the latter. The next commits will do penance for the others. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-Id: <20190927134639.4284-19-armbru@redhat.com>
- Loading branch information
Markus Armbruster
committed
Sep 28, 2019
1 parent
4ebda5a
commit 576f0b8
Showing
5 changed files
with
6 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,2 @@ | ||
tests/qapi-schema/bad-if-empty-list.json: In struct 'TestIfStruct': | ||
tests/qapi-schema/bad-if-empty-list.json:2: 'if' condition [] is useless |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,2 @@ | ||
tests/qapi-schema/bad-if-empty.json: In struct 'TestIfStruct': | ||
tests/qapi-schema/bad-if-empty.json:2: 'if' condition '' makes no sense |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,2 @@ | ||
tests/qapi-schema/bad-if-list.json: In struct 'TestIfStruct': | ||
tests/qapi-schema/bad-if-list.json:2: 'if' condition ' ' makes no sense |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,2 @@ | ||
tests/qapi-schema/bad-if.json: In struct 'TestIfStruct': | ||
tests/qapi-schema/bad-if.json:2: 'if' condition must be a string or a list of strings |