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 ref checks for concepts.

Browse Source
This commit is contained in:
Jakob Lykke Andersen 2016-08-07 19:03:12 +02:00
parent 1b251797bb
commit 611ac9782a
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sphinx/domains/cpp.py
View File

@ -654,7 +654,8 @@ class ASTIdentifier(ASTBase):
_verify_description_mode(mode) _verify_description_mode(mode)
if mode == 'markType': if mode == 'markType':
targetText = prefix + self.identifier targetText = prefix + self.identifier
pnode = addnodes.pending_xref('', refdomain='cpp', reftype='type', pnode = addnodes.pending_xref('', refdomain='cpp',
reftype='typeOrConcept',
reftarget=targetText, modname=None, reftarget=targetText, modname=None,
classname=None) classname=None)
key = symbol.get_lookup_key() key = symbol.get_lookup_key()
@ -4135,15 +4136,6 @@ class CPPObject(ObjectDescription):
signode['first'] = (not self.names) # hmm, what is this abound? signode['first'] = (not self.names) # hmm, what is this abound?
self.state.document.note_explicit_target(signode) self.state.document.note_explicit_target(signode)
def before_content(self):
lastSymbol = self.env.ref_context['cpp:last_symbol']
assert lastSymbol
self.oldParentSymbol = self.env.ref_context['cpp:parent_symbol']
self.env.ref_context['cpp:parent_symbol'] = lastSymbol
def after_content(self):
self.env.ref_context['cpp:parent_symbol'] = self.oldParentSymbol
def parse_definition(self, parser): def parse_definition(self, parser):
raise NotImplementedError() raise NotImplementedError()
@ -4525,10 +4517,13 @@ class CPPDomain(Domain):
return True return True
if typ == 'var' or typ == 'member': if typ == 'var' or typ == 'member':
return declTyp in ['var', 'member'] return declTyp in ['var', 'member']
if typ in ['enum', 'enumerator', 'function', 'class']: if typ in ['enum', 'enumerator', 'function', 'class', 'concept']:
return declTyp == typ return declTyp == typ
validForType = ['enum', 'class', 'function', 'type']
if typ == 'typeOrConcept':
return declTyp == 'concept' or declTyp in validForType
if typ == 'type': if typ == 'type':
return declTyp in ['enum', 'class', 'function', 'type'] return declTyp in validForType
print("Type is %s" % typ) print("Type is %s" % typ)
assert False assert False
if not checkType(): if not checkType():