From e9fbc6c96c7402c2784a6f1849ec8b9dfd465c1e Mon Sep 17 00:00:00 2001 From: Andy McFadden Date: Sun, 18 Oct 2020 15:47:11 -0700 Subject: [PATCH] Change Merlin 32 output suffix We append an assembler identifier to generated code. For Merlin 32, this was "_Merlin32". All of the other assemblers use a lower-case string, which makes Merlin look a little weird, so it has been changed to "_merlin32". Windows filesystems are generally case-insensitive, so this won't likely affect anything. --- .gitignore | 2 +- SourceGen/AsmGen/AsmMerlin32.cs | 2 +- ...value-6502_Merlin32.S => 10000-allops-value-6502_merlin32.S} | 0 ...lue-65C02_Merlin32.S => 10001-allops-value-65C02_merlin32.S} | 0 ...lue-65816_Merlin32.S => 10002-allops-value-65816_merlin32.S} | 0 ...e-W65C02_Merlin32.S => 10003-allops-value-W65C02_merlin32.S} | 0 ...s-zero-6502_Merlin32.S => 10010-allops-zero-6502_merlin32.S} | 0 ...zero-65C02_Merlin32.S => 10011-allops-zero-65C02_merlin32.S} | 0 ...zero-65816_Merlin32.S => 10012-allops-zero-65816_merlin32.S} | 0 ...ro-W65C02_Merlin32.S => 10013-allops-zero-W65C02_merlin32.S} | 0 ...ctions_Merlin32.S => 10022-embedded-instructions_merlin32.S} | 0 ...-branches_Merlin32.S => 10032-flags-and-branches_merlin32.S} | 0 ...recognition_Merlin32.S => 10040-data-recognition_merlin32.S} | 0 ...-numeric-types_Merlin32.S => 20000-numeric-types_merlin32.S} | 0 ...10-string-types_Merlin32.S => 20010-string-types_merlin32.S} | 0 ...rand-formats_Merlin32.S => 20020-operand-formats_merlin32.S} | 0 ...rand-formats_Merlin32.S => 20022-operand-formats_merlin32.S} | 0 ...d-symbols_Merlin32.S => 20030-labels-and-symbols_merlin32.S} | 0 ...d-symbols_Merlin32.S => 20032-labels-and-symbols_merlin32.S} | 0 ...ress-changes_Merlin32.S => 20040-address-changes_merlin32.S} | 0 ...ress-changes_Merlin32.S => 20042-address-changes_merlin32.S} | 0 ...and-banks_Merlin32.S => 20050-branches-and-banks_merlin32.S} | 0 ...and-banks_Merlin32.S => 20052-branches-and-banks_merlin32.S} | 0 ...adjustment_Merlin32.S => 20062-target-adjustment_merlin32.S} | 0 .../{20070-hinting_Merlin32.S => 20070-hinting_merlin32.S} | 0 ...el-localizer_Merlin32.S => 20081-label-localizer_merlin32.S} | 0 ...-comments_Merlin32.S => 20090-notes-and-comments_merlin32.S} | 0 .../{20102-label-dp_Merlin32.S => 20102-label-dp_merlin32.S} | 0 .../{20110-64k-nops_Merlin32.S => 20110-64k-nops_merlin32.S} | 0 ...r-encoding-a_Merlin32.S => 20122-char-encoding-a_merlin32.S} | 0 ...r-encoding-p_Merlin32.S => 20132-char-encoding-p_merlin32.S} | 0 ...r-encoding-s_Merlin32.S => 20142-char-encoding-s_merlin32.S} | 0 ...al-variables_Merlin32.S => 20152-local-variables_merlin32.S} | 0 ...nts-65816_Merlin32.S => 20162-cycle-counts-65816_merlin32.S} | 0 ...nal-symbols_Merlin32.S => 20170-external-symbols_merlin32.S} | 0 ...on-scripts_Merlin32.S => 20182-extension-scripts_merlin32.S} | 0 ...que-labels_Merlin32.S => 20190-non-unique-labels_merlin32.S} | 0 ...-ui-edge-cases_Merlin32.S => 20200-ui-edge-cases_merlin32.S} | 0 ...{20212-reloc-data_Merlin32.S => 20212-reloc-data_merlin32.S} | 0 .../{20222-data-bank_Merlin32.S => 20222-data-bank_merlin32.S} | 0 .../{20233-rockwell_Merlin32.S => 20233-rockwell_merlin32.S} | 0 41 files changed, 2 insertions(+), 2 deletions(-) rename SourceGen/SGTestData/Expected/{10000-allops-value-6502_Merlin32.S => 10000-allops-value-6502_merlin32.S} (100%) rename SourceGen/SGTestData/Expected/{10001-allops-value-65C02_Merlin32.S => 10001-allops-value-65C02_merlin32.S} (100%) rename SourceGen/SGTestData/Expected/{10002-allops-value-65816_Merlin32.S => 10002-allops-value-65816_merlin32.S} (100%) rename SourceGen/SGTestData/Expected/{10003-allops-value-W65C02_Merlin32.S => 10003-allops-value-W65C02_merlin32.S} (100%) rename SourceGen/SGTestData/Expected/{10010-allops-zero-6502_Merlin32.S => 10010-allops-zero-6502_merlin32.S} (100%) rename SourceGen/SGTestData/Expected/{10011-allops-zero-65C02_Merlin32.S => 10011-allops-zero-65C02_merlin32.S} (100%) rename SourceGen/SGTestData/Expected/{10012-allops-zero-65816_Merlin32.S => 10012-allops-zero-65816_merlin32.S} (100%) rename SourceGen/SGTestData/Expected/{10013-allops-zero-W65C02_Merlin32.S => 10013-allops-zero-W65C02_merlin32.S} (100%) rename SourceGen/SGTestData/Expected/{10022-embedded-instructions_Merlin32.S => 10022-embedded-instructions_merlin32.S} (100%) rename SourceGen/SGTestData/Expected/{10032-flags-and-branches_Merlin32.S => 10032-flags-and-branches_merlin32.S} (100%) rename SourceGen/SGTestData/Expected/{10040-data-recognition_Merlin32.S => 10040-data-recognition_merlin32.S} (100%) rename SourceGen/SGTestData/Expected/{20000-numeric-types_Merlin32.S => 20000-numeric-types_merlin32.S} (100%) rename SourceGen/SGTestData/Expected/{20010-string-types_Merlin32.S => 20010-string-types_merlin32.S} (100%) rename SourceGen/SGTestData/Expected/{20020-operand-formats_Merlin32.S => 20020-operand-formats_merlin32.S} (100%) rename SourceGen/SGTestData/Expected/{20022-operand-formats_Merlin32.S => 20022-operand-formats_merlin32.S} (100%) rename SourceGen/SGTestData/Expected/{20030-labels-and-symbols_Merlin32.S => 20030-labels-and-symbols_merlin32.S} (100%) rename SourceGen/SGTestData/Expected/{20032-labels-and-symbols_Merlin32.S => 20032-labels-and-symbols_merlin32.S} (100%) rename SourceGen/SGTestData/Expected/{20040-address-changes_Merlin32.S => 20040-address-changes_merlin32.S} (100%) rename SourceGen/SGTestData/Expected/{20042-address-changes_Merlin32.S => 20042-address-changes_merlin32.S} (100%) rename SourceGen/SGTestData/Expected/{20050-branches-and-banks_Merlin32.S => 20050-branches-and-banks_merlin32.S} (100%) rename SourceGen/SGTestData/Expected/{20052-branches-and-banks_Merlin32.S => 20052-branches-and-banks_merlin32.S} (100%) rename SourceGen/SGTestData/Expected/{20062-target-adjustment_Merlin32.S => 20062-target-adjustment_merlin32.S} (100%) rename SourceGen/SGTestData/Expected/{20070-hinting_Merlin32.S => 20070-hinting_merlin32.S} (100%) rename SourceGen/SGTestData/Expected/{20081-label-localizer_Merlin32.S => 20081-label-localizer_merlin32.S} (100%) rename SourceGen/SGTestData/Expected/{20090-notes-and-comments_Merlin32.S => 20090-notes-and-comments_merlin32.S} (100%) rename SourceGen/SGTestData/Expected/{20102-label-dp_Merlin32.S => 20102-label-dp_merlin32.S} (100%) rename SourceGen/SGTestData/Expected/{20110-64k-nops_Merlin32.S => 20110-64k-nops_merlin32.S} (100%) rename SourceGen/SGTestData/Expected/{20122-char-encoding-a_Merlin32.S => 20122-char-encoding-a_merlin32.S} (100%) rename SourceGen/SGTestData/Expected/{20132-char-encoding-p_Merlin32.S => 20132-char-encoding-p_merlin32.S} (100%) rename SourceGen/SGTestData/Expected/{20142-char-encoding-s_Merlin32.S => 20142-char-encoding-s_merlin32.S} (100%) rename SourceGen/SGTestData/Expected/{20152-local-variables_Merlin32.S => 20152-local-variables_merlin32.S} (100%) rename SourceGen/SGTestData/Expected/{20162-cycle-counts-65816_Merlin32.S => 20162-cycle-counts-65816_merlin32.S} (100%) rename SourceGen/SGTestData/Expected/{20170-external-symbols_Merlin32.S => 20170-external-symbols_merlin32.S} (100%) rename SourceGen/SGTestData/Expected/{20182-extension-scripts_Merlin32.S => 20182-extension-scripts_merlin32.S} (100%) rename SourceGen/SGTestData/Expected/{20190-non-unique-labels_Merlin32.S => 20190-non-unique-labels_merlin32.S} (100%) rename SourceGen/SGTestData/Expected/{20200-ui-edge-cases_Merlin32.S => 20200-ui-edge-cases_merlin32.S} (100%) rename SourceGen/SGTestData/Expected/{20212-reloc-data_Merlin32.S => 20212-reloc-data_merlin32.S} (100%) rename SourceGen/SGTestData/Expected/{20222-data-bank_Merlin32.S => 20222-data-bank_merlin32.S} (100%) rename SourceGen/SGTestData/Expected/{20233-rockwell_Merlin32.S => 20233-rockwell_merlin32.S} (100%) diff --git a/.gitignore b/.gitignore index 8fcd2b8..5af3202 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,7 @@ SourceGen/SourceGen-settings SourceGen/PluginDllCache DIST_Debug -DIST_release +DIST_Release # User-specific files diff --git a/SourceGen/AsmGen/AsmMerlin32.cs b/SourceGen/AsmGen/AsmMerlin32.cs index 77f89c9..7367835 100644 --- a/SourceGen/AsmGen/AsmMerlin32.cs +++ b/SourceGen/AsmGen/AsmMerlin32.cs @@ -31,7 +31,7 @@ namespace SourceGen.AsmGen { /// (https://www.brutaldeluxe.fr/products/crossdevtools/merlin/). /// public class GenMerlin32 : IGenerator { - private const string ASM_FILE_SUFFIX = "_Merlin32.S"; // must start with underscore + private const string ASM_FILE_SUFFIX = "_merlin32.S"; // must start with underscore // IGenerator public DisasmProject Project { get; private set; } diff --git a/SourceGen/SGTestData/Expected/10000-allops-value-6502_Merlin32.S b/SourceGen/SGTestData/Expected/10000-allops-value-6502_merlin32.S similarity index 100% rename from SourceGen/SGTestData/Expected/10000-allops-value-6502_Merlin32.S rename to SourceGen/SGTestData/Expected/10000-allops-value-6502_merlin32.S diff --git a/SourceGen/SGTestData/Expected/10001-allops-value-65C02_Merlin32.S b/SourceGen/SGTestData/Expected/10001-allops-value-65C02_merlin32.S similarity index 100% rename from SourceGen/SGTestData/Expected/10001-allops-value-65C02_Merlin32.S rename to SourceGen/SGTestData/Expected/10001-allops-value-65C02_merlin32.S diff --git a/SourceGen/SGTestData/Expected/10002-allops-value-65816_Merlin32.S b/SourceGen/SGTestData/Expected/10002-allops-value-65816_merlin32.S similarity index 100% rename from SourceGen/SGTestData/Expected/10002-allops-value-65816_Merlin32.S rename to SourceGen/SGTestData/Expected/10002-allops-value-65816_merlin32.S diff --git a/SourceGen/SGTestData/Expected/10003-allops-value-W65C02_Merlin32.S b/SourceGen/SGTestData/Expected/10003-allops-value-W65C02_merlin32.S similarity index 100% rename from SourceGen/SGTestData/Expected/10003-allops-value-W65C02_Merlin32.S rename to SourceGen/SGTestData/Expected/10003-allops-value-W65C02_merlin32.S diff --git a/SourceGen/SGTestData/Expected/10010-allops-zero-6502_Merlin32.S b/SourceGen/SGTestData/Expected/10010-allops-zero-6502_merlin32.S similarity index 100% rename from SourceGen/SGTestData/Expected/10010-allops-zero-6502_Merlin32.S rename to SourceGen/SGTestData/Expected/10010-allops-zero-6502_merlin32.S diff --git a/SourceGen/SGTestData/Expected/10011-allops-zero-65C02_Merlin32.S b/SourceGen/SGTestData/Expected/10011-allops-zero-65C02_merlin32.S similarity index 100% rename from SourceGen/SGTestData/Expected/10011-allops-zero-65C02_Merlin32.S rename to SourceGen/SGTestData/Expected/10011-allops-zero-65C02_merlin32.S diff --git a/SourceGen/SGTestData/Expected/10012-allops-zero-65816_Merlin32.S b/SourceGen/SGTestData/Expected/10012-allops-zero-65816_merlin32.S similarity index 100% rename from SourceGen/SGTestData/Expected/10012-allops-zero-65816_Merlin32.S rename to SourceGen/SGTestData/Expected/10012-allops-zero-65816_merlin32.S diff --git a/SourceGen/SGTestData/Expected/10013-allops-zero-W65C02_Merlin32.S b/SourceGen/SGTestData/Expected/10013-allops-zero-W65C02_merlin32.S similarity index 100% rename from SourceGen/SGTestData/Expected/10013-allops-zero-W65C02_Merlin32.S rename to SourceGen/SGTestData/Expected/10013-allops-zero-W65C02_merlin32.S diff --git a/SourceGen/SGTestData/Expected/10022-embedded-instructions_Merlin32.S b/SourceGen/SGTestData/Expected/10022-embedded-instructions_merlin32.S similarity index 100% rename from SourceGen/SGTestData/Expected/10022-embedded-instructions_Merlin32.S rename to SourceGen/SGTestData/Expected/10022-embedded-instructions_merlin32.S diff --git a/SourceGen/SGTestData/Expected/10032-flags-and-branches_Merlin32.S b/SourceGen/SGTestData/Expected/10032-flags-and-branches_merlin32.S similarity index 100% rename from SourceGen/SGTestData/Expected/10032-flags-and-branches_Merlin32.S rename to SourceGen/SGTestData/Expected/10032-flags-and-branches_merlin32.S diff --git a/SourceGen/SGTestData/Expected/10040-data-recognition_Merlin32.S b/SourceGen/SGTestData/Expected/10040-data-recognition_merlin32.S similarity index 100% rename from SourceGen/SGTestData/Expected/10040-data-recognition_Merlin32.S rename to SourceGen/SGTestData/Expected/10040-data-recognition_merlin32.S diff --git a/SourceGen/SGTestData/Expected/20000-numeric-types_Merlin32.S b/SourceGen/SGTestData/Expected/20000-numeric-types_merlin32.S similarity index 100% rename from SourceGen/SGTestData/Expected/20000-numeric-types_Merlin32.S rename to SourceGen/SGTestData/Expected/20000-numeric-types_merlin32.S diff --git a/SourceGen/SGTestData/Expected/20010-string-types_Merlin32.S b/SourceGen/SGTestData/Expected/20010-string-types_merlin32.S similarity index 100% rename from SourceGen/SGTestData/Expected/20010-string-types_Merlin32.S rename to SourceGen/SGTestData/Expected/20010-string-types_merlin32.S diff --git a/SourceGen/SGTestData/Expected/20020-operand-formats_Merlin32.S b/SourceGen/SGTestData/Expected/20020-operand-formats_merlin32.S similarity index 100% rename from SourceGen/SGTestData/Expected/20020-operand-formats_Merlin32.S rename to SourceGen/SGTestData/Expected/20020-operand-formats_merlin32.S diff --git a/SourceGen/SGTestData/Expected/20022-operand-formats_Merlin32.S b/SourceGen/SGTestData/Expected/20022-operand-formats_merlin32.S similarity index 100% rename from SourceGen/SGTestData/Expected/20022-operand-formats_Merlin32.S rename to SourceGen/SGTestData/Expected/20022-operand-formats_merlin32.S diff --git a/SourceGen/SGTestData/Expected/20030-labels-and-symbols_Merlin32.S b/SourceGen/SGTestData/Expected/20030-labels-and-symbols_merlin32.S similarity index 100% rename from SourceGen/SGTestData/Expected/20030-labels-and-symbols_Merlin32.S rename to SourceGen/SGTestData/Expected/20030-labels-and-symbols_merlin32.S diff --git a/SourceGen/SGTestData/Expected/20032-labels-and-symbols_Merlin32.S b/SourceGen/SGTestData/Expected/20032-labels-and-symbols_merlin32.S similarity index 100% rename from SourceGen/SGTestData/Expected/20032-labels-and-symbols_Merlin32.S rename to SourceGen/SGTestData/Expected/20032-labels-and-symbols_merlin32.S diff --git a/SourceGen/SGTestData/Expected/20040-address-changes_Merlin32.S b/SourceGen/SGTestData/Expected/20040-address-changes_merlin32.S similarity index 100% rename from SourceGen/SGTestData/Expected/20040-address-changes_Merlin32.S rename to SourceGen/SGTestData/Expected/20040-address-changes_merlin32.S diff --git a/SourceGen/SGTestData/Expected/20042-address-changes_Merlin32.S b/SourceGen/SGTestData/Expected/20042-address-changes_merlin32.S similarity index 100% rename from SourceGen/SGTestData/Expected/20042-address-changes_Merlin32.S rename to SourceGen/SGTestData/Expected/20042-address-changes_merlin32.S diff --git a/SourceGen/SGTestData/Expected/20050-branches-and-banks_Merlin32.S b/SourceGen/SGTestData/Expected/20050-branches-and-banks_merlin32.S similarity index 100% rename from SourceGen/SGTestData/Expected/20050-branches-and-banks_Merlin32.S rename to SourceGen/SGTestData/Expected/20050-branches-and-banks_merlin32.S diff --git a/SourceGen/SGTestData/Expected/20052-branches-and-banks_Merlin32.S b/SourceGen/SGTestData/Expected/20052-branches-and-banks_merlin32.S similarity index 100% rename from SourceGen/SGTestData/Expected/20052-branches-and-banks_Merlin32.S rename to SourceGen/SGTestData/Expected/20052-branches-and-banks_merlin32.S diff --git a/SourceGen/SGTestData/Expected/20062-target-adjustment_Merlin32.S b/SourceGen/SGTestData/Expected/20062-target-adjustment_merlin32.S similarity index 100% rename from SourceGen/SGTestData/Expected/20062-target-adjustment_Merlin32.S rename to SourceGen/SGTestData/Expected/20062-target-adjustment_merlin32.S diff --git a/SourceGen/SGTestData/Expected/20070-hinting_Merlin32.S b/SourceGen/SGTestData/Expected/20070-hinting_merlin32.S similarity index 100% rename from SourceGen/SGTestData/Expected/20070-hinting_Merlin32.S rename to SourceGen/SGTestData/Expected/20070-hinting_merlin32.S diff --git a/SourceGen/SGTestData/Expected/20081-label-localizer_Merlin32.S b/SourceGen/SGTestData/Expected/20081-label-localizer_merlin32.S similarity index 100% rename from SourceGen/SGTestData/Expected/20081-label-localizer_Merlin32.S rename to SourceGen/SGTestData/Expected/20081-label-localizer_merlin32.S diff --git a/SourceGen/SGTestData/Expected/20090-notes-and-comments_Merlin32.S b/SourceGen/SGTestData/Expected/20090-notes-and-comments_merlin32.S similarity index 100% rename from SourceGen/SGTestData/Expected/20090-notes-and-comments_Merlin32.S rename to SourceGen/SGTestData/Expected/20090-notes-and-comments_merlin32.S diff --git a/SourceGen/SGTestData/Expected/20102-label-dp_Merlin32.S b/SourceGen/SGTestData/Expected/20102-label-dp_merlin32.S similarity index 100% rename from SourceGen/SGTestData/Expected/20102-label-dp_Merlin32.S rename to SourceGen/SGTestData/Expected/20102-label-dp_merlin32.S diff --git a/SourceGen/SGTestData/Expected/20110-64k-nops_Merlin32.S b/SourceGen/SGTestData/Expected/20110-64k-nops_merlin32.S similarity index 100% rename from SourceGen/SGTestData/Expected/20110-64k-nops_Merlin32.S rename to SourceGen/SGTestData/Expected/20110-64k-nops_merlin32.S diff --git a/SourceGen/SGTestData/Expected/20122-char-encoding-a_Merlin32.S b/SourceGen/SGTestData/Expected/20122-char-encoding-a_merlin32.S similarity index 100% rename from SourceGen/SGTestData/Expected/20122-char-encoding-a_Merlin32.S rename to SourceGen/SGTestData/Expected/20122-char-encoding-a_merlin32.S diff --git a/SourceGen/SGTestData/Expected/20132-char-encoding-p_Merlin32.S b/SourceGen/SGTestData/Expected/20132-char-encoding-p_merlin32.S similarity index 100% rename from SourceGen/SGTestData/Expected/20132-char-encoding-p_Merlin32.S rename to SourceGen/SGTestData/Expected/20132-char-encoding-p_merlin32.S diff --git a/SourceGen/SGTestData/Expected/20142-char-encoding-s_Merlin32.S b/SourceGen/SGTestData/Expected/20142-char-encoding-s_merlin32.S similarity index 100% rename from SourceGen/SGTestData/Expected/20142-char-encoding-s_Merlin32.S rename to SourceGen/SGTestData/Expected/20142-char-encoding-s_merlin32.S diff --git a/SourceGen/SGTestData/Expected/20152-local-variables_Merlin32.S b/SourceGen/SGTestData/Expected/20152-local-variables_merlin32.S similarity index 100% rename from SourceGen/SGTestData/Expected/20152-local-variables_Merlin32.S rename to SourceGen/SGTestData/Expected/20152-local-variables_merlin32.S diff --git a/SourceGen/SGTestData/Expected/20162-cycle-counts-65816_Merlin32.S b/SourceGen/SGTestData/Expected/20162-cycle-counts-65816_merlin32.S similarity index 100% rename from SourceGen/SGTestData/Expected/20162-cycle-counts-65816_Merlin32.S rename to SourceGen/SGTestData/Expected/20162-cycle-counts-65816_merlin32.S diff --git a/SourceGen/SGTestData/Expected/20170-external-symbols_Merlin32.S b/SourceGen/SGTestData/Expected/20170-external-symbols_merlin32.S similarity index 100% rename from SourceGen/SGTestData/Expected/20170-external-symbols_Merlin32.S rename to SourceGen/SGTestData/Expected/20170-external-symbols_merlin32.S diff --git a/SourceGen/SGTestData/Expected/20182-extension-scripts_Merlin32.S b/SourceGen/SGTestData/Expected/20182-extension-scripts_merlin32.S similarity index 100% rename from SourceGen/SGTestData/Expected/20182-extension-scripts_Merlin32.S rename to SourceGen/SGTestData/Expected/20182-extension-scripts_merlin32.S diff --git a/SourceGen/SGTestData/Expected/20190-non-unique-labels_Merlin32.S b/SourceGen/SGTestData/Expected/20190-non-unique-labels_merlin32.S similarity index 100% rename from SourceGen/SGTestData/Expected/20190-non-unique-labels_Merlin32.S rename to SourceGen/SGTestData/Expected/20190-non-unique-labels_merlin32.S diff --git a/SourceGen/SGTestData/Expected/20200-ui-edge-cases_Merlin32.S b/SourceGen/SGTestData/Expected/20200-ui-edge-cases_merlin32.S similarity index 100% rename from SourceGen/SGTestData/Expected/20200-ui-edge-cases_Merlin32.S rename to SourceGen/SGTestData/Expected/20200-ui-edge-cases_merlin32.S diff --git a/SourceGen/SGTestData/Expected/20212-reloc-data_Merlin32.S b/SourceGen/SGTestData/Expected/20212-reloc-data_merlin32.S similarity index 100% rename from SourceGen/SGTestData/Expected/20212-reloc-data_Merlin32.S rename to SourceGen/SGTestData/Expected/20212-reloc-data_merlin32.S diff --git a/SourceGen/SGTestData/Expected/20222-data-bank_Merlin32.S b/SourceGen/SGTestData/Expected/20222-data-bank_merlin32.S similarity index 100% rename from SourceGen/SGTestData/Expected/20222-data-bank_Merlin32.S rename to SourceGen/SGTestData/Expected/20222-data-bank_merlin32.S diff --git a/SourceGen/SGTestData/Expected/20233-rockwell_Merlin32.S b/SourceGen/SGTestData/Expected/20233-rockwell_merlin32.S similarity index 100% rename from SourceGen/SGTestData/Expected/20233-rockwell_Merlin32.S rename to SourceGen/SGTestData/Expected/20233-rockwell_merlin32.S