ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qapi/parser: factor parsing routine into method 

For the sake of keeping __init__ smaller (and treating it more like a
gallery of what state variables we can expect to see), put the actual
parsing action into a parse method. It remains invoked from the init
method to reduce churn.

To accomplish this, @previously_included becomes the private data
member ._included, and the filename is stashed as ._fname.

Add any missing declarations to the init method, and group them by
function so they can be understood quickly at a glance.

Signed-off-by: John Snow <jsnow@redhat.com>
Message-Id: <20210519183951.3946870-5-jsnow@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
John Snow 2021-05-19 14:39:40 -04:00 committed by Markus Armbruster
parent b2b31fdf9b
commit 16ff40acc9
1 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
scripts/qapi/parser.py
View File

@ -37,23 +37,39 @@ class QAPIParseError(QAPISourceError):
class QAPISchemaParser: class QAPISchemaParser:
def __init__(self, fname, previously_included=None, incl_info=None): def __init__(self, fname, previously_included=None, incl_info=None):
previously_included = previously_included or set() self._fname = fname
previously_included.add(os.path.abspath(fname)) self._included = previously_included or set()
self._included.add(os.path.abspath(self._fname))
self.src = ''
# May raise OSError; allow the caller to handle it. # Lexer state (see `accept` for details):
with open(fname, 'r', encoding='utf-8') as fp: self.info = QAPISourceInfo(self._fname, incl_info)
self.src = fp.read() self.tok = None
self.pos = 0
if self.src == '' or self.src[-1] != '\n':
self.src += '\n'
self.cursor = 0 self.cursor = 0
self.info = QAPISourceInfo(fname, incl_info) self.val = None
self.line_pos = 0 self.line_pos = 0
# Parser output:
self.exprs = [] self.exprs = []
self.docs = [] self.docs = []
self.accept()
# Showtime!
self._parse()
def _parse(self):
cur_doc = None cur_doc = None
# May raise OSError; allow the caller to handle it.
with open(self._fname, 'r', encoding='utf-8') as fp:
self.src = fp.read()
if self.src == '' or self.src[-1] != '\n':
self.src += '\n'
# Prime the lexer:
self.accept()
# Parse until done:
while self.tok is not None: while self.tok is not None:
info = self.info info = self.info
if self.tok == '#': if self.tok == '#':
@ -71,12 +87,12 @@ class QAPISchemaParser:
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")
incl_fname = os.path.join(os.path.dirname(fname), incl_fname = os.path.join(os.path.dirname(self._fname),
include) include)
self.exprs.append({'expr': {'include': incl_fname}, self.exprs.append({'expr': {'include': incl_fname},
'info': info}) 'info': info})
exprs_include = self._include(include, info, incl_fname, exprs_include = self._include(include, info, incl_fname,
previously_included) self._included)
if exprs_include: if exprs_include:
self.exprs.extend(exprs_include.exprs) self.exprs.extend(exprs_include.exprs)
self.docs.extend(exprs_include.docs) self.docs.extend(exprs_include.docs)