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 #7381 from jakobandersen/cpp_anon_dup_decl

Browse Source 
C and C++, do not recurse in anon symbols when adding new symbols
This commit is contained in:
Jakob Lykke Andersen 2020-03-25 20:58:40 +01:00 committed by GitHub
commit 6a90c16600
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -22,6 +22,7 @@ Bugs fixed
* C, alternate operator spellings are now supported.
* #7368: C++, comma operator in expressions, pack expansion in template
argument lists, and more comprehensive error messages in some cases.
* C, C++, fix crash and wrong duplicate warnings related to anon symbols.
Testing
--------

2
sphinx/domains/c.py
View File

@ -1675,7 +1675,7 @@ class Symbol:
onMissingQualifiedSymbol,
ancestorLookupType=None,
matchSelf=False,
recurseInAnon=True,
recurseInAnon=False,
searchInSiblings=False)
assert lookupResult is not None # we create symbols all the way, so that can't happen
symbols = list(lookupResult.symbols)

2
sphinx/domains/cpp.py
View File

@ -4159,7 +4159,7 @@ class Symbol:
ancestorLookupType=None,
templateShorthand=False,
matchSelf=False,
recurseInAnon=True,
recurseInAnon=False,
correctPrimaryTemplateArgs=True,
searchInSiblings=False)
assert lookupResult is not None # we create symbols all the way, so that can't happen

5
tests/roots/test-domain-c/anon-dup-decl.rst Normal file
View File

@ -0,0 +1,5 @@
.. c:struct:: anon_dup_decl
.. c:struct:: @a.A
.. c:struct:: @b.A
.. c:struct:: A

4
tests/roots/test-domain-cpp/anon-dup-decl.rst Normal file
View File

@ -0,0 +1,4 @@
.. cpp:namespace:: anon_dup_decl
.. cpp:class:: @a::A
.. cpp:class:: @b::A
.. cpp:class:: A

9
tests/test_domain_c.py
View File

@ -474,6 +474,15 @@ def test_build_domain_c(app, status, warning):
assert len(ws) == 0
@pytest.mark.sphinx(testroot='domain-c', confoverrides={'nitpicky': True})
def test_build_domain_c_anon_dup_decl(app, status, warning):
app.builder.build_all()
ws = filter_warnings(warning, "anon-dup-decl")
assert len(ws) == 2
assert "WARNING: c:identifier reference target not found: @a" in ws[0]
assert "WARNING: c:identifier reference target not found: @b" in ws[1]
def test_cfunction(app):
text = (".. c:function:: PyObject* "
"PyType_GenericAlloc(PyTypeObject *type, Py_ssize_t nitems)")

9
tests/test_domain_cpp.py
View File

@ -913,6 +913,15 @@ def test_build_domain_cpp_backslash_ok(app, status, warning):
assert "WARNING: Parsing of expression failed. Using fallback parser." in ws[0]
@pytest.mark.sphinx(testroot='domain-cpp', confoverrides={'nitpicky': True})
def test_build_domain_cpp_anon_dup_decl(app, status, warning):
app.builder.build_all()
ws = filter_warnings(warning, "anon-dup-decl")
assert len(ws) == 2
assert "WARNING: cpp:identifier reference target not found: @a" in ws[0]
assert "WARNING: cpp:identifier reference target not found: @b" in ws[1]
@pytest.mark.sphinx(testroot='domain-cpp')
def test_build_domain_cpp_misuse_of_roles(app, status, warning):
app.builder.build_all()