BR30730640: Restore preprocessor token concatenation rules
commit8dcbbd7af0d6d07b455de0b6460dca6db6113553
authorCyrill Gorcunov <gorcunov@gmail.com>
Fri, 24 Sep 2010 22:33:20 +0000 (25 02:33 +0400)
committerCyrill Gorcunov <gorcunov@gmail.com>
Thu, 30 Sep 2010 18:28:53 +0000 (30 22:28 +0400)
tree130dd1dbe64c8496bee0b7612a16755adcc7e966
parent4402af0c5924aa779e06f0ada4998d4a61c4a0c7
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 <gorcunov@gmail.com>
preproc.c