From ca38b7751cb423b891934a8f412d5523a8c642dc Mon Sep 17 00:00:00 2001
From: Andy McFadden <fadden@fadden.com>
Date: Tue, 30 Apr 2024 13:27:07 -0700
Subject: [PATCH] Tweak label file generation

Include an altered version of the uniquified local label, so that
VICE will keep the full set.

(issue #151)
---
 SourceGen/LabelFileGenerator.cs | 11 ++++++++---
 SourceGen/Symbol.cs             |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/SourceGen/LabelFileGenerator.cs b/SourceGen/LabelFileGenerator.cs
index b70ad1d..e8a8279 100644
--- a/SourceGen/LabelFileGenerator.cs
+++ b/SourceGen/LabelFileGenerator.cs
@@ -67,16 +67,21 @@ namespace SourceGen {
             // Sort alphabetically.  Not necessary, but it could make a "diff" easier to read.
             symList.Sort((a, b) => Symbol.Compare(Symbol.SymbolSortField.Name, true, a, b));
 
+            Debug.Assert(mFormat == LabelFmt.VICE);
+
             // VICE format is "add_label <address> <label>", but may be abbreviated "al".
             // We could also use ACME format ("labelname = $1234 ; Maybe a comment").
             foreach (Symbol sym in symList) {
-                string label = sym.LabelWithoutTag;
+                // VICE only keeps one copy of each label, so local labels need to include the
+                // uniquifier.  The UNIQUE_TAG_CHAR may not be accepted, so replace it with '_'.
+                string label = sym.Label;
+                label = label.Replace(Symbol.UNIQUE_TAG_CHAR, '_');
                 if (sym.IsNonUnique) {
-                    // Use the cc65 convention for local labels.
+                    // Add the cc65 prefix convention for local labels.
                     label = '@' + label;
                 }
                 // The cc65 docs (https://www.cc65.org/doc/debugging-4.html) say all labels
-                // must be prefaced with '.'.
+                // must be prefaced with '.'.  VICE rejects labels that start with a letter.
                 label = '.' + label;
                 outStream.WriteLine("al " + sym.Value.ToString("x6") + " " + label);
             }
diff --git a/SourceGen/Symbol.cs b/SourceGen/Symbol.cs
index 48e0b5a..561fd77 100644
--- a/SourceGen/Symbol.cs
+++ b/SourceGen/Symbol.cs
@@ -23,8 +23,8 @@ namespace SourceGen {
     /// </summary>
     public class Symbol {
         public const char UNCERTAIN_CHAR = '?';
+        public const char UNIQUE_TAG_CHAR = '\u00a7';   // SECTION SIGN
         private const char NO_ANNO_CHAR = '\ufffd';     // REPLACEMENT CHARACTER '�'
-        private const char UNIQUE_TAG_CHAR = '\u00a7';  // SECTION SIGN
         private const int NON_UNIQUE_LEN = 7;           // NON_UNIQUE_CHAR + 6 hex digits
 
         /// <summary>