use file decl for findclassinfo

Author: burdoto

kscr-compiler/CompilerRuntime.cs

@@ -43,7 +43,7 @@ public void CompileSource(string source, string? basePackage = null)
         {
             var decl = MakeFileDecl(src);
             ctx = new CompilerContext
-                { Parent = ctx, Class = FindClassInfo(src), Imports = FindClassImports(decl.imports()) };
+                { Parent = ctx, Class = FindClassInfo(decl), Imports = FindClassImports(decl.imports()) };
             node = new FileNode(this, ctx, new PackageNode(this, ctx, src.DirectoryName!, pkg), src).CreateClassNode();
             var mc = (node as MemberNode)!.ReadMembers();
             Log<CompilerRuntime>.At(LogLevel.Debug, $"Loaded {mc} members");
@@ -90,9 +90,8 @@ public List<string> FindClassImports(KScrParser.ImportsContext ctx)
         return yields;
     }
 
-    public ClassInfo FindClassInfo(FileInfo file)
+    public ClassInfo FindClassInfo(KScrParser.FileContext fileDecl)
     {
-        var fileDecl = MakeFileDecl(new AntlrFileStream(file.FullName), file.FullName);
         var pkg = Package.RootPackage.GetOrCreatePackage(fileDecl.packageDecl().id().GetText());
         return new ClassInfoVisitor(this, new CompilerContext { Package = pkg }).Visit(fileDecl.classDecl(0));
     }

kscr-compiler/NodeCompiler.cs

@@ -170,8 +170,8 @@ public FileNode(CompilerRuntime vm, CompilerContext ctx, PackageNode pkg, FileIn
     {
         Pkg = pkg;
         File = file;
-        ClassInfo = vm.FindClassInfo(file);
         Decl = vm.MakeFileDecl(File);
+        ClassInfo = vm.FindClassInfo(Decl);
         Imports = vm.FindClassImports(Decl.imports());
         Cls = Pkg.Package.GetOrCreateClass(ClassInfo.Name, vm, ClassInfo.Modifier, ClassInfo.ClassType)!;
     }

kscr-runtime/KScrStarter.cs

@@ -150,7 +150,10 @@ private static void WriteClasses(DirectoryInfo output, IEnumerable<FileInfo> sou
     {
         if (output.Exists)
             output.Delete(true);
-        Package.RootPackage.Write(VM, output, sources.Select(f => VM.FindClassInfo(f)).ToArray(), new StringCache());
+        Package.RootPackage.Write(VM, output, sources
+            .Select(VM.MakeFileDecl)
+            .Select(VM.FindClassInfo)
+            .ToArray(), new StringCache());
     }
 
     public static long Execute(out Stack stack, string? mainClassName = null)