Always compile debug information components

TollyH · Jun 6, 2024 · 18d0969 · 18d0969
1 parent 952d26f
commit 18d0969
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 38 deletions.
diff --git a/AssEmbly.csproj b/AssEmbly.csproj
@@ -58,8 +58,6 @@
   <ItemGroup Condition="!$(DefineConstants.Contains(';DEBUGGER;'))">
     <Compile Remove="Debugger.cs" />
     <Compile Remove="Debugger.*.cs" />
-    <Compile Remove="DebugInfo.cs" />
-    <Compile Remove="DebugInfo.*.cs" />
   </ItemGroup>
 
   <ItemGroup Condition="!$(DefineConstants.Contains(';DISASSEMBLER;'))">

diff --git a/Assembler.cs b/Assembler.cs
@@ -11,9 +11,7 @@ namespace AssEmbly
     public readonly record struct AssemblyResult
     (
         byte[] Program,
-#if DEBUGGER
         string DebugInfo,
-#endif
         string[] ExpandedSourceFile,
 #if ASSEMBLER_WARNINGS
         Warning[] Warnings,
@@ -452,17 +450,13 @@ public AssemblyResult GetAssemblyResult(bool finalize)
             {
                 programBytes = program.ToArray();
             }
-#if DEBUGGER
             string debugInfo = DebugInfo.GenerateDebugInfoFile((uint)program.Count, assembledLines,
                 // Convert dictionary to sorted list
                 addressLabelNames.Select(x => (x.Key, x.Value)).OrderBy(x => x.Key).ToList(),
                 resolvedImports, fileLineMap);
-#endif
             return new AssemblyResult(
                 programBytes,
-#if DEBUGGER
                 debugInfo,
-#endif
                 dynamicLines.ToArray(),
 #if ASSEMBLER_WARNINGS
                 warnings.ToArray(),

diff --git a/DebugInfo.cs b/DebugInfo.cs
@@ -110,11 +110,11 @@ public static DebugInfoFile ParseDebugInfoFile(string fileText)
             Match fileMatch = DebugFileRegex.Match(fileText);
             if (!fileMatch.Success)
             {
-                throw new DebugFileException(Strings_Debugger.DebugInfo_Error_Invalid_Format);
+                throw new DebugFileException(Strings.DebugInfo_Error_Invalid_Format);
             }
             if (fileMatch.Groups["Version"].Value != FormatVersion)
             {
-                throw new DebugFileException(Strings_Debugger.DebugInfo_Error_Wrong_Version);
+                throw new DebugFileException(Strings.DebugInfo_Error_Wrong_Version);
             }
 
             List<(ulong Address, string Line)> assembledInstructions = new();

diff --git a/Exceptions.cs b/Exceptions.cs
@@ -159,7 +159,6 @@ public WhileLimitExceededException([Localizable(true)] string message, int line,
     }
 #endif
 
-#if DEBUGGER
     /// <summary>
     /// Represents exceptions specific to the AssEmbly debugger.
     /// </summary>
@@ -183,7 +182,6 @@ public DebugFileException([Localizable(true)] string message, Exception inner) :
         public DebugFileException([Localizable(true)] string message, [Localizable(true)] string consoleMessage) : base(message, consoleMessage) { }
         public DebugFileException([Localizable(true)] string message, [Localizable(true)] string consoleMessage, Exception inner) : base(message, consoleMessage, inner) { }
     }
-#endif
 
 #if PROCESSOR
     /// <summary>

diff --git a/Program.cs b/Program.cs
@@ -307,12 +307,10 @@ private static void AssembleSourceFile(CommandLineArgs args)
                 programSize = bytes.LongLength - AAPFile.HeaderSize;
             }
 
-#if DEBUGGER
             if (!args.IsOptionGiven('D', "no-debug-file"))
             {
                 File.WriteAllText(destination + ".adi", assemblyResult.DebugInfo);
             }
-#endif
             if (args.IsOptionGiven('e', "output-expanded"))
             {
                 File.WriteAllLines(filename + ".exp.asm", assemblyResult.ExpandedSourceFile);

diff --git a/Resources/Localization/Strings.Debugger.Designer.cs b/Resources/Localization/Strings.Debugger.Designer.cs
diff --git a/Resources/Localization/Strings.Debugger.resx b/Resources/Localization/Strings.Debugger.resx
@@ -263,12 +263,6 @@ Halt instruction reached. You should not continue unless this instruction was pl
   <data name="Warning_Stack_Empty" xml:space="preserve">
     <value>The stack is currently empty.</value>
   </data>
-  <data name="DebugInfo_Error_Invalid_Format" xml:space="preserve">
-    <value>The provided debug information file was in an invalid format</value>
-  </data>
-  <data name="DebugInfo_Error_Wrong_Version" xml:space="preserve">
-    <value>The provided debug information file was created for a different version of AssEmbly</value>
-  </data>
   <data name="REPL_Changed_Flags_Header" xml:space="preserve">
     <value>Flag changes:</value>
   </data>

diff --git a/Resources/Localization/Strings.Designer.cs b/Resources/Localization/Strings.Designer.cs
diff --git a/Resources/Localization/Strings.resx b/Resources/Localization/Strings.resx
@@ -115,4 +115,10 @@ Licensed under GPLv3; run the "license" operation for details.</value>
   <data name="Generic_Unmapped" xml:space="preserve">
     <value>unmapped</value>
   </data>
+  <data name="DebugInfo_Error_Invalid_Format" xml:space="preserve">
+    <value>The provided debug information file was in an invalid format</value>
+  </data>
+  <data name="DebugInfo_Error_Wrong_Version" xml:space="preserve">
+    <value>The provided debug information file was created for a different version of AssEmbly</value>
+  </data>
 </root>