From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44415) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zlr6s-00023o-7P for qemu-devel@nongnu.org; Tue, 13 Oct 2015 00:22:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zlr6o-0005g2-JF for qemu-devel@nongnu.org; Tue, 13 Oct 2015 00:22:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48171) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zlr6o-0005fy-EA for qemu-devel@nongnu.org; Tue, 13 Oct 2015 00:22:42 -0400 From: Eric Blake Date: Mon, 12 Oct 2015 22:22:22 -0600 Message-Id: <1444710158-8723-3-git-send-email-eblake@redhat.com> In-Reply-To: <1444710158-8723-1-git-send-email-eblake@redhat.com> References: <1444710158-8723-1-git-send-email-eblake@redhat.com> Subject: [Qemu-devel] [PATCH v8 02/18] qapi: Prepare for errors during check() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: armbru@redhat.com, Michael Roth The next few patches will start migrating error checking from ad hoc parse methods into the QAPISchema*.check() methods. But for an error message to display, we first have to fix the overall 'try' to catch those errors. We also want to enable a few more assertions, such as making sure every attempt to raise a semantic error is passed a valid location info, or that various preconditions hold. The general approach for moving error checking will then be to relax an assertion into an if that raises an exception if the condition does not hold, and removing the counterpart ad hoc check done during the parse phase. Signed-off-by: Eric Blake --- v8: no change v7: Split off of v6 7/12, plus other obvious asserts floated up --- scripts/qapi.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index 543b378..4573599 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -103,6 +103,7 @@ class QAPISchemaError(Exception): class QAPIExprError(Exception): def __init__(self, expr_info, msg): Exception.__init__(self) + assert expr_info self.info = expr_info self.msg = msg @@ -964,6 +965,7 @@ class QAPISchemaObjectType(QAPISchemaType): members = [] seen = {} for m in members: + assert c_name(m.name) not in seen seen[m.name] = m for m in self.local_members: m.check(schema, members, seen) @@ -1116,13 +1118,13 @@ class QAPISchema(object): def __init__(self, fname): try: self.exprs = check_exprs(QAPISchemaParser(open(fname, "r")).exprs) + self._entity_dict = {} + self._def_predefineds() + self._def_exprs() + self.check() except (QAPISchemaError, QAPIExprError), err: print >>sys.stderr, err exit(1) - self._entity_dict = {} - self._def_predefineds() - self._def_exprs() - self.check() def _def_entity(self, ent): assert ent.name not in self._entity_dict -- 2.4.3