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

Fix C domain bugs found by new tests: allow dot in member names, select index entry by correct objtype.

Browse Source
This commit is contained in:
Georg Brandl 2009-09-08 12:08:34 +02:00
parent abc7597d06
commit ec68f705ed
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sphinx/domains/c.py
View File

@ -30,7 +30,7 @@ wsplit_re = re.compile(r'(\W+)')
# REs for C signatures # REs for C signatures
c_sig_re = re.compile( c_sig_re = re.compile(
r'''^([^(]*?) # return type r'''^([^(]*?) # return type
([\w:]+) \s* # thing name (colon allowed for C++ class names) ([\w:.]+) \s* # thing name (colon allowed for C++ class names)
(?: \((.*)\) )? # optionally arguments (?: \((.*)\) )? # optionally arguments
(\s+const)? $ # const specifier (\s+const)? $ # const specifier
''', re.VERBOSE) ''', re.VERBOSE)
@ -91,7 +91,7 @@ class CObject(ObjectDescription):
if m: if m:
name = m.group(1) name = m.group(1)
if not arglist: if not arglist:
if self.objtype == 'cfunction': if self.objtype == 'function':
# for functions, add an empty parameter list # for functions, add an empty parameter list
signode += addnodes.desc_parameterlist() signode += addnodes.desc_parameterlist()
if const: if const:
@ -120,15 +120,15 @@ class CObject(ObjectDescription):
return name return name
def get_index_text(self, name): def get_index_text(self, name):
if self.objtype == 'cfunction': if self.objtype == 'function':
return _('%s (C function)') % name return _('%s (C function)') % name
elif self.objtype == 'cmember': elif self.objtype == 'member':
return _('%s (C member)') % name return _('%s (C member)') % name
elif self.objtype == 'cmacro': elif self.objtype == 'macro':
return _('%s (C macro)') % name return _('%s (C macro)') % name
elif self.objtype == 'ctype': elif self.objtype == 'type':
return _('%s (C type)') % name return _('%s (C type)') % name
elif self.objtype == 'cvar': elif self.objtype == 'var':
return _('%s (C variable)') % name return _('%s (C variable)') % name
else: else:
return '' return ''