IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Allow commas in option desc parameters.

Browse Source
This commit is contained in:
Georg Brandl 2008-04-27 15:24:20 +00:00
parent ed68fefabe
commit 6d51bd128e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sphinx/directives.py
View File

@ -190,7 +190,7 @@ def parse_py_signature(signode, sig, desctype, env):
c_sig_re = re.compile( c_sig_re = re.compile(
r'''^([^(]*?) # return type r'''^([^(]*?) # return type
(\w+) \s* # thing name ([\w:]+) \s* # thing name (colon allowed for C++ class names)
(?: \((.*)\) )? $ # optionally arguments (?: \((.*)\) )? $ # optionally arguments
''', re.VERBOSE) ''', re.VERBOSE)
c_funcptr_sig_re = re.compile( c_funcptr_sig_re = re.compile(
@ -220,7 +220,7 @@ def parse_c_type(node, ctype):
node += tnode node += tnode
def parse_c_signature(signode, sig, desctype): def parse_c_signature(signode, sig, desctype):
"""Transform a C-language signature into RST nodes.""" """Transform a C (or C++) signature into RST nodes."""
# first try the function pointer signature regex, it's more specific # first try the function pointer signature regex, it's more specific
m = c_funcptr_sig_re.match(sig) m = c_funcptr_sig_re.match(sig)
if m is None: if m is None:
@ -276,7 +276,8 @@ def parse_opcode_signature(signode, sig):
return opname.strip() return opname.strip()
option_desc_re = re.compile(r'(/|-|--)([-_a-zA-Z0-9]+)(\s*.*?)(?=,|$)') option_desc_re = re.compile(
r'(/|-|--)([-_a-zA-Z0-9]+)(\s*.*?)(?=,\s+(?:/|-|--)|$)')
def parse_option_desc(signode, sig): def parse_option_desc(signode, sig):
"""Transform an option description into RST nodes.""" """Transform an option description into RST nodes."""