From 14b1fc9b3ea5520a3e9c5a7a457a7a03660bc910 Mon Sep 17 00:00:00 2001 From: Astatin Date: Wed, 18 Jun 2025 16:44:10 +0200 Subject: Fix .PADTO in macro & allow to use current_address in .DEFINE --- instructions.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'instructions.go') diff --git a/instructions.go b/instructions.go index ff87e44..c852ec4 100644 --- a/instructions.go +++ b/instructions.go @@ -563,7 +563,14 @@ instruction_param_loop: } if instrParam.MacroForbidden && isMacro { - return nil, fmt.Errorf("This instruction cannot be used with this set of params inside of a macro") + rejectedError := fmt.Errorf("\t[Rejected] Param Type %v: This instruction cannot be used with this set of params inside of a macro\n", paramType, err) + if rejectedErrors == nil { + rejectedErrors = rejectedError + } else { + rejectedErrors = fmt.Errorf("%w%w", rejectedErrors, rejectedError) + } + continue + // return nil, fmt.Errorf("") } return instrParam.Assembler(currentAddress, parsed_params) -- cgit v1.2.3-70-g09d2