Merge branch 'main' into 4.0.0-docs

TollyH · May 31, 2024 · 242c03a · 242c03a
2 parents c49f412 + 937d844
commit 242c03a
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 8 deletions.
diff --git a/AssemblerWarnings.Messages.cs b/AssemblerWarnings.Messages.cs
@@ -86,6 +86,7 @@ public partial class AssemblerWarnings
             { 0022, Strings_AssemblerWarnings.Suggestion_0022 },
             { 0023, Strings_AssemblerWarnings.Suggestion_0023 },
             { 0024, Strings_AssemblerWarnings.Suggestion_0024 },
+            { 0025, Strings_AssemblerWarnings.Suggestion_0025 },
         };
 
         public static Dictionary<int, string> GetMessagesForSeverity(WarningSeverity severity)

diff --git a/AssemblerWarnings.cs b/AssemblerWarnings.cs
@@ -180,6 +180,7 @@ public void NewLabel(string labelName, FilePosition filePosition, string? macroN
         {
             UpdateDisabledPositions(filePosition);
             labelDefinitionPositions[labelName] = (filePosition, macroName);
+            consecutiveDatCount = 0;
         }
 
         /// <summary>
@@ -289,6 +290,7 @@ public AssemblerWarnings(bool usingV1Format)
                 { 0023, Analyzer_Rolling_Suggestion_0023 },
 #endif
                 { 0024, Analyzer_Rolling_Suggestion_0024 },
+                { 0025, Analyzer_Rolling_Suggestion_0025 },
             };
 
             nonFatalErrorFinalAnalyzers = new Dictionary<int, FinalWarningAnalyzer>();
@@ -345,6 +347,7 @@ public AssemblerWarnings(bool usingV1Format)
         private string? lastMacroName;
         private int lastMacroLineDepth;
         private Stack<Assembler.ImportStackFrame> lastImportStack = new();
+        private int consecutiveDatCount = 0;
 
         private void PreAnalyzeStateUpdate()
         {
@@ -383,25 +386,34 @@ private void PreAnalyzeStateUpdate()
             if (instructionIsData)
             {
                 dataInsertionLines.Add((filePosition, macroName, macroLineDepth));
-                if (operands[0][0] == '"' && (
-                    mnemonic.Equals("%DAT", StringComparison.OrdinalIgnoreCase)
-                    || mnemonic.Equals("DAT", StringComparison.OrdinalIgnoreCase)))
+                if (mnemonic.Equals("%DAT", StringComparison.OrdinalIgnoreCase)
+                    || mnemonic.Equals("DAT", StringComparison.OrdinalIgnoreCase))
                 {
-                    instructionIsString = true;
-                    if (lastInstructionWasString)
+                    if (operands[0][0] == '"')
+                    {
+                        consecutiveDatCount = 0;
+                        instructionIsString = true;
+                        if (lastInstructionWasString)
+                        {
+                            // Only store the last in a chain of string insertions
+                            endingStringInsertionLines.RemoveAt(endingStringInsertionLines.Count - 1);
+                        }
+                        endingStringInsertionLines.Add((filePosition, macroName, macroLineDepth));
+                    }
+                    else
                     {
-                        // Only store the last in a chain of string insertions
-                        endingStringInsertionLines.RemoveAt(endingStringInsertionLines.Count - 1);
+                        consecutiveDatCount++;
                     }
-                    endingStringInsertionLines.Add((filePosition, macroName, macroLineDepth));
                 }
             }
             else if (instructionIsImport)
             {
+                consecutiveDatCount = 0;
                 importLines.Add((filePosition, macroName, macroLineDepth));
             }
             else if (newBytes.Length > 0)
             {
+                consecutiveDatCount = 0;
                 lastExecutableLine[filePosition.File] = filePosition.Line;
                 _ = executableAddresses.Add(currentAddress);
                 instructionIsExecutable = true;
@@ -1227,6 +1239,12 @@ private bool Analyzer_Rolling_Suggestion_0024()
                 && !operands[1].Contains('[');
         }
 
+        private bool Analyzer_Rolling_Suggestion_0025()
+        {
+            // Suggestion 0025: Use the %NUM directive instead of 8 consecutive %DAT directives.
+            return newBytes.Length > 0 && consecutiveDatCount > 0 && consecutiveDatCount % 8 == 0;
+        }
+
 #if DISPLACEMENT
         [GeneratedRegex(@"\[.*(?:[0-9]?\.[0-9]|[0-9]\.[0-9]?)")]
         private static partial Regex FloatingPointDisplacementRegex();

diff --git a/Resources/Localization/Strings.AssemblerWarnings.Designer.cs b/Resources/Localization/Strings.AssemblerWarnings.Designer.cs
diff --git a/Resources/Localization/Strings.AssemblerWarnings.resx b/Resources/Localization/Strings.AssemblerWarnings.resx
@@ -243,4 +243,7 @@
   <data name="Warning_0036" xml:space="preserve">
     <value>Pointer size other than 8 bits (`B*`) used in a context where a single byte will always be read.</value>
   </data>
+  <data name="Suggestion_0025" xml:space="preserve">
+    <value>Use the %NUM directive instead of 8 consecutive %DAT directives.</value>
+  </data>
 </root>
diff --git a/Test/KitchenSink.asm b/Test/KitchenSink.asm
@@ -7,6 +7,8 @@
 ; The exact binary output that this program should produce
 ; is located in KitchenSink.bin
 
+%ANALYZER suggestion, 0025, 0
+
 :ENTRY
 MVQ rg0, 69.0