Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions mesonbuild/ast/interpreter.py
Original file line number Diff line number Diff line change
Expand Up @@ -494,14 +494,12 @@ def func_files(self, node: BaseNode, args: T.List[TYPE_var], kwargs: T.Dict[str,
def get_cur_value_if_defined(self, var_name: str) -> T.Union[BaseNode, UnknownValue, UndefinedVariable]:
if var_name in self.predefined_vars:
return self.predefined_vars[var_name]
ret: T.Union[BaseNode, UnknownValue, UndefinedVariable] = UndefinedVariable()
for nesting, value in reversed(self.cur_assignments[var_name]):
if len(self.nesting) >= len(nesting) and self.nesting[:len(nesting)] == nesting:
ret = value
break
if isinstance(ret, UndefinedVariable) and self.tainted:
return value
if self.tainted:
return UnknownValue()
return ret
return UndefinedVariable()

def get_cur_value(self, var_name: str) -> T.Union[BaseNode, UnknownValue]:
ret = self.get_cur_value_if_defined(var_name)
Expand Down
Loading