From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: marcandre.lureau@redhat.com, mdroth@linux.vnet.ibm.com
Subject: [PATCH v2 22/26] qapi: Improve reporting of invalid 'if' further
Date: Fri, 27 Sep 2019 15:46:35 +0200 [thread overview]
Message-ID: <20190927134639.4284-23-armbru@redhat.com> (raw)
In-Reply-To: <20190927134639.4284-1-armbru@redhat.com>
check_if()'s errors don't point to the offending part of the
expression. For instance:
tests/qapi-schema/alternate-branch-if-invalid.json:2: 'if' condition ' ' makes no sense
Other check_FOO() do, with the help of a @source argument. Make
check_if() do that, too. The example above improves to:
tests/qapi-schema/alternate-branch-if-invalid.json:2: 'if' condition ' ' of 'data' member 'branch' makes no sense
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
scripts/qapi/common.py | 27 +++++++++++--------
.../alternate-branch-if-invalid.err | 2 +-
tests/qapi-schema/bad-if-empty-list.err | 2 +-
tests/qapi-schema/bad-if-empty.err | 2 +-
tests/qapi-schema/bad-if-list.err | 2 +-
tests/qapi-schema/bad-if.err | 2 +-
tests/qapi-schema/enum-if-invalid.err | 2 +-
tests/qapi-schema/features-if-invalid.err | 2 +-
.../qapi-schema/struct-member-if-invalid.err | 2 +-
tests/qapi-schema/union-branch-if-invalid.err | 2 +-
10 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py
index 81c217cd60..4bc8c807aa 100644
--- a/scripts/qapi/common.py
+++ b/scripts/qapi/common.py
@@ -692,22 +692,27 @@ def check_defn_name_str(name, info, meta):
info, "%s name should not end in '%s'" % (meta, name[-4:]))
-def check_if(expr, info):
+def check_if(expr, info, source):
def check_if_str(ifcond, info):
if not isinstance(ifcond, str):
raise QAPISemError(
- info, "'if' condition must be a string or a list of strings")
+ info,
+ "'if' condition of %s must be a string or a list of strings"
+ % source)
if ifcond.strip() == '':
- raise QAPISemError(info, "'if' condition '%s' makes no sense"
- % ifcond)
+ raise QAPISemError(
+ info,
+ "'if' condition '%s' of %s makes no sense"
+ % (ifcond, source))
ifcond = expr.get('if')
if ifcond is None:
return
if isinstance(ifcond, list):
if ifcond == []:
- raise QAPISemError(info, "'if' condition [] is useless")
+ raise QAPISemError(
+ info, "'if' condition [] of %s is useless" % source)
for elt in ifcond:
check_if_str(elt, info)
else:
@@ -752,7 +757,7 @@ def check_type(value, info, source,
if c_name(key, False) == 'u' or c_name(key, False).startswith('has_'):
raise QAPISemError(info, "%s uses reserved name" % key_source)
check_known_keys(arg, info, key_source, ['type'], ['if'])
- check_if(arg, info)
+ check_if(arg, info, key_source)
normalize_if(arg)
check_type(arg['type'], info, key_source, allow_array=True)
@@ -796,7 +801,7 @@ def check_union(expr, info):
source = "'data' member '%s'" % key
check_name_str(key, info, source)
check_known_keys(value, info, source, ['type'], ['if'])
- check_if(value, info)
+ check_if(value, info, source)
normalize_if(value)
check_type(value['type'], info, source, allow_array=not base)
@@ -810,7 +815,7 @@ def check_alternate(expr, info):
source = "'data' member '%s'" % key
check_name_str(key, info, source)
check_known_keys(value, info, source, ['type'], ['if'])
- check_if(value, info)
+ check_if(value, info, source)
normalize_if(value)
check_type(value['type'], info, source)
@@ -834,7 +839,7 @@ def check_enum(expr, info):
source = "%s '%s'" % (source, member['name'])
check_name_str(member['name'], info, source,
enum_member=True, permit_upper=permit_upper)
- check_if(member, info)
+ check_if(member, info, source)
normalize_if(member)
@@ -856,7 +861,7 @@ def check_struct(expr, info):
check_name_is_str(f['name'], info, source)
source = "%s '%s'" % (source, f['name'])
check_name_str(f['name'], info, source)
- check_if(f, info)
+ check_if(f, info, source)
normalize_if(f)
@@ -994,7 +999,7 @@ def check_exprs(exprs):
assert False, 'unexpected meta type'
normalize_if(expr)
- check_if(expr, info)
+ check_if(expr, info, meta)
check_flags(expr, info)
if doc:
diff --git a/tests/qapi-schema/alternate-branch-if-invalid.err b/tests/qapi-schema/alternate-branch-if-invalid.err
index 8684829aca..6c68e5a922 100644
--- a/tests/qapi-schema/alternate-branch-if-invalid.err
+++ b/tests/qapi-schema/alternate-branch-if-invalid.err
@@ -1,2 +1,2 @@
tests/qapi-schema/alternate-branch-if-invalid.json: In alternate 'Alt':
-tests/qapi-schema/alternate-branch-if-invalid.json:2: 'if' condition ' ' makes no sense
+tests/qapi-schema/alternate-branch-if-invalid.json:2: 'if' condition ' ' of 'data' member 'branch' makes no sense
diff --git a/tests/qapi-schema/bad-if-empty-list.err b/tests/qapi-schema/bad-if-empty-list.err
index 2218c9279b..517519f500 100644
--- a/tests/qapi-schema/bad-if-empty-list.err
+++ b/tests/qapi-schema/bad-if-empty-list.err
@@ -1,2 +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
+tests/qapi-schema/bad-if-empty-list.json:2: 'if' condition [] of struct is useless
diff --git a/tests/qapi-schema/bad-if-empty.err b/tests/qapi-schema/bad-if-empty.err
index a3fdb3009d..5f1767388e 100644
--- a/tests/qapi-schema/bad-if-empty.err
+++ b/tests/qapi-schema/bad-if-empty.err
@@ -1,2 +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
+tests/qapi-schema/bad-if-empty.json:2: 'if' condition '' of struct makes no sense
diff --git a/tests/qapi-schema/bad-if-list.err b/tests/qapi-schema/bad-if-list.err
index e03bf0fc3a..e5d72b2f39 100644
--- a/tests/qapi-schema/bad-if-list.err
+++ b/tests/qapi-schema/bad-if-list.err
@@ -1,2 +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
+tests/qapi-schema/bad-if-list.json:2: 'if' condition ' ' of struct makes no sense
diff --git a/tests/qapi-schema/bad-if.err b/tests/qapi-schema/bad-if.err
index 190216c109..65d8efd7e4 100644
--- a/tests/qapi-schema/bad-if.err
+++ b/tests/qapi-schema/bad-if.err
@@ -1,2 +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
+tests/qapi-schema/bad-if.json:2: 'if' condition of struct must be a string or a list of strings
diff --git a/tests/qapi-schema/enum-if-invalid.err b/tests/qapi-schema/enum-if-invalid.err
index db9eb45b25..30c1f0e91c 100644
--- a/tests/qapi-schema/enum-if-invalid.err
+++ b/tests/qapi-schema/enum-if-invalid.err
@@ -1,2 +1,2 @@
tests/qapi-schema/enum-if-invalid.json: In enum 'TestIfEnum':
-tests/qapi-schema/enum-if-invalid.json:2: 'if' condition must be a string or a list of strings
+tests/qapi-schema/enum-if-invalid.json:2: 'if' condition of 'data' member 'bar' must be a string or a list of strings
diff --git a/tests/qapi-schema/features-if-invalid.err b/tests/qapi-schema/features-if-invalid.err
index 90f4119ae7..ffb39378af 100644
--- a/tests/qapi-schema/features-if-invalid.err
+++ b/tests/qapi-schema/features-if-invalid.err
@@ -1,2 +1,2 @@
tests/qapi-schema/features-if-invalid.json: In struct 'Stru':
-tests/qapi-schema/features-if-invalid.json:2: 'if' condition must be a string or a list of strings
+tests/qapi-schema/features-if-invalid.json:2: 'if' condition of 'features' member 'f' must be a string or a list of strings
diff --git a/tests/qapi-schema/struct-member-if-invalid.err b/tests/qapi-schema/struct-member-if-invalid.err
index e8ad02b9fc..4c5983674b 100644
--- a/tests/qapi-schema/struct-member-if-invalid.err
+++ b/tests/qapi-schema/struct-member-if-invalid.err
@@ -1,2 +1,2 @@
tests/qapi-schema/struct-member-if-invalid.json: In struct 'Stru':
-tests/qapi-schema/struct-member-if-invalid.json:2: 'if' condition must be a string or a list of strings
+tests/qapi-schema/struct-member-if-invalid.json:2: 'if' condition of 'data' member 'member' must be a string or a list of strings
diff --git a/tests/qapi-schema/union-branch-if-invalid.err b/tests/qapi-schema/union-branch-if-invalid.err
index b49cf9b664..14819bf8b8 100644
--- a/tests/qapi-schema/union-branch-if-invalid.err
+++ b/tests/qapi-schema/union-branch-if-invalid.err
@@ -1,2 +1,2 @@
tests/qapi-schema/union-branch-if-invalid.json: In union 'Uni':
-tests/qapi-schema/union-branch-if-invalid.json:4: 'if' condition '' makes no sense
+tests/qapi-schema/union-branch-if-invalid.json:4: 'if' condition '' of 'data' member 'branch1' makes no sense
--
2.21.0
next prev parent reply other threads:[~2019-09-27 15:50 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-27 13:46 [PATCH v2 00/26] qapi: Pay back some frontend technical debt Markus Armbruster
2019-09-27 13:46 ` [PATCH v2 01/26] qapi: Tighten QAPISchemaFOO.check() assertions Markus Armbruster
2019-09-27 13:46 ` [PATCH v2 02/26] qapi: Rename .owner to .defined_in Markus Armbruster
2019-09-27 13:46 ` [PATCH v2 03/26] qapi: New QAPISourceInfo, replacing dict Markus Armbruster
2019-09-27 13:46 ` [PATCH v2 04/26] qapi: Prefix frontend errors with an "in definition" line Markus Armbruster
2019-09-27 13:46 ` [PATCH v2 05/26] qapi: Clean up member name case checking Markus Armbruster
2019-09-27 13:46 ` [PATCH v2 06/26] qapi: Change frontend error messages to start with lower case Markus Armbruster
2019-09-27 13:46 ` [PATCH v2 07/26] qapi: Improve reporting of member name clashes Markus Armbruster
2019-09-27 13:46 ` [PATCH v2 08/26] qapi: Reorder check_FOO() parameters for consistency Markus Armbruster
2019-09-27 13:46 ` [PATCH v2 09/26] qapi: Improve reporting of invalid name errors Markus Armbruster
2019-09-27 13:46 ` [PATCH v2 10/26] qapi: Use check_name_str() where it suffices Markus Armbruster
2019-09-27 13:46 ` [PATCH v2 11/26] qapi: Report invalid '*' prefix like any other invalid name Markus Armbruster
2019-09-27 13:46 ` [PATCH v2 12/26] qapi: Move check for reserved names out of add_name() Markus Armbruster
2019-09-27 13:46 ` [PATCH v2 13/26] qapi: Make check_type()'s array case a bit more obvious Markus Armbruster
2019-09-27 13:46 ` [PATCH v2 14/26] qapi: Plumb info to the QAPISchemaMember Markus Armbruster
2019-09-27 13:46 ` [PATCH v2 15/26] qapi: Inline check_name() into check_union() Markus Armbruster
2019-09-27 13:46 ` [PATCH v2 16/26] qapi: Move context-sensitive checking to the proper place Markus Armbruster
2019-09-27 13:46 ` [PATCH v2 17/26] qapi: Move context-free " Markus Armbruster
2019-09-27 13:46 ` [PATCH v2 18/26] qapi: Improve reporting of invalid 'if' errors Markus Armbruster
2019-09-27 13:46 ` [PATCH v2 19/26] qapi: Improve reporting of invalid flags Markus Armbruster
2019-09-27 13:46 ` [PATCH v2 20/26] qapi: Improve reporting of missing / unknown definition keys Markus Armbruster
2019-09-27 13:46 ` [PATCH v2 21/26] qapi: Avoid redundant definition references in error messages Markus Armbruster
2019-09-27 15:03 ` Eric Blake
2019-09-27 13:46 ` Markus Armbruster [this message]
2019-09-27 16:08 ` [PATCH v2 22/26] qapi: Improve reporting of invalid 'if' further Eric Blake
2019-09-27 13:46 ` [PATCH v2 23/26] qapi: Eliminate check_keys(), rename check_known_keys() Markus Armbruster
2019-09-27 13:46 ` [PATCH v2 24/26] qapi: Improve reporting of missing documentation comment Markus Armbruster
2019-09-27 13:46 ` [PATCH v2 25/26] qapi: Improve reporting of redefinition Markus Armbruster
2019-09-27 13:46 ` [PATCH v2 26/26] qapi: Improve source file read error handling Markus Armbruster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190927134639.4284-23-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=mdroth@linux.vnet.ibm.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).