mirror of https://gitee.com/openkylin/linux.git
docs: cdomain.py: extend it to handle new Sphinx 3.x tags
While most of the C domain parsing is done via kernel-doc, some RST files use C domain tags directly. While several of them can be removed for Sphinx < 3.0, due to automarkup.py, and several others that could be converted into kernel-doc markups, changes like that are time-consuming, and may not fit all cases. As we already have the cdomain.py for handing backward compatibility with Sphinx versions below 3.0, let's make it more complete, in order to cover any usage of the newer tags outside kernel-doc. This way, it should be feasible to use the new tags inside the Kernel tree, without losing backward compatibility. This should allow fixing the remaining warnings with the Kernel tags. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
parent
71e552aebf
commit
95f4949051
|
@ -54,7 +54,7 @@ namespace = None
|
||||||
#
|
#
|
||||||
# Handle trivial newer c domain tags that are part of Sphinx 3.1 c domain tags
|
# Handle trivial newer c domain tags that are part of Sphinx 3.1 c domain tags
|
||||||
# - Store the namespace if ".. c:namespace::" tag is found
|
# - Store the namespace if ".. c:namespace::" tag is found
|
||||||
|
#
|
||||||
RE_namespace = re.compile(r'^\s*..\s*c:namespace::\s*(\S+)\s*$')
|
RE_namespace = re.compile(r'^\s*..\s*c:namespace::\s*(\S+)\s*$')
|
||||||
|
|
||||||
def markup_namespace(match):
|
def markup_namespace(match):
|
||||||
|
@ -64,10 +64,48 @@ def markup_namespace(match):
|
||||||
|
|
||||||
return ""
|
return ""
|
||||||
|
|
||||||
|
#
|
||||||
|
# Handle c:macro for function-style declaration
|
||||||
|
#
|
||||||
|
RE_macro = re.compile(r'^\s*..\s*c:macro::\s*(\S+)\s+(\S.*)\s*$')
|
||||||
|
def markup_macro(match):
|
||||||
|
return ".. c:function:: " + match.group(1) + ' ' + match.group(2)
|
||||||
|
|
||||||
|
#
|
||||||
|
# Handle newer c domain tags that are evaluated as .. c:type: for
|
||||||
|
# backward-compatibility with Sphinx < 3.0
|
||||||
|
#
|
||||||
|
RE_ctype = re.compile(r'^\s*..\s*c:(struct|union|enum|enumerator|alias)::\s*(.*)$')
|
||||||
|
|
||||||
|
def markup_ctype(match):
|
||||||
|
return ".. c:type:: " + match.group(2)
|
||||||
|
|
||||||
|
#
|
||||||
|
# Handle newer c domain tags that are evaluated as :c:type: for
|
||||||
|
# backward-compatibility with Sphinx < 3.0
|
||||||
|
#
|
||||||
|
RE_ctype_refs = re.compile(r':c:(var|struct|union|enum|enumerator)::`([^\`]+)`')
|
||||||
|
def markup_ctype_refs(match):
|
||||||
|
return ":c:type:`" + match.group(2) + '`'
|
||||||
|
|
||||||
|
#
|
||||||
|
# Simply convert :c:expr: and :c:texpr: into a literal block.
|
||||||
|
#
|
||||||
|
RE_expr = re.compile(r':c:(expr|texpr):`([^\`]+)`')
|
||||||
|
def markup_c_expr(match):
|
||||||
|
return '\ ``' + match.group(2) + '``\ '
|
||||||
|
|
||||||
|
#
|
||||||
|
# Parse Sphinx 3.x C markups, replacing them by backward-compatible ones
|
||||||
|
#
|
||||||
def c_markups(app, docname, source):
|
def c_markups(app, docname, source):
|
||||||
result = ""
|
result = ""
|
||||||
markup_func = {
|
markup_func = {
|
||||||
RE_namespace: markup_namespace,
|
RE_namespace: markup_namespace,
|
||||||
|
RE_expr: markup_c_expr,
|
||||||
|
RE_macro: markup_macro,
|
||||||
|
RE_ctype: markup_ctype,
|
||||||
|
RE_ctype_refs: markup_ctype_refs,
|
||||||
}
|
}
|
||||||
|
|
||||||
lines = iter(source[0].splitlines(True))
|
lines = iter(source[0].splitlines(True))
|
||||||
|
|
Loading…
Reference in New Issue