...

compiler/NubLang.CLI/Program.cs

@@ -1,7 +1,9 @@
-using NubLang.CLI;
+using System.Collections.Immutable;
+using NubLang.CLI;
 using NubLang.Code;
 using NubLang.Diagnostics;
 using NubLang.Generation.QBE;
+using NubLang.Modules;
 using NubLang.Parsing;
 using NubLang.Parsing.Syntax;
 using NubLang.Tokenization;
@@ -60,16 +62,30 @@ foreach (var file in options.Files)
     syntaxTrees.Add(syntaxTree);
 }
 
-var moduleSignatures = Module.CollectFromSyntaxTrees(syntaxTrees);
+var moduleRepository = new ModuleRepository(syntaxTrees);
 
 var definitions = new List<DefinitionNode>();
 
+var referencedStructTypes = new HashSet<StructTypeNode>();
+var referencedInterfaceTypes = new HashSet<InterfaceTypeNode>();
+
 foreach (var syntaxTree in syntaxTrees)
 {
-    var typeChecker = new TypeChecker(syntaxTree, moduleSignatures);
-    var checkedDefinitions = typeChecker.Check();
-    diagnostics.AddRange(typeChecker.GetDiagnostics());
-    definitions.AddRange(checkedDefinitions);
+    var typeChecker = new TypeChecker(syntaxTree, moduleRepository);
+    typeChecker.Check();
+
+    definitions.AddRange(typeChecker.Definitions);
+    diagnostics.AddRange(typeChecker.Diagnostics);
+
+    foreach (var structType in typeChecker.ReferencedStructTypes)
+    {
+        referencedStructTypes.Add(structType);
+    }
+    
+    foreach (var interfaceType in typeChecker.ReferencedInterfaceTypes)
+    {
+        referencedInterfaceTypes.Add(interfaceType);
+    }
 }
 
 foreach (var diagnostic in diagnostics)
@@ -84,7 +100,7 @@ if (diagnostics.Any(diagnostic => diagnostic.Severity == DiagnosticSeverity.Erro
 
 Directory.CreateDirectory(".build");
 
-var generator = new QBEGenerator(definitions, moduleSignatures);
+var generator = new QBEGenerator(definitions, referencedStructTypes.ToImmutableHashSet(), referencedInterfaceTypes.ToImmutableHashSet());
 var ssa = generator.Emit();
 var ssaFilePath = Path.Combine(".build", "out.ssa");
 File.WriteAllText(ssaFilePath, ssa);