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

C++, fix assertion in partial builds with duplicates

Browse Source 
Fixes sphinx-doc/sphinx#5496
This commit is contained in:
Jakob Lykke Andersen 2018-12-16 19:36:35 +01:00
parent 73a8b7e658
commit 57f70d0f1d
2 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -25,6 +25,7 @@ Bugs fixed
* #5810: LaTeX: sphinxVerbatim requires explicit "hllines" set-up since 1.6.6 * #5810: LaTeX: sphinxVerbatim requires explicit "hllines" set-up since 1.6.6
(refs: #1238) (refs: #1238)
* #5636: C++, fix parsing of floating point literals. * #5636: C++, fix parsing of floating point literals.
* #5496 (again): C++, fix assertion in partial builds with duplicates.
Testing Testing
-------- --------

44
sphinx/domains/cpp.py
View File

@ -3615,6 +3615,7 @@ class SymbolLookupResult(object):
class Symbol(object): class Symbol(object):
debug_lookup = False debug_lookup = False
debug_show_tree = False
def _assert_invariants(self): def _assert_invariants(self):
# type: () -> None # type: () -> None
@ -4037,11 +4038,10 @@ class Symbol(object):
print(" #noDecl: ", len(noDecl)) print(" #noDecl: ", len(noDecl))
print(" #withDecl:", len(withDecl)) print(" #withDecl:", len(withDecl))
print(" #dupDecl: ", len(dupDecl)) print(" #dupDecl: ", len(dupDecl))
if len(dupDecl) > 0:
assert len(withDecl) > 0
# assert len(noDecl) <= 1 # we should fill in symbols when they are there
# TODO: enable assertion when we at some point find out how to do cleanup
# With partial builds we may start with a large symbol tree stripped of declarations. # With partial builds we may start with a large symbol tree stripped of declarations.
# Essentially any combination of noDecl, withDecl, and dupDecls seems possible.
# TODO: make partial builds fully work. What should happen when the primary symbol gets
# deleted, and other duplicates exist? The full document should probably be rebuild.
# First check if one of those with a declaration matches. # First check if one of those with a declaration matches.
# If it's a function, we need to compare IDs, # If it's a function, we need to compare IDs,
@ -4294,6 +4294,8 @@ class Symbol(object):
res.append(text_type(self.templateArgs)) res.append(text_type(self.templateArgs))
if self.declaration: if self.declaration:
res.append(": ") res.append(": ")
if self.isRedeclaration:
res.append('!!duplicate!! ')
res.append(text_type(self.declaration)) res.append(text_type(self.declaration))
if self.docname: if self.docname:
res.append('\t(') res.append('\t(')
@ -6691,18 +6693,30 @@ class CPPDomain(Domain):
def clear_doc(self, docname): def clear_doc(self, docname):
# type: (unicode) -> None # type: (unicode) -> None
if Symbol.debug_show_tree:
print("clear_doc:", docname)
print("\tbefore:")
print(self.data['root_symbol'].dump(1))
print("\tbefore end")
rootSymbol = self.data['root_symbol'] rootSymbol = self.data['root_symbol']
rootSymbol.clear_doc(docname) rootSymbol.clear_doc(docname)
if Symbol.debug_show_tree:
print("\tafter:")
print(self.data['root_symbol'].dump(1))
print("\tafter end")
print("clear_doc end:", docname)
for name, nDocname in list(self.data['names'].items()): for name, nDocname in list(self.data['names'].items()):
if nDocname == docname: if nDocname == docname:
del self.data['names'][name] del self.data['names'][name]
def process_doc(self, env, docname, document): def process_doc(self, env, docname, document):
# type: (BuildEnvironment, unicode, nodes.Node) -> None # type: (BuildEnvironment, unicode, nodes.Node) -> None
# just for debugging if Symbol.debug_show_tree:
# print("process_doc:", docname) print("process_doc:", docname)
# print(self.data['root_symbol'].dump(0)) print(self.data['root_symbol'].dump(0))
pass print("process_doc end:", docname)
def process_field_xref(self, pnode): def process_field_xref(self, pnode):
# type: (nodes.Node) -> None # type: (nodes.Node) -> None
@ -6710,11 +6724,15 @@ class CPPDomain(Domain):
def merge_domaindata(self, docnames, otherdata): def merge_domaindata(self, docnames, otherdata):
# type: (List[unicode], Dict) -> None # type: (List[unicode], Dict) -> None
# print("merge_domaindata:") if Symbol.debug_show_tree:
# print("self") print("merge_domaindata:")
# print(self.data['root_symbol'].dump(0)) print("\tself:")
# print("other:") print(self.data['root_symbol'].dump(1))
# print(otherdata['root_symbol'].dump(0)) print("\tself end")
print("\tother:")
print(otherdata['root_symbol'].dump(1))
print("\tother end")
print("merge_domaindata end")
self.data['root_symbol'].merge_with(otherdata['root_symbol'], self.data['root_symbol'].merge_with(otherdata['root_symbol'],
docnames, self.env) docnames, self.env)