aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/interpreter
diff options
context:
space:
mode:
authorJosh Soref <2119212+jsoref@users.noreply.github.com>2023-04-11 16:04:17 -0400
committerEli Schwartz <eschwartz93@gmail.com>2023-04-11 19:21:05 -0400
commitcf9fd56bc905a2022ad48c93d25b5a73b57c8802 (patch)
treea6858f0e790f801f49d8d4f161e9183deaf90e20 /mesonbuild/interpreter
parente238b81ba0b89faa19b512d1e78de00dad1488ce (diff)
downloadmeson-cf9fd56bc905a2022ad48c93d25b5a73b57c8802.zip
meson-cf9fd56bc905a2022ad48c93d25b5a73b57c8802.tar.gz
meson-cf9fd56bc905a2022ad48c93d25b5a73b57c8802.tar.bz2
fix various spelling issues
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
Diffstat (limited to 'mesonbuild/interpreter')
-rw-r--r--mesonbuild/interpreter/compiler.py6
-rw-r--r--mesonbuild/interpreter/interpreter.py18
-rw-r--r--mesonbuild/interpreter/kwargs.py2
-rw-r--r--mesonbuild/interpreter/mesonmain.py2
-rw-r--r--mesonbuild/interpreter/type_checking.py6
5 files changed, 17 insertions, 17 deletions
diff --git a/mesonbuild/interpreter/compiler.py b/mesonbuild/interpreter/compiler.py
index d56591b..c9ea880 100644
--- a/mesonbuild/interpreter/compiler.py
+++ b/mesonbuild/interpreter/compiler.py
@@ -1,4 +1,4 @@
-# SPDX-Licnese-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0
# Copyright 2012-2021 The Meson development team
# Copyright © 2021 Intel Corporation
from __future__ import annotations
@@ -60,7 +60,7 @@ if T.TYPE_CHECKING:
args: T.List[str]
dependencies: T.List[dependencies.Dependency]
- class CompupteIntKW(CommonKW):
+ class ComputeIntKW(CommonKW):
guess: T.Optional[int]
high: T.Optional[int]
@@ -405,7 +405,7 @@ class CompilerHolder(ObjectHolder['Compiler']):
KwargInfo('guess', (int, NoneType)),
*_COMMON_KWS,
)
- def compute_int_method(self, args: T.Tuple[str], kwargs: 'CompupteIntKW') -> int:
+ def compute_int_method(self, args: T.Tuple[str], kwargs: 'ComputeIntKW') -> int:
expression = args[0]
extra_args = functools.partial(self._determine_args, kwargs['no_builtin_args'], kwargs['include_directories'], kwargs['args'])
deps, msg = self._determine_dependencies(kwargs['dependencies'], compile_only=self.compiler.is_cross)
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py
index bbc34a4..96d4af0 100644
--- a/mesonbuild/interpreter/interpreter.py
+++ b/mesonbuild/interpreter/interpreter.py
@@ -235,7 +235,7 @@ class InterpreterRuleRelaxation(Enum):
generate a Meson AST via introspection, etc.
'''
- ALLOW_BUILD_DIR_FILE_REFFERENCES = 1
+ ALLOW_BUILD_DIR_FILE_REFERENCES = 1
permitted_dependency_kwargs = {
'allow_fallback',
@@ -1001,7 +1001,7 @@ class Interpreter(InterpreterBase, HoldableObject):
# Duplicates are possible when subproject uses files from project root
if build_def_files:
self.build_def_files.update(build_def_files)
- # We always need the subi.build_def_files, to propgate sub-sub-projects
+ # We always need the subi.build_def_files, to propagate sub-sub-projects
self.build_def_files.update(subi.build_def_files)
self.build.merge(subi.build)
self.build.subprojects[subp_name] = subi.project_version
@@ -1048,7 +1048,7 @@ class Interpreter(InterpreterBase, HoldableObject):
[str(f) for f in cm_int.bs_files],
is_translated=True,
relaxations={
- InterpreterRuleRelaxation.ALLOW_BUILD_DIR_FILE_REFFERENCES,
+ InterpreterRuleRelaxation.ALLOW_BUILD_DIR_FILE_REFERENCES,
}
)
result.cm_interpreter = cm_int
@@ -1365,7 +1365,7 @@ class Interpreter(InterpreterBase, HoldableObject):
section, values, kwargs['bool_yn'], kwargs['list_sep'], self.subproject)
def _print_summary(self) -> None:
- # Add automatic 'Supbrojects' section in main project.
+ # Add automatic 'Subprojects' section in main project.
all_subprojects = collections.OrderedDict()
for name, subp in sorted(self.subprojects.items()):
value = subp.found()
@@ -1997,7 +1997,7 @@ class Interpreter(InterpreterBase, HoldableObject):
build_by_default = kwargs['build_always']
build_always_stale = kwargs['build_by_default']
- # These are are nullaable so that we can know whether they're explicitly
+ # These are nullable so that we can know whether they're explicitly
# set or not. If they haven't been overwritten, set them to their true
# default
if build_by_default is None:
@@ -2019,9 +2019,9 @@ class Interpreter(InterpreterBase, HoldableObject):
command[0] = self.find_program_impl([command[0]])
if len(inputs) > 1 and kwargs['feed']:
- raise InvalidArguments('custom_target: "feed" keyword argument can only be used used with a single input')
+ raise InvalidArguments('custom_target: "feed" keyword argument can only be used with a single input')
if len(kwargs['output']) > 1 and kwargs['capture']:
- raise InvalidArguments('custom_target: "capture" keyword argument can only be used used with a single output')
+ raise InvalidArguments('custom_target: "capture" keyword argument can only be used with a single output')
if kwargs['capture'] and kwargs['console']:
raise InvalidArguments('custom_target: "capture" and "console" keyword arguments are mutually exclusive')
for c in command:
@@ -2370,7 +2370,7 @@ class Interpreter(InterpreterBase, HoldableObject):
absname = os.path.join(self.environment.get_source_dir(), buildfilename)
if not os.path.isfile(absname):
self.subdir = prev_subdir
- raise InterpreterException(f"Non-existent build file '{buildfilename!s}'")
+ raise InterpreterException(f"Nonexistent build file '{buildfilename!s}'")
with open(absname, encoding='utf-8') as f:
code = f.read()
assert isinstance(code, str)
@@ -3034,7 +3034,7 @@ class Interpreter(InterpreterBase, HoldableObject):
inputtype = 'directory'
else:
inputtype = 'file'
- if InterpreterRuleRelaxation.ALLOW_BUILD_DIR_FILE_REFFERENCES in self.relaxations and builddir in norm.parents:
+ if InterpreterRuleRelaxation.ALLOW_BUILD_DIR_FILE_REFERENCES in self.relaxations and builddir in norm.parents:
return
if srcdir not in norm.parents:
# Grabbing files outside the source tree is ok.
diff --git a/mesonbuild/interpreter/kwargs.py b/mesonbuild/interpreter/kwargs.py
index fb02374..3c1cb00 100644
--- a/mesonbuild/interpreter/kwargs.py
+++ b/mesonbuild/interpreter/kwargs.py
@@ -57,7 +57,7 @@ class FuncTest(FuncBenchmark):
"""Keyword Arguments for `test`
- `test` only adds the `is_prallel` argument over benchmark, so inherintance
+ `test` only adds the `is_parallel` argument over benchmark, so inheritance
is helpful here.
"""
diff --git a/mesonbuild/interpreter/mesonmain.py b/mesonbuild/interpreter/mesonmain.py
index 3e75629..2ea3163 100644
--- a/mesonbuild/interpreter/mesonmain.py
+++ b/mesonbuild/interpreter/mesonmain.py
@@ -377,7 +377,7 @@ class MesonMain(MesonInterpreterObject):
def _override_dependency_impl(self, name: str, dep: dependencies.Dependency, kwargs: 'FuncOverrideDependency',
static: T.Optional[bool], permissive: bool = False) -> None:
# We need the cast here as get_dep_identifier works on such a dict,
- # which FuncOverrideDependency is, but mypy can't fgure that out
+ # which FuncOverrideDependency is, but mypy can't figure that out
nkwargs = T.cast('T.Dict[str, T.Any]', kwargs.copy())
if static is None:
del nkwargs['static']
diff --git a/mesonbuild/interpreter/type_checking.py b/mesonbuild/interpreter/type_checking.py
index e1ee82a..9b2e46c 100644
--- a/mesonbuild/interpreter/type_checking.py
+++ b/mesonbuild/interpreter/type_checking.py
@@ -87,9 +87,9 @@ def _install_mode_validator(mode: T.List[T.Union[str, bool, int]]) -> T.Optional
return f'permission character 9 must be "-", "t", "T", or "x", not {perms[8]}'
if len(mode) >= 2 and not isinstance(mode[1], (int, str, bool)):
- return 'second componenent can only be a string, number, or False'
+ return 'second component can only be a string, number, or False'
if len(mode) >= 3 and not isinstance(mode[2], (int, str, bool)):
- return 'third componenent can only be a string, number, or False'
+ return 'third component can only be a string, number, or False'
return None
@@ -211,7 +211,7 @@ def _env_validator(value: T.Union[EnvironmentVariables, T.List['TYPE_var'], T.Di
return None
def _options_validator(value: T.Union[EnvironmentVariables, T.List['TYPE_var'], T.Dict[str, 'TYPE_var'], str, None]) -> T.Optional[str]:
- # Reusing the env validator is a littl overkill, but nicer than duplicating the code
+ # Reusing the env validator is a little overkill, but nicer than duplicating the code
return _env_validator(value, allow_dict_list=False)
def split_equal_string(input: str) -> T.Tuple[str, str]: