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

Fixes for previous commit

Browse Source
This commit is contained in:
Jakob Lykke Andersen 2017-12-28 17:04:21 +01:00
parent f3c05adebc
commit 217c5f3856
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sphinx/domains/cpp.py
View File

@ -1685,7 +1685,7 @@ class ASTOperatorType(ASTBase):
return text_type(self) return text_type(self)
def describe_signature(self, signode, mode, env, prefix, templateArgs, symbol): def describe_signature(self, signode, mode, env, prefix, templateArgs, symbol):
# type: (addnodes.desc_signature, unicode, BuildEnvironment, unicode, Symbol) -> None # type: (addnodes.desc_signature, unicode, Any, unicode, unicode, Symbol) -> None
_verify_description_mode(mode) _verify_description_mode(mode)
identifier = text_type(self) identifier = text_type(self)
if mode == 'lastIsName': if mode == 'lastIsName':
@ -1715,7 +1715,7 @@ class ASTOperatorLiteral(ASTBase):
return u'operator""' + text_type(self.identifier) return u'operator""' + text_type(self.identifier)
def describe_signature(self, signode, mode, env, prefix, templateArgs, symbol): def describe_signature(self, signode, mode, env, prefix, templateArgs, symbol):
# type: (addnodes.desc_signature, unicode, BuildEnvironment, unicode, Symbol) -> None # type: (addnodes.desc_signature, unicode, Any, unicode, unicode, Symbol) -> None
_verify_description_mode(mode) _verify_description_mode(mode)
identifier = text_type(self) identifier = text_type(self)
if mode == 'lastIsName': if mode == 'lastIsName':
@ -3573,22 +3573,9 @@ class Symbol(object):
# type: (Any, List[unicode], BuildEnvironment) -> None # type: (Any, List[unicode], BuildEnvironment) -> None
assert other is not None assert other is not None
for otherChild in other.children: for otherChild in other.children:
if not otherChild.identifier: ourChild = self._find_named_symbol(otherChild.identOrOp,
if not otherChild.declaration:
print("Problem in symbol tree merging")
print("OtherChild.dump:")
print(otherChild.dump(0))
print("Other.dump:")
print(other.dump(0))
assert otherChild.declaration
operator = otherChild.declaration.name.names[-1]
assert operator.is_operator()
else:
operator = None
ourChild = self._find_named_symbol(otherChild.identifier,
otherChild.templateParams, otherChild.templateParams,
otherChild.templateArgs, otherChild.templateArgs,
operator,
templateShorthand=False, templateShorthand=False,
matchSelf=False) matchSelf=False)
if ourChild is None: if ourChild is None:
@ -4521,7 +4508,7 @@ class DefinitionParser(object):
if identifier in _keywords: if identifier in _keywords:
self.fail("Expected identifier in nested name, " self.fail("Expected identifier in nested name, "
"got keyword: %s" % identifier) "got keyword: %s" % identifier)
identOrOp = ASTIdentifier(identifier) # type: ignore identOrOp = ASTIdentifier(identifier)
# try greedily to get template arguments, # try greedily to get template arguments,
# but otherwise a < might be because we are in an expression # but otherwise a < might be because we are in an expression
pos = self.pos pos = self.pos