motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-07-27 04:13:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
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': if self.src == '' or self.src[-1] != '\n':
self.src += '\n' self.src += '\n'
self.cursor = 0 self.cursor = 0
self.info = QAPISourceInfo(fname, 1, incl_info) self.info = QAPISourceInfo(fname, incl_info)
self.line_pos = 0 self.line_pos = 0
self.exprs = [] self.exprs = []
self.docs = [] self.docs = []

10
scripts/qapi/source.py
View file

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