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 line numbers in warnings.

Browse Source 
See sphinx-doc/sphinx#2146.
This commit is contained in:
Jakob Lykke Andersen 2015-12-02 23:00:40 +01:00
parent 0e28d366bc
commit 0dd6ce3063
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sphinx/domains/cpp.py
View File

@ -3607,7 +3607,7 @@ class CPPObject(ObjectDescription):
] ]
def warn(self, msg): def warn(self, msg):
self.state_machine.reporter.warning(msg, lineno=self.lineno) self.state_machine.reporter.warning(msg, line=self.lineno)
def _add_enumerator_to_parent(self, ast): def _add_enumerator_to_parent(self, ast):
assert ast.objectType == 'enumerator' assert ast.objectType == 'enumerator'
@ -3826,7 +3826,7 @@ class CPPNamespaceObject(Directive):
option_spec = {} option_spec = {}
def warn(self, msg): def warn(self, msg):
self.state_machine.reporter.warning(msg, lineno=self.lineno) self.state_machine.reporter.warning(msg, line=self.lineno)
def run(self): def run(self):
env = self.state.document.settings.env env = self.state.document.settings.env
@ -3840,8 +3840,7 @@ class CPPNamespaceObject(Directive):
ast = parser.parse_namespace_object() ast = parser.parse_namespace_object()
parser.assert_end() parser.assert_end()
except DefinitionError as e: except DefinitionError as e:
self.state_machine.reporter.warning(e.description, self.warn(e.description)
line=self.lineno)
name = _make_phony_error_name() name = _make_phony_error_name()
ast = ASTNamespace(name, None) ast = ASTNamespace(name, None)
symbol = rootSymbol.add_name(ast.nestedName, ast.templatePrefix) symbol = rootSymbol.add_name(ast.nestedName, ast.templatePrefix)
@ -3859,7 +3858,7 @@ class CPPNamespacePushObject(Directive):
option_spec = {} option_spec = {}
def warn(self, msg): def warn(self, msg):
self.state_machine.reporter.warning(msg, lineno=self.lineno) self.state_machine.reporter.warning(msg, line=self.lineno)
def run(self): def run(self):
env = self.state.document.settings.env env = self.state.document.settings.env
@ -3870,8 +3869,7 @@ class CPPNamespacePushObject(Directive):
ast = parser.parse_namespace_object() ast = parser.parse_namespace_object()
parser.assert_end() parser.assert_end()
except DefinitionError as e: except DefinitionError as e:
self.state_machine.reporter.warning(e.description, self.warn(e.description)
line=self.lineno)
name = _make_phony_error_name() name = _make_phony_error_name()
ast = ASTNamespace(name, None) ast = ASTNamespace(name, None)
oldParent = env.ref_context.get('cpp:parentSymbol', None) oldParent = env.ref_context.get('cpp:parentSymbol', None)
@ -3893,7 +3891,7 @@ class CPPNamespacePopObject(Directive):
option_spec = {} option_spec = {}
def warn(self, msg): def warn(self, msg):
self.state_machine.reporter.warning(msg, lineno=self.lineno) self.state_machine.reporter.warning(msg, line=self.lineno)
def run(self): def run(self):
env = self.state.document.settings.env env = self.state.document.settings.env