Re: [Nasm-devel] [nasm:master] BR30730640: Restore preprocessor token concatenation rules

[Cyrill G. <gor...@gm...>]

On Thu, Sep 30, 2010 at 11:39:55PM +0200, anonymous coward wrote:
> > 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)]
> 
> The above permit concatenations that result in invalid
> tokens, and therefore need to be tightened. Try these
> rules instead:
> 
> - whitespace(s)/tab(s) with whitespace(s)/tab(s)
> - identifiers with either identifiers or numbers or $/$$
> - preprocessor identifiers or numbers with numbers
> - $ with identifiers or numbers that don't begin with $
> 
> I don't know enough about TOK_FLOAT to comment.
> 

OK, thanks for comments, I'll take a look tomorrow. But basically I would
rather like to hear which exactly invalid tokens you mean? Mind
to elaborate if you have some spare minutes? Also I fear this part of
code is pretty sensible to "backward compatibility" so there is an
easy way to broke some old sources people still compile with nasm.
Technically speaking I've restored old behaviour which was changed
at moment of code unification pretty long ago. So if there some
cases broken now it would be great to see it. Thanks.

 Cyrill