[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 04/15] qapi/parser: factor parsing routine into method
From: |
Markus Armbruster |
Subject: |
[PULL 04/15] qapi/parser: factor parsing routine into method |
Date: |
Thu, 20 May 2021 19:52:45 +0200 |
From: John Snow <jsnow@redhat.com>
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>
---
scripts/qapi/parser.py | 40 ++++++++++++++++++++++++++++------------
1 file changed, 28 insertions(+), 12 deletions(-)
diff --git a/scripts/qapi/parser.py b/scripts/qapi/parser.py
index 39dbcc4eac..d620706fff 100644
--- a/scripts/qapi/parser.py
+++ b/scripts/qapi/parser.py
@@ -37,23 +37,39 @@ def __init__(self, parser, msg):
class QAPISchemaParser:
def __init__(self, fname, previously_included=None, incl_info=None):
- previously_included = previously_included or set()
- previously_included.add(os.path.abspath(fname))
+ self._fname = 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.
- with open(fname, 'r', encoding='utf-8') as fp:
- self.src = fp.read()
-
- if self.src == '' or self.src[-1] != '\n':
- self.src += '\n'
+ # Lexer state (see `accept` for details):
+ self.info = QAPISourceInfo(self._fname, incl_info)
+ self.tok = None
+ self.pos = 0
self.cursor = 0
- self.info = QAPISourceInfo(fname, incl_info)
+ self.val = None
self.line_pos = 0
+
+ # Parser output:
self.exprs = []
self.docs = []
- self.accept()
+
+ # Showtime!
+ self._parse()
+
+ def _parse(self):
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:
info = self.info
if self.tok == '#':
@@ -71,12 +87,12 @@ def __init__(self, fname, previously_included=None,
incl_info=None):
if not isinstance(include, str):
raise QAPISemError(info,
"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)
self.exprs.append({'expr': {'include': incl_fname},
'info': info})
exprs_include = self._include(include, info, incl_fname,
- previously_included)
+ self._included)
if exprs_include:
self.exprs.extend(exprs_include.exprs)
self.docs.extend(exprs_include.docs)
--
2.26.3
- [PULL 00/15] QAPI patches patches for 2021-05-20, Markus Armbruster, 2021/05/20
- [PULL 09/15] qapi: add must_match helper, Markus Armbruster, 2021/05/20
- [PULL 10/15] qapi/parser: Fix token membership tests when token can be None, Markus Armbruster, 2021/05/20
- [PULL 06/15] qapi/parser: enforce all top-level expressions must be dict in _parse(), Markus Armbruster, 2021/05/20
- [PULL 11/15] qapi/parser: Rework _check_pragma_list_of_str as a TypeGuard, Markus Armbruster, 2021/05/20
- [PULL 01/15] qapi/parser: Don't try to handle file errors, Markus Armbruster, 2021/05/20
- [PULL 04/15] qapi/parser: factor parsing routine into method,
Markus Armbruster <=
- [PULL 15/15] qapi/parser: add docstrings, Markus Armbruster, 2021/05/20
- [PULL 13/15] qapi/parser: Remove superfluous list comprehension, Markus Armbruster, 2021/05/20
- [PULL 07/15] qapi/parser: assert object keys are strings, Markus Armbruster, 2021/05/20
- [PULL 02/15] qapi: Add test for nonexistent schema file, Markus Armbruster, 2021/05/20
- [PULL 05/15] qapi/parser: Assert lexer value is a string, Markus Armbruster, 2021/05/20
- [PULL 03/15] qapi/source: Remove line number from QAPISourceInfo initializer, Markus Armbruster, 2021/05/20
- [PULL 08/15] qapi/parser: Use @staticmethod where appropriate, Markus Armbruster, 2021/05/20
- [PULL 12/15] qapi/parser: add type hint annotations, Markus Armbruster, 2021/05/20
- [PULL 14/15] qapi/parser: allow 'ch' variable name, Markus Armbruster, 2021/05/20
- Re: [PULL 00/15] QAPI patches patches for 2021-05-20, Peter Maydell, 2021/05/21