From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54787) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1coOtT-00067n-Vg for qemu-devel@nongnu.org; Thu, 16 Mar 2017 02:28:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1coOtQ-00075e-GK for qemu-devel@nongnu.org; Thu, 16 Mar 2017 02:28:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38284) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1coOtQ-00071z-4N for qemu-devel@nongnu.org; Thu, 16 Mar 2017 02:28:12 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2D84380F97 for ; Thu, 16 Mar 2017 06:28:12 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EA7891754C for ; Thu, 16 Mar 2017 06:28:11 +0000 (UTC) From: Markus Armbruster Date: Thu, 16 Mar 2017 07:27:41 +0100 Message-Id: <1489645685-4750-26-git-send-email-armbru@redhat.com> In-Reply-To: <1489645685-4750-1-git-send-email-armbru@redhat.com> References: <1489645685-4750-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PULL for 2.9 25/49] qapi2texi: Don't hide undocumented members and arguments List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Show undocumented object, alternate type members and command, event arguments exactly like undocumented enumeration type values. Example change (qemu-qmp-ref.txt): -- Command: query-rocker Return rocker switch information. + Arguments: + 'name' + Not documented + Returns: 'Rocker' information Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Message-Id: <1489582656-31133-24-git-send-email-armbru@redhat.com> --- scripts/qapi2texi.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/scripts/qapi2texi.py b/scripts/qapi2texi.py index 1f01817..df87441 100755 --- a/scripts/qapi2texi.py +++ b/scripts/qapi2texi.py @@ -139,12 +139,10 @@ def texi_member(member): member.name, ' (optional)' if member.optional else '') -def texi_members(doc, what, member_func, show_undocumented): +def texi_members(doc, what, member_func): """Format the table of members""" items = '' for section in doc.args.itervalues(): - if not section.content and not show_undocumented: - continue # Undocumented TODO require doc and drop if section.content: desc = str(section) else: @@ -172,10 +170,9 @@ def texi_sections(doc): return body -def texi_entity(doc, what, member_func=texi_member, - show_undocumented=False): +def texi_entity(doc, what, member_func=texi_member): return (texi_body(doc) - + texi_members(doc, what, member_func, show_undocumented) + + texi_members(doc, what, member_func) + texi_sections(doc)) @@ -194,8 +191,7 @@ class QAPISchemaGenDocVisitor(qapi.QAPISchemaVisitor): self.out += TYPE_FMT(type='Enum', name=doc.symbol, body=texi_entity(doc, 'Values', - member_func=texi_enum_value, - show_undocumented=True)) + member_func=texi_enum_value)) def visit_object_type(self, name, info, base, members, variants): doc = self.cur_doc -- 2.7.4