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 templated operator bug

Browse Source 
Fixes sphinx-doc/sphinx#2058
Fixes sphinx-doc/sphinx#2080
This commit is contained in:
Jakob Lykke Andersen 2015-10-12 21:06:45 +09:00
parent c823ffbcf1
commit 4e8f630176
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sphinx/domains/cpp.py
View File

@ -915,8 +915,6 @@ class ASTNestedName(ASTBase):
assert len(names) > 0 assert len(names) > 0
self.names = names self.names = names
self.rooted = rooted self.rooted = rooted
for i in range(len(names) - 1):
assert not names[i].is_operator()
@property @property
def name(self): def name(self):
@ -2123,17 +2121,13 @@ class Symbol(object):
s = s.parent s = s.parent
symbols.reverse() symbols.reverse()
key = [] key = []
for s in symbols[:-1]: for s in symbols:
assert s.identifier if s.identifier:
nne = ASTNestedNameElement(s.identifier, s.templateArgs) nne = ASTNestedNameElement(s.identifier, s.templateArgs)
else:
assert s.declaration
nne = s.declaration.name.names[-1]
key.append((nne, s.templateParams)) key.append((nne, s.templateParams))
s = symbols[-1]
if s.identifier:
nne = ASTNestedNameElement(s.identifier, s.templateArgs)
else:
assert self.declaration
nne = s.declaration.name.names[-1]
key.append((nne, s.templateParams))
return key return key
def get_full_nested_name(self): def get_full_nested_name(self):

9
tests/test_domain_cpp.py
View File

@ -304,6 +304,15 @@ def test_templates():
"void allow(F *f, typename func<F, B, G!=1>::type tt)", "void allow(F *f, typename func<F, B, G!=1>::type tt)",
None, "I0E5allowP1FN4funcI1F1BXG!=1EE4typeE") None, "I0E5allowP1FN4funcI1F1BXG!=1EE4typeE")
# from #2058
check('function',
"template<typename Char, typename Traits> "
"inline std::basic_ostream<Char, Traits> &operator<<("
"std::basic_ostream<Char, Traits> &os, "
"const c_string_view_base<const Char, Traits> &str)",
None, "I00ElsRNSt13basic_ostreamI4Char6TraitsEE"
"RK18c_string_view_baseIK4Char6TraitsE")
def test_class(): def test_class():
check('class', 'A final', 'A', '1A') check('class', 'A final', 'A', '1A')