2016-05-18 14:30:30 -06:00
|
|
|
# coding=utf-8
|
|
|
|
#
|
|
|
|
# Copyright © 2016 Intel Corporation
|
|
|
|
#
|
|
|
|
# Permission is hereby granted, free of charge, to any person obtaining a
|
|
|
|
# copy of this software and associated documentation files (the "Software"),
|
|
|
|
# to deal in the Software without restriction, including without limitation
|
|
|
|
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
|
|
# and/or sell copies of the Software, and to permit persons to whom the
|
|
|
|
# Software is furnished to do so, subject to the following conditions:
|
|
|
|
#
|
|
|
|
# The above copyright notice and this permission notice (including the next
|
|
|
|
# paragraph) shall be included in all copies or substantial portions of the
|
|
|
|
# Software.
|
|
|
|
#
|
|
|
|
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
|
|
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
|
|
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
|
|
|
# IN THE SOFTWARE.
|
|
|
|
#
|
|
|
|
# Authors:
|
|
|
|
# Jani Nikula <jani.nikula@intel.com>
|
2016-05-31 09:09:12 -06:00
|
|
|
#
|
|
|
|
# Please make sure this works on both python2 and python3.
|
|
|
|
#
|
2016-05-18 14:30:30 -06:00
|
|
|
|
|
|
|
import os
|
|
|
|
import subprocess
|
|
|
|
import sys
|
doc/sphinx: Track line-number of starting blocks
Design is pretty simple: kernel-doc inserts breadcrumbs with line
numbers, and sphinx picks them up. At first I went with a sphinx
comment, but inserting those at random places seriously upsets the
parser, and must be filtered. Hence why this version now uses "#define
LINEO " since one of these ever escape into output it's pretty clear
there is a bug.
It seems to work well, and at least the 2-3 errors where sphinx
complained about something that was not correct in kernel-doc text the
line numbers matched up perfectly.
v2: Instead of noodling around in the parser state machine, create
a ViewList and parse it ourselves. This seems to be the recommended
way, per Jani's suggestion.
v3:
- Split out ViewList pach. Splitting the kernel-doc changes from the
sphinx ones isn't possible, since emitting the LINENO lines wreaks
havoc with the rst formatting. We must filter them.
- Improve the regex per Jani's suggestions, and compile it just once
for speed.
- Now that LINENO lines are eaten, also add them to function parameter
descriptions. Much less content and offset than for in-line struct
member descriptions, but still nice to know which exact continuation
line upsets sphinx.
- Simplify/clarify the line +/-1 business a bit.
v4: Split out the scripts/kernel-doc changes and make line-numbers
opt-in, as suggested by Jani.
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: linux-doc@vger.kernel.org
Cc: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
2016-06-03 14:21:35 -06:00
|
|
|
import re
|
2016-05-18 14:30:30 -06:00
|
|
|
|
|
|
|
from docutils import nodes, statemachine
|
2016-06-02 06:59:18 -06:00
|
|
|
from docutils.statemachine import ViewList
|
2016-05-18 14:30:30 -06:00
|
|
|
from docutils.parsers.rst import directives
|
|
|
|
from sphinx.util.compat import Directive
|
|
|
|
|
|
|
|
class KernelDocDirective(Directive):
|
|
|
|
"""Extract kernel-doc comments from the specified file"""
|
|
|
|
required_argument = 1
|
|
|
|
optional_arguments = 4
|
|
|
|
option_spec = {
|
|
|
|
'doc': directives.unchanged_required,
|
|
|
|
'functions': directives.unchanged_required,
|
|
|
|
'export': directives.flag,
|
|
|
|
'internal': directives.flag,
|
|
|
|
}
|
|
|
|
has_content = False
|
|
|
|
|
|
|
|
def run(self):
|
|
|
|
env = self.state.document.settings.env
|
doc/sphinx: Track line-number of starting blocks
Design is pretty simple: kernel-doc inserts breadcrumbs with line
numbers, and sphinx picks them up. At first I went with a sphinx
comment, but inserting those at random places seriously upsets the
parser, and must be filtered. Hence why this version now uses "#define
LINEO " since one of these ever escape into output it's pretty clear
there is a bug.
It seems to work well, and at least the 2-3 errors where sphinx
complained about something that was not correct in kernel-doc text the
line numbers matched up perfectly.
v2: Instead of noodling around in the parser state machine, create
a ViewList and parse it ourselves. This seems to be the recommended
way, per Jani's suggestion.
v3:
- Split out ViewList pach. Splitting the kernel-doc changes from the
sphinx ones isn't possible, since emitting the LINENO lines wreaks
havoc with the rst formatting. We must filter them.
- Improve the regex per Jani's suggestions, and compile it just once
for speed.
- Now that LINENO lines are eaten, also add them to function parameter
descriptions. Much less content and offset than for in-line struct
member descriptions, but still nice to know which exact continuation
line upsets sphinx.
- Simplify/clarify the line +/-1 business a bit.
v4: Split out the scripts/kernel-doc changes and make line-numbers
opt-in, as suggested by Jani.
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: linux-doc@vger.kernel.org
Cc: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
2016-06-03 14:21:35 -06:00
|
|
|
cmd = [env.config.kerneldoc_bin, '-rst', '-enable-lineno']
|
2016-05-18 14:30:30 -06:00
|
|
|
|
|
|
|
filename = env.config.kerneldoc_srctree + '/' + self.arguments[0]
|
|
|
|
|
|
|
|
# Tell sphinx of the dependency
|
|
|
|
env.note_dependency(os.path.abspath(filename))
|
|
|
|
|
|
|
|
tab_width = self.options.get('tab-width', self.state.document.settings.tab_width)
|
2016-06-01 03:12:42 -06:00
|
|
|
source = filename
|
2016-05-18 14:30:30 -06:00
|
|
|
|
|
|
|
# FIXME: make this nicer and more robust against errors
|
|
|
|
if 'export' in self.options:
|
|
|
|
cmd += ['-export']
|
|
|
|
elif 'internal' in self.options:
|
|
|
|
cmd += ['-internal']
|
|
|
|
elif 'doc' in self.options:
|
|
|
|
cmd += ['-function', str(self.options.get('doc'))]
|
|
|
|
elif 'functions' in self.options:
|
|
|
|
for f in str(self.options.get('functions')).split(' '):
|
|
|
|
cmd += ['-function', f]
|
|
|
|
|
|
|
|
cmd += [filename]
|
|
|
|
|
|
|
|
try:
|
|
|
|
env.app.verbose('calling kernel-doc \'%s\'' % (" ".join(cmd)))
|
|
|
|
|
|
|
|
p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True)
|
|
|
|
out, err = p.communicate()
|
|
|
|
|
2016-05-31 09:09:12 -06:00
|
|
|
# python2 needs conversion to unicode.
|
|
|
|
# python3 with universal_newlines=True returns strings.
|
|
|
|
if sys.version_info.major < 3:
|
|
|
|
out, err = unicode(out, 'utf-8'), unicode(err, 'utf-8')
|
2016-05-18 14:30:30 -06:00
|
|
|
|
|
|
|
if p.returncode != 0:
|
|
|
|
sys.stderr.write(err)
|
|
|
|
|
|
|
|
env.app.warn('kernel-doc \'%s\' failed with return code %d' % (" ".join(cmd), p.returncode))
|
|
|
|
return [nodes.error(None, nodes.paragraph(text = "kernel-doc missing"))]
|
|
|
|
elif env.config.kerneldoc_verbosity > 0:
|
|
|
|
sys.stderr.write(err)
|
|
|
|
|
|
|
|
lines = statemachine.string2lines(out, tab_width, convert_whitespace=True)
|
doc/sphinx: Track line-number of starting blocks
Design is pretty simple: kernel-doc inserts breadcrumbs with line
numbers, and sphinx picks them up. At first I went with a sphinx
comment, but inserting those at random places seriously upsets the
parser, and must be filtered. Hence why this version now uses "#define
LINEO " since one of these ever escape into output it's pretty clear
there is a bug.
It seems to work well, and at least the 2-3 errors where sphinx
complained about something that was not correct in kernel-doc text the
line numbers matched up perfectly.
v2: Instead of noodling around in the parser state machine, create
a ViewList and parse it ourselves. This seems to be the recommended
way, per Jani's suggestion.
v3:
- Split out ViewList pach. Splitting the kernel-doc changes from the
sphinx ones isn't possible, since emitting the LINENO lines wreaks
havoc with the rst formatting. We must filter them.
- Improve the regex per Jani's suggestions, and compile it just once
for speed.
- Now that LINENO lines are eaten, also add them to function parameter
descriptions. Much less content and offset than for in-line struct
member descriptions, but still nice to know which exact continuation
line upsets sphinx.
- Simplify/clarify the line +/-1 business a bit.
v4: Split out the scripts/kernel-doc changes and make line-numbers
opt-in, as suggested by Jani.
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: linux-doc@vger.kernel.org
Cc: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
2016-06-03 14:21:35 -06:00
|
|
|
result = ViewList()
|
|
|
|
|
|
|
|
lineoffset = 0;
|
|
|
|
line_regex = re.compile("^#define LINENO ([0-9]+)$")
|
|
|
|
for line in lines:
|
|
|
|
match = line_regex.search(line)
|
|
|
|
if match:
|
|
|
|
# sphinx counts lines from 0
|
|
|
|
lineoffset = int(match.group(1)) - 1
|
|
|
|
# we must eat our comments since the upset the markup
|
|
|
|
else:
|
|
|
|
result.append(line, source, lineoffset)
|
|
|
|
lineoffset += 1
|
2016-06-02 06:59:18 -06:00
|
|
|
|
|
|
|
node = nodes.section()
|
|
|
|
node.document = self.state.document
|
|
|
|
self.state.nested_parse(result, self.content_offset, node)
|
|
|
|
|
|
|
|
return node.children
|
|
|
|
|
2016-05-18 14:30:30 -06:00
|
|
|
except Exception as e:
|
|
|
|
env.app.warn('kernel-doc \'%s\' processing failed with: %s' %
|
|
|
|
(" ".join(cmd), str(e)))
|
|
|
|
return [nodes.error(None, nodes.paragraph(text = "kernel-doc missing"))]
|
|
|
|
|
|
|
|
def setup(app):
|
|
|
|
app.add_config_value('kerneldoc_bin', None, 'env')
|
|
|
|
app.add_config_value('kerneldoc_srctree', None, 'env')
|
|
|
|
app.add_config_value('kerneldoc_verbosity', 1, 'env')
|
|
|
|
|
|
|
|
app.add_directive('kernel-doc', KernelDocDirective)
|