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

Last details. Closes sphinx-doc/sphinx#1753.

Browse Source
This commit is contained in:
Jakob Lykke Andersen 2015-03-05 23:34:44 +01:00
parent 8ca12f5307
commit bbf97fe8fd
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sphinx/domains/cpp.py
View File

@ -1178,8 +1178,7 @@ class ASTDeclaratorPtr(ASTBase):
def describe_signature(self, signode, mode, env): def describe_signature(self, signode, mode, env):
_verify_description_mode(mode) _verify_description_mode(mode)
signode += nodes.Text("*") signode += nodes.Text("*")
# TODO: if has ParamPack and hasDeclId: self.next.describe_signature(signode, mode, env)
# signode += nodes.Text(' ')
class ASTDeclaratorRef(ASTBase): class ASTDeclaratorRef(ASTBase):
@ -1231,8 +1230,7 @@ class ASTDeclaratorRef(ASTBase):
def describe_signature(self, signode, mode, env): def describe_signature(self, signode, mode, env):
_verify_description_mode(mode) _verify_description_mode(mode)
signode += nodes.Text("&") signode += nodes.Text("&")
# TODO: if has ParamPack and hasDeclId: self.next.describe_signature(signode, mode, env)
# signode += nodes.Text(' ')
class ASTDeclaratorParamPack(ASTBase): class ASTDeclaratorParamPack(ASTBase):
@ -1289,6 +1287,7 @@ class ASTDeclaratorParamPack(ASTBase):
signode += nodes.Text("...") signode += nodes.Text("...")
if self.next.name: if self.next.name:
signode += nodes.Text(' ') signode += nodes.Text(' ')
self.next.describe_signature(signode, mode, env)
class ASTDeclaratorParen(ASTBase): class ASTDeclaratorParen(ASTBase):

1
tests/test_domain_cpp.py
View File

@ -197,7 +197,6 @@ def test_type_definitions():
"result__i.std::error_categoryCR", "6resultiRNSt14error_categoryE") "result__i.std::error_categoryCR", "6resultiRNSt14error_categoryE")
check("function", "int *f()", "f", "1fv") check("function", "int *f()", "f", "1fv")
# tests derived from issue #1753 (skip to keep sanity) # tests derived from issue #1753 (skip to keep sanity)
# TODO: the v1 ids are speculative, check with older Sphinx version
check("function", "f(int (&array)[10])", None, "1fRA10_i") check("function", "f(int (&array)[10])", None, "1fRA10_i")
check("function", "void f(int (&array)[10])", None, "1fRA10_i") check("function", "void f(int (&array)[10])", None, "1fRA10_i")
check("function", "void f(float *q(double))", None, "1fFPfdE") check("function", "void f(float *q(double))", None, "1fFPfdE")