mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qapi: Concentrate QAPISchemaParser.exprs updates in .__init__()

Browse Source 
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20180211093607.27351-15-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Markus Armbruster 2018-02-11 10:35:52 +01:00 committed by Eric Blake
parent 181feaf355
commit 4257053083
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/qapi/common.py
View File

@ -290,8 +290,12 @@ class QAPISchemaParser(object):
if not isinstance(include, str): if not isinstance(include, str):
raise QAPISemError(info, raise QAPISemError(info,
"Value of 'include' must be a string") "Value of 'include' must be a string")
self._include(include, info, os.path.dirname(self.fname), exprs_include = self._include(include, info,
os.path.dirname(self.fname),
previously_included) previously_included)
if exprs_include:
self.exprs.extend(exprs_include.exprs)
self.docs.extend(exprs_include.docs)
elif "pragma" in expr: elif "pragma" in expr:
self.reject_expr_doc(cur_doc) self.reject_expr_doc(cur_doc)
if len(expr) != 1: if len(expr) != 1:
@ -334,14 +338,13 @@ class QAPISchemaParser(object):
# skip multiple include of the same file # skip multiple include of the same file
if incl_abs_fname in previously_included: if incl_abs_fname in previously_included:
return return None
try: try:
fobj = open(incl_fname, 'r') fobj = open(incl_fname, 'r')
except IOError as e: except IOError as e:
raise QAPISemError(info, '%s: %s' % (e.strerror, incl_fname)) raise QAPISemError(info, '%s: %s' % (e.strerror, incl_fname))
exprs_include = QAPISchemaParser(fobj, previously_included, info) return QAPISchemaParser(fobj, previously_included, info)
self.exprs.extend(exprs_include.exprs)
self.docs.extend(exprs_include.docs)
def _pragma(self, name, value, info): def _pragma(self, name, value, info):
global doc_required, returns_whitelist, name_case_whitelist global doc_required, returns_whitelist, name_case_whitelist