OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qapi/source: Remove line number from QAPISourceInfo initializer

Browse Source 
With the QAPISourceInfo(None, None, None) construct gone, there's no
longer any reason to have to specify that a file starts on the first
line. Remove it from the initializer and default it to 1.

Remove the last vestiges where we check for 'line' being unset, that
can't happen, now.

Signed-off-by: John Snow <jsnow@redhat.com>
Message-Id: <20210519183951.3946870-4-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:39 -04:00 committed by Markus Armbruster
parent 334c3cd58a
commit b2b31fdf9b
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/qapi/parser.py
View File

@ -47,7 +47,7 @@ class QAPISchemaParser:
if self.src == '' or self.src[-1] != '\n':
self.src += '\n'
self.cursor = 0
self.info = QAPISourceInfo(fname, 1, incl_info)
self.info = QAPISourceInfo(fname, incl_info)
self.line_pos = 0
self.exprs = []
self.docs = []

10
scripts/qapi/source.py
View File

@ -31,10 +31,9 @@ class QAPISchemaPragma:
class QAPISourceInfo:
T = TypeVar('T', bound='QAPISourceInfo')
def __init__(self, fname: str, line: int,
parent: Optional['QAPISourceInfo']):
def __init__(self, fname: str, parent: Optional['QAPISourceInfo']):
self.fname = fname
self.line = line
self.line = 1
self.parent = parent
self.pragma: QAPISchemaPragma = (
parent.pragma if parent else QAPISchemaPragma()
@ -52,10 +51,7 @@ class QAPISourceInfo:
return info
def loc(self) -> str:
ret = self.fname
if self.line is not None:
ret += ':%d' % self.line
return ret
return f"{self.fname}:{self.line}"
def in_defn(self) -> str:
if self.defn_name: