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++, ref #1765, old id generation fix.

Browse Source
This commit is contained in:
Jakob Lykke Andersen 2015-03-10 21:56:58 +01:00
parent a8a8b1fd8f
commit dc8786bd5e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sphinx/domains/cpp.py
View File

@ -1487,7 +1487,7 @@ class ASTType(ASTBase):
res = []
if self.objectType: # needs the name
if self.objectType == 'function': # also modifiers
res.append(self.name.get_id_v1())
res.append(self.prefixedName.get_id_v1())
res.append(self.decl.get_param_id_v1())
res.append(self.decl.get_modifiers_id_v1())
if (self.declSpecs.leftSpecs.constexpr or
@ -1495,7 +1495,7 @@ class ASTType(ASTBase):
self.declSpecs.rightSpecs.constexpr)):
res.append('CE')
elif self.objectType == 'type': # just the name
res.append(self.name.get_id_v1())
res.append(self.prefixedName.get_id_v1())
else:
print(self.objectType)
assert False
@ -1560,7 +1560,7 @@ class ASTTypeWithInit(ASTBase):
def get_id_v1(self):
if self.objectType == 'member':
return self.name.get_id_v1() + u'__' + self.type.get_id_v1()
return self.prefixedName.get_id_v1() + u'__' + self.type.get_id_v1()
else:
return self.type.get_id_v1()
@ -1615,7 +1615,7 @@ class ASTClass(ASTBase):
self.bases = bases
def get_id_v1(self):
return self.name.get_id_v1()
return self.prefixedName.get_id_v1()
# name = _id_shortwords.get(self.name)
# if name is not None:
# return name