From bbf97fe8fdb0e37ec1e79ddda9e50a289c1f7ad2 Mon Sep 17 00:00:00 2001 From: Jakob Lykke Andersen Date: Thu, 5 Mar 2015 23:34:44 +0100 Subject: [PATCH] Last details. Closes sphinx-doc/sphinx#1753. --- sphinx/domains/cpp.py | 7 +++---- tests/test_domain_cpp.py | 1 - 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py index a47054a3f..f8e2a1f8c 100644 --- a/sphinx/domains/cpp.py +++ b/sphinx/domains/cpp.py @@ -1178,8 +1178,7 @@ class ASTDeclaratorPtr(ASTBase): def describe_signature(self, signode, mode, env): _verify_description_mode(mode) signode += nodes.Text("*") - # TODO: if has ParamPack and hasDeclId: - # signode += nodes.Text(' ') + self.next.describe_signature(signode, mode, env) class ASTDeclaratorRef(ASTBase): @@ -1231,8 +1230,7 @@ class ASTDeclaratorRef(ASTBase): def describe_signature(self, signode, mode, env): _verify_description_mode(mode) signode += nodes.Text("&") - # TODO: if has ParamPack and hasDeclId: - # signode += nodes.Text(' ') + self.next.describe_signature(signode, mode, env) class ASTDeclaratorParamPack(ASTBase): @@ -1289,6 +1287,7 @@ class ASTDeclaratorParamPack(ASTBase): signode += nodes.Text("...") if self.next.name: signode += nodes.Text(' ') + self.next.describe_signature(signode, mode, env) class ASTDeclaratorParen(ASTBase): diff --git a/tests/test_domain_cpp.py b/tests/test_domain_cpp.py index 7d08b61ab..93f1c153a 100644 --- a/tests/test_domain_cpp.py +++ b/tests/test_domain_cpp.py @@ -197,7 +197,6 @@ def test_type_definitions(): "result__i.std::error_categoryCR", "6resultiRNSt14error_categoryE") check("function", "int *f()", "f", "1fv") # 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", "void f(int (&array)[10])", None, "1fRA10_i") check("function", "void f(float *q(double))", None, "1fFPfdE")