diff options
Diffstat (limited to 'sphinx/domains/cpp.py')
| -rw-r--r-- | sphinx/domains/cpp.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py index f82445099..d53997552 100644 --- a/sphinx/domains/cpp.py +++ b/sphinx/domains/cpp.py @@ -162,7 +162,7 @@ T = TypeVar('T') trailing-type-specifier -> rest-of-trailing ("class" | "struct" | "union" | "typename") rest-of-trailing - build-in -> "char" | "bool" | etc. + built-in -> "char" | "bool" | etc. decltype-specifier rest-of-trailing -> (with some simplification) "::"[opt] list-of-elements-separated-by-:: @@ -1709,7 +1709,7 @@ class ASTOperatorBuildIn(ASTOperator): else: ids = _id_operator_v2 if self.op not in ids: - raise Exception('Internal error: Build-in operator "%s" can not ' + raise Exception('Internal error: Built-in operator "%s" can not ' 'be mapped to an id.' % self.op) return ids[self.op] @@ -2479,7 +2479,7 @@ class ASTDeclaratorNameParamQual(ASTDeclarator): def get_type_id(self, version: int, returnTypeId: str) -> str: assert version >= 2 res = [] - # TOOD: can we actually have both array ops and paramQual? + # TODO: can we actually have both array ops and paramQual? res.append(self.get_ptr_suffix_id(version)) if self.paramQual: res.append(self.get_modifiers_id(version)) @@ -5217,7 +5217,7 @@ class DefinitionParser(BaseParser): ) -> Tuple[List[Union[ASTExpression, ASTBracedInitList]], bool]: - # Parse open and close with the actual initializer-list inbetween + # Parse open and close with the actual initializer-list in between # -> initializer-clause '...'[opt] # | initializer-list ',' initializer-clause '...'[opt] self.skip_ws() @@ -6358,7 +6358,7 @@ class DefinitionParser(BaseParser): if outer in ('type', 'function'): # We allow type objects to just be a name. # Some functions don't have normal return types: constructors, - # destrutors, cast operators + # destructors, cast operators prevErrors = [] startPos = self.pos # first try without the type @@ -6562,7 +6562,7 @@ class DefinitionParser(BaseParser): self.fail("Expected 'typename' or 'class' after " "template template parameter list.") else: - self.fail("Expected 'typename' or 'class' in tbe " + self.fail("Expected 'typename' or 'class' in the " "beginning of template type parameter.") self.skip_ws() parameterPack = self.skip_string('...') @@ -7282,7 +7282,7 @@ class CPPNamespacePopObject(SphinxDirective): def run(self) -> List[Node]: stack = self.env.temp_data.get('cpp:namespace_stack', None) if not stack or len(stack) == 0: - logger.warning("C++ namespace pop on empty stack. Defaulting to gobal scope.", + logger.warning("C++ namespace pop on empty stack. Defaulting to global scope.", location=self.get_location()) stack = [] else: |