preproc: merge expand_mmac_params() and expand_indirect()
preproc: merge expand_mmac_params() and expand_indirect()

These two really need to be done together, in order for constructs
such as %[%1] to work properly.  Furthermore, fix a token-pasting bug
in expand_mmac_params().

Signed-off-by: H. Peter Anvin <8a453bad9912ffe59bc0f0b8abe03df9be19379e@zytor.com>

techkey/nasm,projedi/nasm,Distrotech/nasm,letolabs/nasm,Distrotech/nasm,letolabs/nasm,turingstudio/nasm,techkey/nasm,Distrotech/nasm,projedi/nasm,turingstudio/nasm,projedi/nasm,turingstudio/nasm,techkey/nasm,projedi/nasm,Distrotech/nasm,letolabs/nasm,techkey/nasm,turingstudio/nasm,techkey/nasm,projedi/nasm