Here's the next batch of qapi patches, based on my "[PATCH v3 00/16]
qapi: Schema language cleanups & doc improvements". There's more in
the pipeline.
Based-on: <20190913201349.24332-1-arm...@redhat.com>
Markus Armbruster (19):
tests/qapi-schema: Cover unknown pragma
tests/qapi-schema: Delete two redundant tests
tests/qapi-schema: Demonstrate misleading optional tag error
tests/qapi-schema: Demonstrate broken discriminator errors
tests/qapi-schema: Demonstrate insufficient 'if' checking
tests/qapi-schema: Demonstrate suboptimal lexical errors
qapi: Use quotes more consistently in frontend error messages
qapi: Improve reporting of lexical errors
qapi: Remove null from schema language
qapi: Fix broken discriminator error messages
qapi: Reject blank 'if' conditions in addition to empty ones
qapi: Fix missing 'if' checks in struct, union, alternate 'data'
qapi: Normalize 'if' in check_exprs(), like other sugar
qapi: Simplify check_keys()
qapi: Clean up around check_known_keys()
qapi: Delete useless check_exprs() code for simple union kind
qapi: Fix to .check() empty structs just once
qapi: Fix excessive QAPISchemaEntity.check() recursion
qapi: Assert .visit() and .check_clash() run only after .check()
docs/devel/qapi-code-gen.txt | 4 +-
scripts/qapi/common.py | 233 +++++++++---------
tests/Makefile.include | 9 +-
.../alternate-branch-if-invalid.err | 1 +
....exit => alternate-branch-if-invalid.exit} | 0
.../alternate-branch-if-invalid.json | 3 +
...ta.out => alternate-branch-if-invalid.out} | 0
tests/qapi-schema/bad-if-list.err | 2 +-
tests/qapi-schema/bad-if-list.json | 2 +-
tests/qapi-schema/bad-type-int.err | 2 +-
tests/qapi-schema/bad-type-int.json | 2 +-
tests/qapi-schema/doc-missing-colon.err | 2 +-
tests/qapi-schema/double-data.err | 1 -
tests/qapi-schema/double-data.json | 2 -
tests/qapi-schema/duplicate-key.err | 2 +-
tests/qapi-schema/duplicate-key.json | 2 +-
tests/qapi-schema/enum-int-member.err | 2 +-
tests/qapi-schema/escape-outside-string.err | 1 +
tests/qapi-schema/features-if-invalid.err | 1 +
...rmat-err.exit => features-if-invalid.exit} | 0
tests/qapi-schema/features-if-invalid.json | 4 +
...format-err.out => features-if-invalid.out} | 0
.../flat-union-discriminator-bad-name.err | 1 +
.../flat-union-discriminator-bad-name.exit | 1 +
.../flat-union-discriminator-bad-name.json | 11 +
.../flat-union-discriminator-bad-name.out | 0
.../flat-union-invalid-discriminator.err | 2 +-
.../flat-union-invalid-discriminator.json | 5 +-
.../flat-union-invalid-if-discriminator.err | 2 +-
.../flat-union-invalid-if-discriminator.json | 5 +-
.../flat-union-optional-discriminator.err | 2 +-
.../flat-union-optional-discriminator.json | 3 +-
tests/qapi-schema/funny-char.err | 2 +-
tests/qapi-schema/funny-word.err | 1 +
tests/qapi-schema/funny-word.exit | 1 +
tests/qapi-schema/funny-word.json | 1 +
tests/qapi-schema/funny-word.out | 0
tests/qapi-schema/include-before-err.err | 2 +-
tests/qapi-schema/include-format-err.err | 1 -
tests/qapi-schema/include-format-err.json | 2 -
tests/qapi-schema/include-nested-err.err | 2 +-
tests/qapi-schema/leading-comma-list.err | 2 +-
tests/qapi-schema/leading-comma-object.err | 2 +-
tests/qapi-schema/missing-colon.err | 2 +-
tests/qapi-schema/missing-comma-list.err | 2 +-
tests/qapi-schema/missing-comma-object.err | 2 +-
tests/qapi-schema/non-objects.err | 2 +-
.../pragma-name-case-whitelist-crap.json | 2 +-
tests/qapi-schema/pragma-unknown.err | 1 +
tests/qapi-schema/pragma-unknown.exit | 1 +
tests/qapi-schema/pragma-unknown.json | 1 +
tests/qapi-schema/pragma-unknown.out | 0
tests/qapi-schema/quoted-structural-chars.err | 2 +-
.../qapi-schema/struct-member-if-invalid.err | 1 +
.../qapi-schema/struct-member-if-invalid.exit | 1 +
.../qapi-schema/struct-member-if-invalid.json | 3 +
.../qapi-schema/struct-member-if-invalid.out | 0
tests/qapi-schema/trailing-comma-list.err | 2 +-
tests/qapi-schema/unclosed-list.err | 2 +-
tests/qapi-schema/unclosed-object.err | 2 +-
tests/qapi-schema/union-base-empty.err | 2 +-
tests/qapi-schema/union-branch-if-invalid.err | 1 +
.../qapi-schema/union-branch-if-invalid.exit | 1 +
.../qapi-schema/union-branch-if-invalid.json | 6 +
tests/qapi-schema/union-branch-if-invalid.out | 0
65 files changed, 202 insertions(+), 157 deletions(-)
create mode 100644 tests/qapi-schema/alternate-branch-if-invalid.err
rename tests/qapi-schema/{double-data.exit =>
alternate-branch-if-invalid.exit} (100%)
create mode 100644 tests/qapi-schema/alternate-branch-if-invalid.json
rename tests/qapi-schema/{double-data.out => alternate-branch-if-invalid.out}
(100%)
delete mode 100644 tests/qapi-schema/double-data.err
delete mode 100644 tests/qapi-schema/double-data.json
create mode 100644 tests/qapi-schema/escape-outside-string.err
create mode 100644 tests/qapi-schema/features-if-invalid.err
rename tests/qapi-schema/{include-format-err.exit => features-if-invalid.exit}
(100%)
create mode 100644 tests/qapi-schema/features-if-invalid.json
rename tests/qapi-schema/{include-format-err.out => features-if-invalid.out}
(100%)
create mode 100644 tests/qapi-schema/flat-union-discriminator-bad-name.err
create mode 100644 tests/qapi-schema/flat-union-discriminator-bad-name.exit
create mode 100644 tests/qapi-schema/flat-union-discriminator-bad-name.json
create mode 100644 tests/qapi-schema/flat-union-discriminator-bad-name.out
create mode 100644 tests/qapi-schema/funny-word.err
create mode 100644 tests/qapi-schema/funny-word.exit
create mode 100644 tests/qapi-schema/funny-word.json
create mode 100644 tests/qapi-schema/funny-word.out
delete mode 100644 tests/qapi-schema/include-format-err.err
delete mode 100644 tests/qapi-schema/include-format-err.json
create mode 100644 tests/qapi-schema/pragma-unknown.err
create mode 100644 tests/qapi-schema/pragma-unknown.exit
create mode 100644 tests/qapi-schema/pragma-unknown.json
create mode 100644 tests/qapi-schema/pragma-unknown.out
create mode 100644 tests/qapi-schema/struct-member-if-invalid.err
create mode 100644 tests/qapi-schema/struct-member-if-invalid.exit
create mode 100644 tests/qapi-schema/struct-member-if-invalid.json
create mode 100644 tests/qapi-schema/struct-member-if-invalid.out
create mode 100644 tests/qapi-schema/union-branch-if-invalid.err
create mode 100644 tests/qapi-schema/union-branch-if-invalid.exit
create mode 100644 tests/qapi-schema/union-branch-if-invalid.json
create mode 100644 tests/qapi-schema/union-branch-if-invalid.out
--
2.21.0
