qapi2texi: De-duplicate code to add blank line before symbol

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20171002141341.24616-12-armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Markus Armbruster 2017-10-02 16:13:41 +02:00
parent 8cbf1a537a
commit 7e21572ce7
1 changed files with 2 additions and 10 deletions

View File

@ -206,8 +206,6 @@ class QAPISchemaGenDocVisitor(qapi.QAPISchemaVisitor):
def visit_enum_type(self, name, info, values, prefix): def visit_enum_type(self, name, info, values, prefix):
doc = self.cur_doc doc = self.cur_doc
if self.out:
self.out += '\n'
self.out += TYPE_FMT(type='Enum', self.out += TYPE_FMT(type='Enum',
name=doc.symbol, name=doc.symbol,
body=texi_entity(doc, 'Values', body=texi_entity(doc, 'Values',
@ -217,16 +215,12 @@ class QAPISchemaGenDocVisitor(qapi.QAPISchemaVisitor):
doc = self.cur_doc doc = self.cur_doc
if base and base.is_implicit(): if base and base.is_implicit():
base = None base = None
if self.out:
self.out += '\n'
self.out += TYPE_FMT(type='Object', self.out += TYPE_FMT(type='Object',
name=doc.symbol, name=doc.symbol,
body=texi_entity(doc, 'Members', base, variants)) body=texi_entity(doc, 'Members', base, variants))
def visit_alternate_type(self, name, info, variants): def visit_alternate_type(self, name, info, variants):
doc = self.cur_doc doc = self.cur_doc
if self.out:
self.out += '\n'
self.out += TYPE_FMT(type='Alternate', self.out += TYPE_FMT(type='Alternate',
name=doc.symbol, name=doc.symbol,
body=texi_entity(doc, 'Members')) body=texi_entity(doc, 'Members'))
@ -234,8 +228,6 @@ class QAPISchemaGenDocVisitor(qapi.QAPISchemaVisitor):
def visit_command(self, name, info, arg_type, ret_type, def visit_command(self, name, info, arg_type, ret_type,
gen, success_response, boxed): gen, success_response, boxed):
doc = self.cur_doc doc = self.cur_doc
if self.out:
self.out += '\n'
if boxed: if boxed:
body = texi_body(doc) body = texi_body(doc)
body += ('\n@b{Arguments:} the members of @code{%s}\n' body += ('\n@b{Arguments:} the members of @code{%s}\n'
@ -249,13 +241,13 @@ class QAPISchemaGenDocVisitor(qapi.QAPISchemaVisitor):
def visit_event(self, name, info, arg_type, boxed): def visit_event(self, name, info, arg_type, boxed):
doc = self.cur_doc doc = self.cur_doc
if self.out:
self.out += '\n'
self.out += MSG_FMT(type='Event', self.out += MSG_FMT(type='Event',
name=doc.symbol, name=doc.symbol,
body=texi_entity(doc, 'Arguments')) body=texi_entity(doc, 'Arguments'))
def symbol(self, doc, entity): def symbol(self, doc, entity):
if self.out:
self.out += '\n'
self.cur_doc = doc self.cur_doc = doc
entity.visit(self) entity.visit(self)
self.cur_doc = None self.cur_doc = None