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

C++, fix cpp:parent bug and add all aliases of fundamental integer types.

Browse Source
This commit is contained in:
Jakob Lykke Andersen 2014-08-10 11:14:47 +02:00
parent 0de1022a78
commit e65287ec9c
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sphinx/domains/cpp.py
View File

@ -157,24 +157,24 @@ _operator_re = re.compile(r'''(?x)
_id_prefix = '_CPP' _id_prefix = '_CPP'
_id_fundamental = { # not all of these are actually parsed as fundamental types, TODO: do that _id_fundamental = { # not all of these are actually parsed as fundamental types, TODO: do that
'void' : 'v', 'void' : 'v',
'wchar_t' : 'w',
'bool' : 'b', 'bool' : 'b',
'char' : 'c', 'char' : 'c',
'signed char' : 'a', 'signed char' : 'a',
'unsigned char' : 'h', 'unsigned char' : 'h',
'short' : 's', 'wchar_t' : 'w',
'unsigned short' : 't', 'char32_t' : 'Di',
'int' : 'i', 'char16_t' : 'Ds',
'unsigned int' : 'j', 'short' : 's', 'short int' : 's', 'signed short' : 's', 'signed short int' : 's',
'long' : 'l', 'unsigned short' : 't', 'unsigned short int' : 't',
'unsigned long' : 'm', 'int' : 'i', 'signed' : 'i', 'signed int' : 'i',
'long long' : 'x', 'unsigned' : 'j', 'unsigned int' : 'j',
'unsigned long long' : 'y', 'long' : 'l', 'long int' : 'l', 'signed long' : 'l', 'signed long int' : 'l',
'unsigned long' : 'm', 'unsigned long int' : 'm',
'long long' : 'x', 'long long int' : 'x', 'signed long long' : 'x', 'signed long long int' : 'x',
'unsigned long long' : 'y', 'unsigned long long int' : 'y',
'float' : 'f', 'float' : 'f',
'double' : 'd', 'double' : 'd',
'long double' : 'e', 'long double' : 'e',
'char32_t' : 'Di',
'char16_t' : 'Ds',
'auto' : 'Da', 'auto' : 'Da',
'decltype(auto)' : 'Dc', 'decltype(auto)' : 'Dc',
'std::nullptr_t' : 'Dn' 'std::nullptr_t' : 'Dn'
@ -1519,7 +1519,10 @@ class CPPClassObject(CPPObject):
def before_content(self): def before_content(self):
lastname = self.env.temp_data['cpp:lastname'] lastname = self.env.temp_data['cpp:lastname']
assert lastname assert lastname
self.env.temp_data['cpp:parent'].append(lastname) if 'cpp:parent' in self.env.temp_data:
self.env.temp_data['cpp:parent'].append(lastname)
else:
self.env.temp_data['cpp:parent'] = [lastname]
def after_content(self): def after_content(self):
self.env.temp_data['cpp:parent'].pop() self.env.temp_data['cpp:parent'].pop()