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

Merge pull request #8113 from jakobandersen/cpp_template_template

Browse Source 
C++, fix template template parameter parsing
This commit is contained in:
Jakob Lykke Andersen 2020-08-13 17:29:18 +02:00 committed by GitHub
commit 667a188e25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -47,6 +47,7 @@ Bugs fixed
class class
* #8091: autodoc: AttributeError is raised on documenting an attribute on Python * #8091: autodoc: AttributeError is raised on documenting an attribute on Python
3.5.2 3.5.2
* C++, fix parsing of template template paramters, broken by the fix of #7944
Testing Testing
-------- --------

1
sphinx/domains/cpp.py
View File

@ -6251,6 +6251,7 @@ class DefinitionParser(BaseParser):
# ========================================================================== # ==========================================================================
def _parse_template_paramter(self) -> ASTTemplateParam: def _parse_template_paramter(self) -> ASTTemplateParam:
self.skip_ws()
if self.skip_word('template'): if self.skip_word('template'):
# declare a tenplate template parameter # declare a tenplate template parameter
nestedParams = self._parse_template_parameter_list() nestedParams = self._parse_template_parameter_list()

1
tests/test_domain_cpp.py
View File

@ -764,6 +764,7 @@ def test_templates():
check('class', "template<template<typename> typename> {key}A", {2: "II0E0E1A"}) check('class', "template<template<typename> typename> {key}A", {2: "II0E0E1A"})
check('class', "template<template<typename> typename ...T> {key}A", {2: "II0EDpE1A"}) check('class', "template<template<typename> typename ...T> {key}A", {2: "II0EDpE1A"})
check('class', "template<template<typename> typename...> {key}A", {2: "II0EDpE1A"}) check('class', "template<template<typename> typename...> {key}A", {2: "II0EDpE1A"})
check('class', "template<typename T, template<typename> typename...> {key}A", {2: "I0I0EDpE1A"})
check('class', "template<int> {key}A", {2: "I_iE1A"}) check('class', "template<int> {key}A", {2: "I_iE1A"})
check('class', "template<int T> {key}A", {2: "I_iE1A"}) check('class', "template<int T> {key}A", {2: "I_iE1A"})