Add support for configurable preprocessor directives

OxideMod · Nov 19, 2023 · 176a030 · 176a030
1 parent 70f67b4
commit 176a030
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/CSharp/CSharpLanguage.cs b/src/CSharp/CSharpLanguage.cs
@@ -43,9 +43,9 @@ public async Task Compile(int id, CompilerData data)
             Stopwatch stopwatch = Stopwatch.StartNew();
             _logger.LogInformation(Events.Compile, $"Starting compilation of job {id} | Total Plugins: {data.SourceFiles.Length}");
             string details =
-                $"Settings[Encoding: {data.Encoding}, CSVersion: {data.CSharpVersion()}, Target: {data.OutputKind()}, Platform: {data.Platform()}, StdLib: {data.StdLib}, Debug: {data.Debug}]";
+                $"Settings[Encoding: {data.Encoding}, CSVersion: {data.CSharpVersion()}, Target: {data.OutputKind()}, Platform: {data.Platform()}, StdLib: {data.StdLib}, Debug: {data.Debug}, Preprocessor: {string.Join(", ", data.Preprocessor)}]";
 
-            if (Program.ApplicationLogLevel.MinimumLevel < LogEventLevel.Debug)
+            if (Program.ApplicationLogLevel.MinimumLevel <= LogEventLevel.Debug)
             {
                 if (data.ReferenceFiles.Length > 0)
                 {
@@ -150,7 +150,7 @@ private async Task<CompilerMessage> SafeCompile(CompilerData data, CompilerMessa
 
             Dictionary<CompilerFile, SyntaxTree> trees = new();
             Encoding encoding = Encoding.GetEncoding(data.Encoding);
-            CSharpParseOptions options = new(data.CSharpVersion());
+            CSharpParseOptions options = new(data.CSharpVersion(), preprocessorSymbols: data.Preprocessor);
             foreach (var source in data.SourceFiles)
             {
                 string fileName = Path.GetFileName(source.Name);

diff --git a/src/ObjectStream/Data/CompilerData.cs b/src/ObjectStream/Data/CompilerData.cs
@@ -26,6 +26,7 @@ public CompilerData()
         public CompilerLanguageVersion Version { get; set; }
         public string Encoding { get; set; }
         public bool Debug { get; set; }
+        public string[] Preprocessor { get; set; }
 
         [NonSerialized]
         public CompilerMessage Message;