Ignore external (no module) translation units

Signed-off-by: Dimitar Dobrev <[email protected]>

Author: ddobrev

src/Generator.Tests/ASTTestFixture.cs

@@ -18,10 +18,10 @@ protected void ParseLibrary(params string[] files)
             var parserOptions = new ParserOptions();
 
             var testsPath = GeneratorTest.GetTestsDirectory("Native");
-            parserOptions.AddIncludeDirs(testsPath);
             parserOptions.SkipPrivateDeclarations = true;
 
             var module = options.AddModule("Test");
+            module.IncludeDirs.Add(testsPath);
             module.Headers.AddRange(files);
 
             Driver = new Driver(options)

src/Generator.Tests/GeneratorTest.cs

@@ -42,9 +42,16 @@ public virtual void Setup(Driver driver)
             testModule.IncludeDirs.Add(path);
 
             Diagnostics.Message("Looking for tests in: {0}", path);
-            var files = Directory.EnumerateFiles(path, "*.h");
+            var files = Directory.EnumerateFiles(path, "*.h", SearchOption.AllDirectories);
             foreach (var file in files)
+            {
+                string includeDir = Path.GetDirectoryName(file);
+                if (!testModule.IncludeDirs.Contains(includeDir))
+                {
+                    testModule.IncludeDirs.Add(includeDir);
+                }
                 testModule.Headers.Add(Path.GetFileName(file));
+            }
         }
 
         public virtual void Preprocess(Driver driver, ASTContext ctx)

src/Generator/Passes/CleanUnitPass.cs

@@ -31,20 +31,24 @@ private Module GetModule(TranslationUnit unit)
                 includeDir = ".";
             includeDir = Path.GetFullPath(includeDir);
 
-            return Options.Modules.FirstOrDefault(
-                m => m.IncludeDirs.Any(i => Path.GetFullPath(i) == includeDir)) ??
-                    Options.Modules[1];
+            Module module = Options.Modules.Find(
+                m => m.IncludeDirs.Any(i => Path.GetFullPath(i) == includeDir));
+            if (module == null)
+            {
+                unit.ExplicitlyIgnore();
+                module = Options.Modules[1];
+            }
+            return module;
         }
 
         public override bool VisitDeclarationContext(DeclarationContext context)
         {
             return false;
         }
 
-        string GetIncludePath(string filePath)
+        private string GetIncludePath(string filePath)
         {
             var includePath = filePath;
-            var shortestIncludePath = filePath;
 
             for (uint i = 0; i < Context.ParserOptions.IncludeDirsCount; ++i)
             {
@@ -57,16 +61,15 @@ string GetIncludePath(string filePath)
                     idx = filePath.IndexOf(path, System.StringComparison.Ordinal);
                 }
 
-                if (idx == -1) continue;
-
-                string inc = filePath.Substring(path.Length);
-
-                if (inc.Length < includePath.Length && inc.Length < shortestIncludePath.Length)
-                    shortestIncludePath = inc;
+                if (idx != -1)
+                {
+                    includePath = filePath[path.Length..];
+                    break;
+                }
             }
 
             includePath = Options.IncludePrefix
-                + shortestIncludePath.TrimStart(new char[] { '\\', '/' });
+                + includePath.TrimStart(new char[] { '\\', '/' });
 
             return includePath.Replace('\\', '/');
         }

src/Generator/Passes/DelegatesPass.cs

@@ -215,7 +215,8 @@ private DeclarationContext GetDeclContextForDelegates(DeclarationContext @namesp
             Namespace parent = null;
             if (string.IsNullOrEmpty(module.OutputNamespace))
             {
-                var groups = module.Units.SelectMany(u => u.Declarations).OfType<Namespace>(
+                var groups = module.Units.Where(u => u.IsGenerated).SelectMany(
+                    u => u.Declarations).OfType<Namespace>(
                     ).GroupBy(d => d.Name).Where(g => g.Any(d => d.HasDeclarations)).ToList();
                 if (groups.Count == 1)
                     parent = groups.Last().Last();
@@ -231,7 +232,7 @@ private DeclarationContext GetDeclContextForDelegates(DeclarationContext @namesp
             }
 
             if (parent == null)
-                parent = module.Units.Last();
+                parent = module.Units.Last(u => u.IsGenerated);
 
             var namespaceDelegates = new Namespace
                 {