procyberian/nasm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BR3392240: preproc: Don't fail on pasting of space expanded rvalue tokens

Browse source 
Reported-by: KO Myung-Hun <komh@chollian.net>
Tested-by: KO Myung-Hun <komh@chollian.net>
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
This commit is contained in:
Cyrill Gorcunov 2013-02-04 01:24:54 +04:00
parent 7c88b3a9d7
commit 8b5c9fba4e
1 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
preproc.c
View file

@ -3640,14 +3640,35 @@ static bool paste_tokens(Token **head, const struct tokseq_match *m,
if (!pasted)
pasted = true;
/* No ending token */
if (!next)
error(ERR_FATAL, "No rvalue found on pasting");
/* Left pasting token is start of line */
if (!prev_nonspace)
error(ERR_FATAL, "No lvalue found on pasting");
/*
* No ending token, this might happen in two
* cases
*
* 1) There indeed no right token at all
* 2) There is a bare "%define ID" statement,
* and @ID does expand to whitespace.
*
* So technically we need to do a grammar analysis
* in another stage of parsing, but for now lets don't
* change the behaviour people used to. Simply allow
* whitespace after paste token.
*/
if (!next) {
/*
* Zap ending space tokens and that's all.
*/
tok = (*prev_nonspace)->next;
while (tok_type_(tok, TOK_WHITESPACE))
tok = delete_Token(tok);
tok = *prev_nonspace;
tok->next = NULL;
break;
}
tok = *prev_nonspace;
while (tok_type_(tok, TOK_WHITESPACE))
tok = delete_Token(tok);