@@ -7005,7 +7005,7 @@ def add_target_and_index(self, ast: ASTDeclaration, sig: str,
70057005 if not re .compile (r'^[a-zA-Z0-9_]*$' ).match (newestId ):
70067006 logger .warning ('Index id generation for C++ object "%s" failed, please '
70077007 'report as bug (id=%s).' , ast , newestId ,
7008- location = self .get_source_info ())
7008+ location = self .get_location ())
70097009
70107010 name = ast .symbol .get_full_nested_name ().get_display_string ().lstrip (':' )
70117011 # Add index entry, but not if it's a declaration inside a concept
@@ -7088,7 +7088,7 @@ def run(self) -> List[Node]:
70887088 logger .warning (msg .format (
70897089 str (parentSymbol .get_full_nested_name ()),
70907090 self .name , self .arguments [0 ]
7091- ), location = self .get_source_info ())
7091+ ), location = self .get_location ())
70927092 name = _make_phony_error_name ()
70937093 symbol = parentSymbol .add_name (name )
70947094 env .temp_data ['cpp:last_symbol' ] = symbol
@@ -7216,13 +7216,13 @@ def run(self) -> List[Node]:
72167216 stack : List [Symbol ] = []
72177217 else :
72187218 parser = DefinitionParser (self .arguments [0 ],
7219- location = self .get_source_info (),
7219+ location = self .get_location (),
72207220 config = self .config )
72217221 try :
72227222 ast = parser .parse_namespace_object ()
72237223 parser .assert_end ()
72247224 except DefinitionError as e :
7225- logger .warning (e , location = self .get_source_info ())
7225+ logger .warning (e , location = self .get_location ())
72267226 name = _make_phony_error_name ()
72277227 ast = ASTNamespace (name , None )
72287228 symbol = rootSymbol .add_name (ast .nestedName , ast .templatePrefix )
@@ -7244,13 +7244,13 @@ def run(self) -> List[Node]:
72447244 if self .arguments [0 ].strip () in ('NULL' , '0' , 'nullptr' ):
72457245 return []
72467246 parser = DefinitionParser (self .arguments [0 ],
7247- location = self .get_source_info (),
7247+ location = self .get_location (),
72487248 config = self .config )
72497249 try :
72507250 ast = parser .parse_namespace_object ()
72517251 parser .assert_end ()
72527252 except DefinitionError as e :
7253- logger .warning (e , location = self .get_source_info ())
7253+ logger .warning (e , location = self .get_location ())
72547254 name = _make_phony_error_name ()
72557255 ast = ASTNamespace (name , None )
72567256 oldParent = self .env .temp_data .get ('cpp:parent_symbol' , None )
@@ -7276,7 +7276,7 @@ def run(self) -> List[Node]:
72767276 stack = self .env .temp_data .get ('cpp:namespace_stack' , None )
72777277 if not stack or len (stack ) == 0 :
72787278 logger .warning ("C++ namespace pop on empty stack. Defaulting to gobal scope." ,
7279- location = self .get_source_info ())
7279+ location = self .get_location ())
72807280 stack = []
72817281 else :
72827282 stack .pop ()
@@ -7480,7 +7480,7 @@ def run(self) -> List[Node]:
74807480 " Requested 'noroot' but 'maxdepth' 1."
74817481 " When skipping the root declaration,"
74827482 " need 'maxdepth' 0 for infinite or at least 2." ,
7483- location = self .get_source_info ())
7483+ location = self .get_location ())
74847484 signatures = self .get_signatures ()
74857485 for i , sig in enumerate (signatures ):
74867486 node .append (AliasNode (sig , aliasOptions , env = self .env ))
@@ -7537,14 +7537,14 @@ def __init__(self, asCode: bool) -> None:
75377537 def run (self ) -> Tuple [List [Node ], List [system_message ]]:
75387538 text = self .text .replace ('\n ' , ' ' )
75397539 parser = DefinitionParser (text ,
7540- location = self .get_source_info (),
7540+ location = self .get_location (),
75417541 config = self .config )
75427542 # attempt to mimic XRefRole classes, except that...
75437543 try :
75447544 ast = parser .parse_expression ()
75457545 except DefinitionError as ex :
75467546 logger .warning ('Unparseable C++ expression: %r\n %s' , text , ex ,
7547- location = self .get_source_info ())
7547+ location = self .get_location ())
75487548 # see below
75497549 return [addnodes .desc_inline ('cpp' , text , text , classes = [self .class_type ])], []
75507550 parentSymbol = self .env .temp_data .get ('cpp:parent_symbol' , None )
0 commit comments