Allow macros with different arities to share argument namesHEADmain

This commit includes the arity of a parent macro in the namespace
of a macro argument, so that the assembler library can recognise that
two macro implementations with different arities are not the same.

This fixes an error where two implementations of a macro with the same
name but different arity could not share argument names, because the
arity of the parent macro wasn't being taken into account when checking
for redefinitions.

1 files changed, 3 insertions, 1 deletions

diff --git a/src/stages/compiler.rs b/src/stages/compiler.rs
index bc86589..4777fb4 100644
--- a/src/stages/compiler.rs
+++ b/src/stages/compiler.rs
@@ -119,7 +119,9 @@ impl SymbolParser {
                         SymbolRoleDetailed::MacroDefinition,
                     );
                     // Track that we're currently inside a macro definition.
-                    self.macro_name = Some(definition.name.to_string());
+                    let macro_name = &definition.name;
+                    let macro_args = definition.arguments.len();
+                    self.macro_name = Some(format!("{macro_name}::{macro_args}"));
 
                     for argument in &definition.arguments {
                         self.record_symbol(