BR30730640: Restore preprocessor token concatenation rules
BR30730640: Restore preprocessor token concatenation rules

During nasm-2.06 development we broke the rules for
concatenation of preprocessor tokens (d784a083a3f1).

The former candidates for concatenation were (in terms of RE)

expand_smacro
    [(TOK_ID|TOK_PREPROC_ID)][(TOK_ID|TOK_PREPROC_ID|TOK_NUMBER)]

expand_mmac_params
    [(TOK_ID|TOK_NUMBER|TOK_FLOAT)][(TOK_ID|TOK_NUMBER|TOK_FLOAT|TOK_OTHER)]

[ nb: review commits ec88c1beac00 , 20a94ad7fe41 and 984279b1dde9 if
  you going to change this one ]

Signed-off-by: Cyrill Gorcunov <7a1ea01eee6961eb1e372e3508c2670446d086f4@gmail.com>

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