Commit 597494ab authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Markus Armbruster
Browse files

qapi2texi: change texi formatters 



STRUCT_FMT is generic enough, rename it to TYPE_FMT, use it for unions.

Rename COMMAND_FMT to MSG_FMT, since it applies to both commands and
events.

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20170125130308.16104-2-marcandre.lureau@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent 1883ff34

scripts/qapi2texi.py

+19 −27
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ import sys 


import qapi



COMMAND_FMT = """

MSG_FMT = """

@deftypefn {type} {{}} {name}



{body}
@@ -18,16 +18,7 @@ COMMAND_FMT = """ 


""".format



ENUM_FMT = """

@deftp Enum {name}



{body}



@end deftp



""".format



STRUCT_FMT = """

TYPE_FMT = """

@deftp {{{type}}} {name}



{body}
@@ -170,7 +161,7 @@ def texi_body(doc): 
def texi_alternate(expr, doc):

    """Format an alternate to texi"""

    body = texi_body(doc)

    return STRUCT_FMT(type="Alternate",

    return TYPE_FMT(type="Alternate",

                    name=doc.symbol,

                    body=body)
@@ -184,7 +175,7 @@ def texi_union(expr, doc): 
        union = "Simple Union"



    body = texi_body(doc)

    return STRUCT_FMT(type=union,

    return TYPE_FMT(type=union,

                    name=doc.symbol,

                    body=body)
@@ -195,14 +186,15 @@ def texi_enum(expr, doc): 
        if i not in doc.args:

            doc.args[i] = ''

    body = texi_body(doc)

    return ENUM_FMT(name=doc.symbol,

    return TYPE_FMT(type="Enum",

                    name=doc.symbol,

                    body=body)





def texi_struct(expr, doc):

    """Format a struct to texi"""

    body = texi_body(doc)

    return STRUCT_FMT(type="Struct",

    return TYPE_FMT(type="Struct",

                    name=doc.symbol,

                    body=body)
@@ -210,7 +202,7 @@ def texi_struct(expr, doc): 
def texi_command(expr, doc):

    """Format a command to texi"""

    body = texi_body(doc)

    return COMMAND_FMT(type="Command",

    return MSG_FMT(type="Command",

                   name=doc.symbol,

                   body=body)
@@ -218,7 +210,7 @@ def texi_command(expr, doc): 
def texi_event(expr, doc):

    """Format an event to texi"""

    body = texi_body(doc)

    return COMMAND_FMT(type="Event",

    return MSG_FMT(type="Event",

                   name=doc.symbol,

                   body=body)