docs: kdoc: split the processing of the two remaining inline states

Now that "inline_*" are just ordinary parser states, split them into two
separate functions, getting rid of some nested conditional logic.

The original process_inline() would simply ignore lines that didn't match
any of the regexes (those lacking the initial " * " marker).  I have
preserved that behavior, but we should perhaps emit a warning instead.

Signed-off-by: Jonathan Corbet <corbet@lwn.net>
This commit is contained in:
Jonathan Corbet
2025-06-27 12:23:05 -06:00
parent 096f73ab01
commit c7eedb0941

View File

@@ -1448,31 +1448,30 @@ class KernelDoc:
# Unknown line, ignore
self.emit_msg(ln, f"bad line: {line}")
def process_inline(self, ln, line):
"""STATE_INLINE: docbook comments within a prototype."""
def process_inline_name(self, ln, line):
"""STATE_INLINE_NAME: beginning of docbook comments within a prototype."""
if self.state == state.INLINE_NAME and \
doc_inline_sect.search(line):
if doc_inline_sect.search(line):
self.entry.begin_section(ln, doc_inline_sect.group(1))
self.entry.add_text(doc_inline_sect.group(2).lstrip())
self.state = state.INLINE_TEXT
# Documentation block end */
return
elif doc_inline_end.search(line):
self.dump_section()
self.state = state.PROTO
elif doc_content.search(line):
self.emit_msg(ln, f"Incorrect use of kernel-doc format: {line}")
self.state = state.PROTO
# else ... ??
def process_inline_text(self, ln, line):
"""STATE_INLINE_TEXT: docbook comments within a prototype."""
if doc_inline_end.search(line):
self.dump_section()
self.state = state.PROTO
return
if doc_content.search(line):
if self.state == state.INLINE_TEXT:
self.entry.add_text(doc_content.group(1))
elif self.state == state.INLINE_NAME:
self.emit_msg(ln,
f"Incorrect use of kernel-doc format: {line}")
self.state = state.PROTO
elif doc_content.search(line):
self.entry.add_text(doc_content.group(1))
# else ... ??
def syscall_munge(self, ln, proto): # pylint: disable=W0613
"""
@@ -1699,8 +1698,8 @@ class KernelDoc:
state.BODY: process_body,
state.DECLARATION: process_decl,
state.SPECIAL_SECTION: process_special,
state.INLINE_NAME: process_inline,
state.INLINE_TEXT: process_inline,
state.INLINE_NAME: process_inline_name,
state.INLINE_TEXT: process_inline_text,
state.PROTO: process_proto,
state.DOCBLOCK: process_docblock,
}