diff options
| -rw-r--r-- | mesonbuild/ast/interpreter.py | 2 | ||||
| -rw-r--r-- | mesonbuild/interpreter.py | 2 | ||||
| -rw-r--r-- | mesonbuild/interpreterbase.py | 2 | ||||
| -rw-r--r-- | mesonbuild/mlog.py | 2 | ||||
| -rw-r--r-- | mesonbuild/optinterpreter.py | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/mesonbuild/ast/interpreter.py b/mesonbuild/ast/interpreter.py index bee5165..5f47ad3 100644 --- a/mesonbuild/ast/interpreter.py +++ b/mesonbuild/ast/interpreter.py @@ -154,7 +154,7 @@ class AstInterpreter(interpreterbase.InterpreterBase): code = f.read() assert(isinstance(code, str)) try: - codeblock = mparser.Parser(code, subdir).parse() + codeblock = mparser.Parser(code, absname).parse() except mesonlib.MesonException as me: me.file = absname raise me diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index bd85577..a9e0a3b 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -3748,7 +3748,7 @@ This will become a hard error in the future.''' % kwargs['input'], location=self code = f.read() assert(isinstance(code, str)) try: - codeblock = mparser.Parser(code, self.subdir).parse() + codeblock = mparser.Parser(code, absname).parse() except mesonlib.MesonException as me: me.file = absname raise me diff --git a/mesonbuild/interpreterbase.py b/mesonbuild/interpreterbase.py index 842aeac..d723da5 100644 --- a/mesonbuild/interpreterbase.py +++ b/mesonbuild/interpreterbase.py @@ -381,7 +381,7 @@ class InterpreterBase: raise InvalidCode('Builder file is empty.') assert(isinstance(code, str)) try: - self.ast = mparser.Parser(code, self.subdir).parse() + self.ast = mparser.Parser(code, mesonfile).parse() except mesonlib.MesonException as me: me.file = mesonfile raise me diff --git a/mesonbuild/mlog.py b/mesonbuild/mlog.py index c5ebbbf..b563e41 100644 --- a/mesonbuild/mlog.py +++ b/mesonbuild/mlog.py @@ -251,7 +251,7 @@ def _log_error(severity: str, *rargs: T.Union[str, AnsiDecorator], location = kwargs.pop('location', None) if location is not None: - location_file = os.path.join(location.subdir, build_filename) + location_file = location.subdir location_str = get_error_location_string(location_file, location.lineno) # Unions are frankly awful, and we have to T.cast here to get mypy # to understand that the list concatenation is safe diff --git a/mesonbuild/optinterpreter.py b/mesonbuild/optinterpreter.py index 2632b31..fd0a8c9 100644 --- a/mesonbuild/optinterpreter.py +++ b/mesonbuild/optinterpreter.py @@ -140,7 +140,7 @@ class OptionInterpreter: def process(self, option_file): try: with open(option_file, 'r', encoding='utf8') as f: - ast = mparser.Parser(f.read(), '').parse() + ast = mparser.Parser(f.read(), option_file).parse() except mesonlib.MesonException as me: me.file = option_file raise me |