mirror of https://gitee.com/openkylin/qemu.git
qapi2texi: Generate documentation for variant members
A flat union's branch brings in the members of another type. Generate a suitable reference to that type. Example change (qemu-qmp-ref.txt): -- Flat Union: QCryptoBlockOpenOptions The options that are available for all encryption formats when opening an existing volume Members: The members of 'QCryptoBlockOptionsBase' + The members of 'QCryptoBlockOptionsQCow' when 'format' is "qcow" + The members of 'QCryptoBlockOptionsLUKS' when 'format' is "luks" Since: 2.6 A simple union's branch adds a member 'data' of some other type. Generate documentation for that member. Example change (qemu-qmp-ref.txt): -- Simple Union: SocketAddress Captures the address of a socket, which could also be a named file descriptor Members: 'type' Not documented + 'data: InetSocketAddress' when 'type' is "inet" + 'data: UnixSocketAddress' when 'type' is "unix" + 'data: VsockSocketAddress' when 'type' is "vsock" + 'data: String' when 'type' is "fd" Since: 1.3 Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-Id: <1489582656-31133-28-git-send-email-armbru@redhat.com>
This commit is contained in:
parent
88f63467c5
commit
5169cd8767
|
@ -133,17 +133,18 @@ def texi_enum_value(value):
|
||||||
return '@item @code{%s}\n' % value.name
|
return '@item @code{%s}\n' % value.name
|
||||||
|
|
||||||
|
|
||||||
def texi_member(member):
|
def texi_member(member, suffix=''):
|
||||||
"""Format a table of members item for an object type member"""
|
"""Format a table of members item for an object type member"""
|
||||||
typ = member.type.doc_type()
|
typ = member.type.doc_type()
|
||||||
return '@item @code{%s%s%s}%s\n' % (
|
return '@item @code{%s%s%s}%s%s\n' % (
|
||||||
member.name,
|
member.name,
|
||||||
': ' if typ else '',
|
': ' if typ else '',
|
||||||
typ if typ else '',
|
typ if typ else '',
|
||||||
' (optional)' if member.optional else '')
|
' (optional)' if member.optional else '',
|
||||||
|
suffix)
|
||||||
|
|
||||||
|
|
||||||
def texi_members(doc, what, base, member_func):
|
def texi_members(doc, what, base, variants, member_func):
|
||||||
"""Format the table of members"""
|
"""Format the table of members"""
|
||||||
items = ''
|
items = ''
|
||||||
for section in doc.args.itervalues():
|
for section in doc.args.itervalues():
|
||||||
|
@ -154,6 +155,17 @@ def texi_members(doc, what, base, member_func):
|
||||||
items += member_func(section.member) + texi_format(desc) + '\n'
|
items += member_func(section.member) + texi_format(desc) + '\n'
|
||||||
if base:
|
if base:
|
||||||
items += '@item The members of @code{%s}\n' % base.doc_type()
|
items += '@item The members of @code{%s}\n' % base.doc_type()
|
||||||
|
if variants:
|
||||||
|
for v in variants.variants:
|
||||||
|
when = ' when @code{%s} is @t{"%s"}' % (
|
||||||
|
variants.tag_member.name, v.name)
|
||||||
|
if v.type.is_implicit():
|
||||||
|
assert not v.type.base and not v.type.variants
|
||||||
|
for m in v.type.local_members:
|
||||||
|
items += member_func(m, when)
|
||||||
|
else:
|
||||||
|
items += '@item The members of @code{%s}%s\n' % (
|
||||||
|
v.type.doc_type(), when)
|
||||||
if not items:
|
if not items:
|
||||||
return ''
|
return ''
|
||||||
return '\n@b{%s:}\n@table @asis\n%s@end table\n' % (what, items)
|
return '\n@b{%s:}\n@table @asis\n%s@end table\n' % (what, items)
|
||||||
|
@ -176,9 +188,10 @@ def texi_sections(doc):
|
||||||
return body
|
return body
|
||||||
|
|
||||||
|
|
||||||
def texi_entity(doc, what, base=None, member_func=texi_member):
|
def texi_entity(doc, what, base=None, variants=None,
|
||||||
|
member_func=texi_member):
|
||||||
return (texi_body(doc)
|
return (texi_body(doc)
|
||||||
+ texi_members(doc, what, base, member_func)
|
+ texi_members(doc, what, base, variants, member_func)
|
||||||
+ texi_sections(doc))
|
+ texi_sections(doc))
|
||||||
|
|
||||||
|
|
||||||
|
@ -213,7 +226,7 @@ def visit_object_type(self, name, info, base, members, variants):
|
||||||
self.out += '\n'
|
self.out += '\n'
|
||||||
self.out += TYPE_FMT(type=typ,
|
self.out += TYPE_FMT(type=typ,
|
||||||
name=doc.symbol,
|
name=doc.symbol,
|
||||||
body=texi_entity(doc, 'Members', base))
|
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
|
||||||
|
|
Loading…
Reference in New Issue