From fa2df78952debfb465515235ff9d0227aa140316 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Mon, 26 Aug 2019 21:09:15 +0300 Subject: Fix incorrect calculation of includes depth --- src/engine/SCons/cpp.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/engine/SCons/cpp.py b/src/engine/SCons/cpp.py index 40d4a0c..7535dbb 100644 --- a/src/engine/SCons/cpp.py +++ b/src/engine/SCons/cpp.py @@ -218,7 +218,7 @@ class FunctionEvaluator(object): parts = [] for s in self.expansion: - if not s in self.args: + if s not in self.args: s = repr(s) parts.append(s) statement = ' + '.join(parts) @@ -580,13 +580,13 @@ class PreProcessor(object): if self.depth != -1: current_depth = 0 for t in self.tuples: - if t[0] != "scons_current_file": + if t[0] == "scons_current_file": current_depth += 1 if current_depth >= self.depth: return new_tuples = [('scons_current_file', include_file)] + \ - self.tupleize(self.read_file(include_file)) + \ + self.tupleize_file(include_file) + \ [('scons_current_file', self.current_file)] self.tuples[:] = new_tuples + self.tuples -- cgit v0.12