diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-09-01 23:18:28 +0200 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-09-25 12:44:11 +0200 |
| commit | d93d01b6c5c98a77e057b914e8d66b01d2a10771 (patch) | |
| tree | ca759dff3424ad09519fada202bbbbe4ad9eaf14 /mesonbuild/interpreter/interpreter.py | |
| parent | 5fcb0e6525e2044e0f82bda488a51350e0f7f29f (diff) | |
| download | meson-d93d01b6c5c98a77e057b914e8d66b01d2a10771.zip meson-d93d01b6c5c98a77e057b914e8d66b01d2a10771.tar.gz meson-d93d01b6c5c98a77e057b914e8d66b01d2a10771.tar.bz2 | |
interpreter: Introduce StringHolder
Another commit in my quest to rid InterpreterBase from all higher
level object processing logic.
Additionally, there is a a logic change here, since `str.join` now
uses varargs and can now accept more than one argument (and supports
list flattening).
Diffstat (limited to 'mesonbuild/interpreter/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter/interpreter.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index f94ed2d..7a935da 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -376,6 +376,8 @@ class Interpreter(InterpreterBase, HoldableObject): # Primitives int: P_OBJ.IntegerHolder, bool: P_OBJ.BooleanHolder, + str: P_OBJ.StringHolder, + P_OBJ.MesonVersionString: P_OBJ.MesonVersionStringHolder, # Meson types mesonlib.File: OBJ.FileHolder, @@ -2399,7 +2401,7 @@ This will become a hard error in the future.''' % kwargs['input'], location=self @typed_pos_args('join_paths', varargs=str, min_varargs=1) @noKwargs def func_join_paths(self, node: mparser.BaseNode, args: T.Tuple[T.List[str]], kwargs: 'TYPE_kwargs') -> str: - return self.join_path_strings(args[0]) + return os.path.join(*args[0]).replace('\\', '/') def run(self) -> None: super().run() |