Stuff for template pregenerated

raonygamer · raonygamer · commit 83a5cb21698f · 2025-11-01T14:33:12.000-03:00
diff --git a/Common/Models/FunctionSymbolModel.cs b/Common/Models/FunctionSymbolModel.cs
@@ -2,8 +2,7 @@
 
 namespace Amethyst.Common.Models
 {
-    public class FunctionSymbolModel
-    {
+    public class FunctionSymbolModel : INamedSymbol {
         [JsonProperty("name")]
         public string Name { get; set; } = string.Empty;
 
diff --git a/Common/Models/INamedSymbol.cs b/Common/Models/INamedSymbol.cs
@@ -0,0 +1,11 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Amethyst.Common.Models {
+    public interface INamedSymbol {
+        string Name { get; set; }
+    }
+}
diff --git a/Common/Models/VariableSymbolModel.cs b/Common/Models/VariableSymbolModel.cs
@@ -7,8 +7,7 @@
 
 namespace Amethyst.Common.Models
 {
-    public class VariableSymbolModel
-    {
+    public class VariableSymbolModel : INamedSymbol {
         [JsonProperty("name")]
         public string Name { get; set; } = string.Empty;
 
diff --git a/Common/Models/VirtualFunctionSymbolModel.cs b/Common/Models/VirtualFunctionSymbolModel.cs
@@ -7,8 +7,7 @@
 
 namespace Amethyst.Common.Models
 {
-    public class VirtualFunctionSymbolModel
-    {
+    public class VirtualFunctionSymbolModel : INamedSymbol {
         [JsonProperty("name")]
         public string Name { get; set; } = string.Empty;
 
diff --git a/Common/Models/VirtualTableSymbolModel.cs b/Common/Models/VirtualTableSymbolModel.cs
@@ -7,8 +7,7 @@
 
 namespace Amethyst.Common.Models
 {
-    public class VirtualTableSymbolModel
-    {
+    public class VirtualTableSymbolModel : INamedSymbol {
         [JsonProperty("name")]
         public string Name { get; set; } = string.Empty;
 
diff --git a/Common/Utility/Utils.cs b/Common/Utility/Utils.cs
@@ -98,5 +98,40 @@ private static IEnumerable<T> TakeChunk<T>(this IEnumerator<T> enumerator, int c
                 count++;
             } while (count < chunkSize && enumerator.MoveNext());
         }
+
+        public static int LevenshteinDistance(string a, string b) {
+            int[,] dp = new int[a.Length + 1, b.Length + 1];
+            for (int i = 0; i <= a.Length; i++)
+                dp[i, 0] = i;
+            for (int j = 0; j <= b.Length; j++)
+                dp[0, j] = j;
+
+            for (int i = 1; i <= a.Length; i++)
+                for (int j = 1; j <= b.Length; j++) {
+                    int cost = a[i - 1] == b[j - 1] ? 0 : 1;
+                    dp[i, j] = Math.Min(
+                        Math.Min(dp[i - 1, j] + 1, dp[i, j - 1] + 1),
+                        dp[i - 1, j - 1] + cost
+                    );
+                }
+
+            return dp[a.Length, b.Length];
+        }
+
+        public static bool CompareSymbolsWithThreshold(string symbolA, string symbolB, int charMatch = 3)
+        {
+            if (symbolA == symbolB)
+                return true;
+            if (symbolA.Length != symbolB.Length) 
+                return false;
+            int misses = 0;
+            for (int i = 0; i < symbolA.Length; i++) {
+                if (symbolA[i] != symbolB[i])
+                    misses++;
+                if (misses > charMatch)
+                    return false;
+            }
+            return true;
+        }
     }
 }
diff --git a/LibraryGenerator/Commands/MainCommand.cs b/LibraryGenerator/Commands/MainCommand.cs
@@ -19,7 +19,7 @@ public class MainCommand : ICommand
         [CommandOption("output", 'o', Description = "Path to the output directory where the lib will be generated.", IsRequired = true)]
         public string OutputPath { get; set; } = null!;
 
-        [CommandOption("platform", 'p', Description = "Target platform for symbol generation (e.g., win-client, win-server).", IsRequired = false)]
+        [CommandOption("platform", 'p', Description = "Target platform for symbol generation (e.g., win-client, win-server).")]
         public string Platform { get; set; } = "win-client";
 
         [CommandOption("pregen-sym", Description = "Overrides the default pregenerated.symbols.json file folder.")]
@@ -80,7 +80,7 @@ public ValueTask ExecuteAsync(IConsole console)
             // Collect all symbol files and accumulate mangled names
             IEnumerable<FileInfo> symbolFiles = PlatformSymbolInput
                 .EnumerateFiles("*.symbols.json", SearchOption.AllDirectories)
-                .Where(f => Path.GetFileName(f.FullName) != "pregenerated.symbols.json");
+                .Where(f => Path.GetFileName(f.FullName) != "pregenerated.symbols.json" && Path.GetFileName(f.FullName) != "template.pregenerated.symbols.json");
 
             string pregeneratedPath = PregeneratedSymbolsPath is null ? 
                 Path.Combine(PlatformSymbolInput.FullName, "pregenerated.symbols.json") :
@@ -117,6 +117,9 @@ public ValueTask ExecuteAsync(IConsole console)
                 }
             }
 
+            Directory.EnumerateFiles(PlatformOutput.FullName, "Minecraft.Windows.*.def").ToList().ForEach(File.Delete);
+            Directory.EnumerateFiles(PlatformOutput.FullName, "Minecraft.Windows.*.lib").ToList().ForEach(File.Delete);
+
             int index = 0;
             foreach (var chunk in allMangledNames.ChunkBy(65500))
             {
@@ -131,6 +134,7 @@ public ValueTask ExecuteAsync(IConsole console)
                 var libProc = Lib.GenerateLib(defFilePath, libFilePath);
                 libProc.WaitForExit();
                 if (libProc.ExitCode != 0) {
+                    Logger.Fatal($"lib.exe failed on chunk {index}, output: {libProc.StandardError.ReadToEnd()}");
                     return ValueTask.FromException(new Exception("Library generation aborted due to errors."));
                 }
 
diff --git a/LibraryGenerator/Tools/MSVC/Lib.cs b/LibraryGenerator/Tools/MSVC/Lib.cs
@@ -71,12 +71,6 @@ public static Process GenerateLib(string defFile, string libPath)
             };
 
             process.BeginErrorReadLine();
-            process.ErrorDataReceived += (sender, data) =>
-            {
-                if (!string.IsNullOrEmpty(data.Data))
-                    Console.Error.WriteLine(data.Data);
-            };
-
             return process;
         }
     }
diff --git a/ModuleTweaker/Commands/MainCommand.cs b/ModuleTweaker/Commands/MainCommand.cs
@@ -97,7 +97,7 @@ ulong ParseAddress(string? address)
             // Collect all symbol files and accumulate mangled names
             IEnumerable<FileInfo> symbolFiles = PlatformSymbolInput
                 .EnumerateFiles("*.symbols.json", SearchOption.AllDirectories)
-                .Where(f => Path.GetFileName(f.FullName) != "pregenerated.symbols.json");
+                .Where(f => Path.GetFileName(f.FullName) != "pregenerated.symbols.json" && Path.GetFileName(f.FullName) != "template.pregenerated.symbols.json");
 
             string pregeneratedPath = PregeneratedSymbolsPath is null ? 
                 Path.Combine(PlatformSymbolInput.FullName, "pregenerated.symbols.json") :
diff --git a/SymbolGenerator/Commands/MainCommand.cs b/SymbolGenerator/Commands/MainCommand.cs
@@ -67,8 +67,12 @@ public ValueTask ExecuteAsync(IConsole console)
                 .Where(c => c.ChangeType == ChangeType.Deleted)];
 
             List<RawAnnotation> annotations = [];
-            Dictionary<string, List<object>> annotationsData = [];
+            Dictionary<string, List<INamedSymbol>> annotationsData = [];
 
+            ASTMethod[] methods = [];
+            ASTVariable[] variables = [];
+            ASTClass[] classes = [];
+            AbstractAnnotationTarget[] targets = [];
             if (addedOrModified.Length != 0)
             {
                 // Prepare .cpp file for parsing
@@ -78,9 +82,6 @@ public ValueTask ExecuteAsync(IConsole console)
                     return [.. Utils.CreateIncludeFile(generatedFile, Input.FullName, addedOrModified)];
                 });
 
-                ASTMethod[] methods = [];
-                ASTVariable[] variables = [];
-                ASTClass[] classes = [];
                 Utils.Benchmark("Parse the AST", () =>
                 {
                     // Parse the generated .cpp file
@@ -109,6 +110,7 @@ public ValueTask ExecuteAsync(IConsole console)
                     methods = [.. visitor.Methods];
                     variables = [.. visitor.Variables];
                     classes = [.. visitor.Classes];
+                    targets = [.. methods, .. variables, .. classes];
                 });
 
                 Utils.Benchmark("Parse the comments", () =>
@@ -159,7 +161,8 @@ public ValueTask ExecuteAsync(IConsole console)
 
                         if (!annotationsData.ContainsKey(location.File))
                             annotationsData[location.File] = [];
-                        annotationsData[location.File].Add(processed.Data);
+                        // Kinda hacky, will change later
+                        annotationsData[location.File].Add((processed.Data as INamedSymbol)!);
 
                         if (processed.Data is VirtualTableSymbolModel vtable && processed.Target is ASTClass cls)
                         {
@@ -196,6 +199,34 @@ public ValueTask ExecuteAsync(IConsole console)
                     NullValueHandling = NullValueHandling.Ignore,
                 };
 
+                string templatePredefined = Path.Combine(PlatformOutput.FullName, "symbols", "template.pregenerated.symbols.json");
+                if (File.Exists(templatePredefined)) {
+                    string json = File.ReadAllText(templatePredefined);
+                    var predefinedSymbols = JsonConvert.DeserializeObject<SymbolJSONModel>(json, jsonSettings);
+                    if (predefinedSymbols is not null)
+                    {
+                        INamedSymbol[] namedSymbols = [
+                            ..predefinedSymbols.Functions,
+                            ..predefinedSymbols.Variables,
+                            ..predefinedSymbols.VirtualTables,
+                            ..predefinedSymbols.VirtualFunctions
+                        ];
+
+                        foreach (var symbol in namedSymbols)
+                        {
+                            if (targets.FirstOrDefault(t => Utils.CompareSymbolsWithThreshold(t.IdentificationName, symbol.Name)) is { } target) {
+                                if (!target.IsImported || annotationsData.SelectMany(kv => kv.Value).Any(v => Utils.CompareSymbolsWithThreshold(v.Name, symbol.Name)))
+                                    continue;
+                                string file = target.Location?.File ?? "<unknown>";
+                                if (!annotationsData.ContainsKey(file))
+                                    annotationsData[file] = [];
+                                symbol.Name = target.IdentificationName;
+                                annotationsData[file].Add(symbol);
+                            }
+                        }
+                    }
+                }
+
                 // Generate output JSON files
                 foreach (var (file, data) in annotationsData)
                 {
diff --git a/SymbolGenerator/Parsing/ASTClass.cs b/SymbolGenerator/Parsing/ASTClass.cs
@@ -7,10 +7,12 @@ public class ASTClass : AbstractAnnotationTarget
     {
         public string? Name { get; set; }
         public string? Namespace { get; set; }
+        public override string IdentificationName => FullName;
         public override CursorLocation? Location { get; set; }
         public ASTBaseSpecifier[] DirectBaseClasses { get; set; } = [];
         public ASTMethod[] Methods { get; set; } = [];
         public ASTVariable[] Variables { get; set; } = [];
+        public override bool IsImported { get; set; } = false;
         public string? RawComment { get; set; }
         public string FullName => string.IsNullOrEmpty(Namespace) ? Name! : $"{Namespace}::{Name}";
         public bool IsBase => DirectBaseClasses.Length == 0;
diff --git a/SymbolGenerator/Parsing/ASTMethod.cs b/SymbolGenerator/Parsing/ASTMethod.cs
@@ -7,11 +7,12 @@ public class ASTMethod : AbstractAnnotationTarget
     {
         public string Name { get; set; } = null!;
         public string MangledName { get; set; } = null!;
+        public override string IdentificationName => MangledName;
         public string? Namespace { get; set; } = null;
         public ASTClass? DeclaringClass { get; set; } = null;
         public override CursorLocation? Location { get; set; } = null;
         public bool IsVirtual { get; set; } = false;
-        public bool IsImported { get; set; } = false;
+        public override bool IsImported { get; set; } = false;
         public bool IsConstructor { get; set; } = false;
         public bool IsDestructor { get; set; } = false;
         public string? RawComment { get; set; } = null;
diff --git a/SymbolGenerator/Parsing/ASTVariable.cs b/SymbolGenerator/Parsing/ASTVariable.cs
@@ -7,10 +7,11 @@ public class ASTVariable : AbstractAnnotationTarget
     {
         public string Name { get; set; } = string.Empty;
         public string MangledName { get; set; } = string.Empty;
+        public override string IdentificationName => MangledName;
         public string? Namespace { get; set; } = null;
         public ASTClass? DeclaringClass { get; set; } = null;
         public override CursorLocation? Location { get; set; } = null;
-        public bool IsImported { get; set; } = false;
+        public override bool IsImported { get; set; } = false;
         public string? RawComment { get; set; } = null;
         public bool IsStatic { get; set; } = false;
         public bool IsFreeVariable => DeclaringClass is null;
diff --git a/SymbolGenerator/Parsing/Annotations/AbstractAnnotationTarget.cs b/SymbolGenerator/Parsing/Annotations/AbstractAnnotationTarget.cs
@@ -5,8 +5,10 @@ namespace Amethyst.SymbolGenerator.Parsing.Annotations
     public abstract class AbstractAnnotationTarget
     {
         public virtual CursorLocation? Location { get; set; }
-
         public HashSet<ProcessedAnnotation> Annotations { get; set; } = [];
+        public bool IsAnnotated => Annotations.Count > 0;
+        public abstract bool IsImported { get; set; }
+        public abstract string IdentificationName { get; }
 
         public bool HasAnnotation(AnnotationID id)
         {
diff --git a/SymbolGenerator/Parsing/Annotations/AnnotationProcessor.cs b/SymbolGenerator/Parsing/Annotations/AnnotationProcessor.cs
@@ -1,4 +1,4 @@
-﻿using Amethyst.Common.Diagnostics;
+using Amethyst.Common.Diagnostics;
 using Amethyst.Common.Utility;
 using Amethyst.SymbolGenerator.Parsing.Annotations.Comments;
 using System.Reflection;
@@ -58,6 +58,7 @@ private void Process(RawAnnotation annotation)
             Type? handlerType = Handlers.FirstOrDefault(h => h.Key.Tags.Select(t => t.ToLowerInvariant()).Contains(tagLower)).Value;
             if (handlerType is null)
             {
+                Logger.Warn($"No handler found for annotation '{annotation}'", annotation.Location);
                 return;
             }
 

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Amethyst.Common.Models`
`4`	`4`	`{`
`5`		`- public class FunctionSymbolModel`
`6`		`- {`
	`5`	`+ public class FunctionSymbolModel : INamedSymbol {`
`7`	`6`	`[JsonProperty("name")]`
`8`	`7`	`public string Name { get; set; } = string.Empty;`
`9`	`8`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,7 @@`
`7`	`7`
`8`	`8`	`namespace Amethyst.Common.Models`
`9`	`9`	`{`
`10`		`- public class VariableSymbolModel`
`11`		`- {`
	`10`	`+ public class VariableSymbolModel : INamedSymbol {`
`12`	`11`	`[JsonProperty("name")]`
`13`	`12`	`public string Name { get; set; } = string.Empty;`
`14`	`13`
Original file line number	Diff line number	Diff line change
`@@ -71,12 +71,6 @@ public static Process GenerateLib(string defFile, string libPath)`
`71`	`71`	`};`
`72`	`72`
`73`	`73`	`process.BeginErrorReadLine();`
`74`		`- process.ErrorDataReceived += (sender, data) =>`
`75`		`- {`
`76`		`- if (!string.IsNullOrEmpty(data.Data))`
`77`		`- Console.Error.WriteLine(data.Data);`
`78`		`- };`
`79`		`-`
`80`	`74`	`return process;`
`81`	`75`	`}`
`82`	`76`	`}`