.NET: Fix System->app reference (why)

praydog · Mar 30, 2024 · 3ea871c · 3ea871c
1 parent 2be442c
commit 3ea871c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/csharp-api/AssemblyGenerator/ClassGenerator.cs b/csharp-api/AssemblyGenerator/ClassGenerator.cs
@@ -11,6 +11,7 @@
 using System.Security.Cryptography;
 using System.Linq;
 using Microsoft.CodeAnalysis.Operations;
+using REFrameworkNET;
 
 
 public class ClassGenerator {
@@ -162,10 +163,18 @@ public ClassGenerator(string className_, REFrameworkNET.TypeDefinition t_, REFra
                                 // Stuff in System should NOT be referencing via
                                 // how is this even compiling for them?
                                 if (ogClassName.StartsWith("System") && methodReturnName.StartsWith("via")) {
+                                    REFrameworkNET.API.LogWarning("Method " + ogClassName + "." + method.Name + " is referencing via class " + methodReturnName);
                                     returnType = SyntaxFactory.PredefinedType(SyntaxFactory.Token(SyntaxKind.ObjectKeyword));
                                     break;
                                 }
 
+                                if (ogClassName.StartsWith("System") && methodReturnName.StartsWith("app.")) {
+                                    REFrameworkNET.API.LogWarning("Method " + ogClassName + "." + method.Name + " is referencing app class " + methodReturnName);
+                                    returnType = SyntaxFactory.PredefinedType(SyntaxFactory.Token(SyntaxKind.ObjectKeyword));
+                                    break;
+                                }
+
+
                                 methodReturnName = "global::" + REFrameworkNET.AssemblyGenerator.CorrectTypeName(methodReturnName);
 
                                 returnType = SyntaxFactory.ParseTypeName(methodReturnName);

diff --git a/csharp-api/AssemblyGenerator/Generator.cs b/csharp-api/AssemblyGenerator/Generator.cs
@@ -370,6 +370,8 @@ [.. methods]
             strippedAssemblyName = "_System";
         }
 
+        REFrameworkNET.API.LogInfo("Generating assembly " + strippedAssemblyName);
+
         List<CompilationUnitSyntax> compilationUnits = [];
         var tdb = REFrameworkNET.API.GetTDB();