From ec67b49d7d9e95e12c46005650f2c62e14004f76 Mon Sep 17 00:00:00 2001 From: Kugel Fuhr <98353208+kugelfuhr@users.noreply.github.com> Date: Tue, 1 Jul 2025 17:37:39 +0200 Subject: [PATCH 1/2] Change notification message used when pointing to the macro an error comes from. --- src/ca65/error.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ca65/error.c b/src/ca65/error.c index 7e1457964..78941b5c2 100644 --- a/src/ca65/error.c +++ b/src/ca65/error.c @@ -148,7 +148,7 @@ static void AddNotifications (const Collection* LineInfos) break; case LI_TYPE_MACRO: - Msg = "Macro was defined here"; + Msg = "Expanded from macro here"; break; case LI_TYPE_MACPARAM: From b65ee13e8c005b431638913a438a036630e4f68a Mon Sep 17 00:00:00 2001 From: Kugel Fuhr <98353208+kugelfuhr@users.noreply.github.com> Date: Tue, 1 Jul 2025 17:46:39 +0200 Subject: [PATCH 2/2] Fix the tests. --- test/asm/listing/ref/010-paramcount.err2-ref | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/asm/listing/ref/010-paramcount.err2-ref b/test/asm/listing/ref/010-paramcount.err2-ref index 304c9de61..fee657dbf 100644 --- a/test/asm/listing/ref/010-paramcount.err2-ref +++ b/test/asm/listing/ref/010-paramcount.err2-ref @@ -1,9 +1,9 @@ 010-paramcount.s:18: Warning: User warning: r1 is blank! -010-paramcount.s:14: Note: Macro was defined here -010-paramcount.s:8: Note: Macro was defined here +010-paramcount.s:14: Note: Expanded from macro here +010-paramcount.s:8: Note: Expanded from macro here 010-paramcount.s:19: Warning: User warning: r1 is blank! -010-paramcount.s:14: Note: Macro was defined here -010-paramcount.s:8: Note: Macro was defined here +010-paramcount.s:14: Note: Expanded from macro here +010-paramcount.s:8: Note: Expanded from macro here 010-paramcount.s:20: Warning: User warning: r1 is blank! -010-paramcount.s:14: Note: Macro was defined here -010-paramcount.s:8: Note: Macro was defined here +010-paramcount.s:14: Note: Expanded from macro here +010-paramcount.s:8: Note: Expanded from macro here