[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH RFC 12/21] qapi: Concentrate QAPISchemaParser.ex
From: |
Marc-Andre Lureau |
Subject: |
Re: [Qemu-devel] [PATCH RFC 12/21] qapi: Concentrate QAPISchemaParser.exprs updates in .__init__() |
Date: |
Mon, 5 Feb 2018 14:45:26 +0100 |
On Fri, Feb 2, 2018 at 2:03 PM, Markus Armbruster <address@hidden> wrote:
> Signed-off-by: Markus Armbruster <address@hidden>
It's not obvious the motivation behind this change (beside behind more
elegant), but
Reviewed-by: Marc-André Lureau <address@hidden>
> ---
> scripts/qapi/common.py | 15 +++++++++------
> 1 file changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py
> index d334e1db5a..7a327bfe9f 100644
> --- a/scripts/qapi/common.py
> +++ b/scripts/qapi/common.py
> @@ -286,8 +286,12 @@ class QAPISchemaParser(object):
> if not isinstance(include, str):
> raise QAPISemError(info,
> "Value of 'include' must be a string")
> - self._include(include, info, os.path.dirname(self.fname),
> - previously_included)
> + exprs_include = self._include(include, info,
> + os.path.dirname(self.fname),
> + previously_included)
> + if exprs_include:
> + self.exprs.extend(exprs_include.exprs)
> + self.docs.extend(exprs_include.docs)
> elif "pragma" in expr:
> self.reject_expr_doc(cur_doc)
> if len(expr) != 1:
> @@ -330,14 +334,13 @@ class QAPISchemaParser(object):
>
> # skip multiple include of the same file
> if incl_abs_fname in previously_included:
> - return
> + return None
> +
> try:
> fobj = open(incl_fname, 'r')
> except IOError as e:
> raise QAPISemError(info, '%s: %s' % (e.strerror, incl_fname))
> - exprs_include = QAPISchemaParser(fobj, previously_included, info)
> - self.exprs.extend(exprs_include.exprs)
> - self.docs.extend(exprs_include.docs)
> + return QAPISchemaParser(fobj, previously_included, info)
>
> def _pragma(self, name, value, info):
> global doc_required, returns_whitelist, name_case_whitelist
> --
> 2.13.6
>
- Re: [Qemu-devel] [PATCH RFC 11/21] qapi: Lift error reporting from QAPISchema.__init__() to callers, (continued)
- [Qemu-devel] [PATCH RFC 21/21] qapi: Empty out qapi-schema.json, Markus Armbruster, 2018/02/02
- [Qemu-devel] [PATCH RFC 04/21] qapi: Reduce use of global variables in generators some, Markus Armbruster, 2018/02/02
- [Qemu-devel] [PATCH RFC 18/21] qapi/common: Fix guardname() for funny filenames, Markus Armbruster, 2018/02/02
- [Qemu-devel] [PATCH RFC 12/21] qapi: Concentrate QAPISchemaParser.exprs updates in .__init__(), Markus Armbruster, 2018/02/02
- Re: [Qemu-devel] [PATCH RFC 12/21] qapi: Concentrate QAPISchemaParser.exprs updates in .__init__(),
Marc-Andre Lureau <=
- [Qemu-devel] [PATCH RFC 08/21] qapi: Touch generated files only when they change, Markus Armbruster, 2018/02/02
- [Qemu-devel] [PATCH RFC 20/21] Include less of qapi-types.h, Markus Armbruster, 2018/02/02
- [Qemu-devel] [PATCH RFC 16/21] qapi/types qapi/visit: Make visitors use QAPIGen more, Markus Armbruster, 2018/02/02
- [Qemu-devel] [PATCH RFC 05/21] qapi: Turn generators into modules, Markus Armbruster, 2018/02/02