Fix circular dependency checking.

Use negative number, put check in the right place.

Fix circular dependency checking.
Use negative number, put check in the right place.
d52106b6 · Will · ce365fc5 · d52106b6
Commit d52106b6 authored Apr 29, 2016 by Will
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

dep_file.py hdlmake/dep_file.py +4 -4

No files found.
--- a/hdlmake/dep_file.py
+++ b/hdlmake/dep_file.py
@@ -197,12 +197,12 @@ class DepFile(File):
        if self.dep_level == None:
            if len(self.depends_on) == 0:
                self.dep_level = 0
-            elif self.dep_level >= 1000000:
-                raise Exception("Probably run into a circular reference of file dependencies.")
            else:
-                # set stupidly large value so can detect if the recusion below brings us back to
+                # set dep_level to a negative value so we can detect if the recusion below brings us back to
                # this file in a circular reference, that would otherwise result in an infinite loop.
-                self.dep_level = 1000000
+                self.dep_level = -1
                # recurse, to find the largest number of levels below.
                self.dep_level = 1 + max([dep.get_dep_level() for dep in self.depends_on]);
+        elif self.dep_level < 0:
+                raise Exception("Probably run into a circular reference of file dependencies.")
        return self.dep_level