meesbs
/
tinycc
forked from Mirrors/tinycc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tccpp.c: restore whitespace after failed macro 

This fixes test7 described in:

http://lists.nongnu.org/archive/html/tinycc-devel/2015-05/msg00002.html

Note that the current code still adds excessive forced blank characters
to its output, so this patch might not change visible behaviour.
master
Philip 2015-05-02 13:55:42 +00:00
parent a6e6a954f5
commit 2f50cefbd4
1 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
tccpp.c
View File

@ -2877,19 +2877,26 @@ static int macro_subst_tok(TokenString *tok_str,
tok_str_add2(tok_str, t1, &cval); tok_str_add2(tok_str, t1, &cval);
cstr_free(&cstr); cstr_free(&cstr);
} else { } else {
int mtok = tok;
int saved_parse_flags = parse_flags; int saved_parse_flags = parse_flags;
parse_flags |= PARSE_FLAG_ACCEPT_STRAYS | PARSE_FLAG_SPACES | PARSE_FLAG_LINEFEED; parse_flags |= PARSE_FLAG_ACCEPT_STRAYS | PARSE_FLAG_SPACES | PARSE_FLAG_LINEFEED;
mstr = s->d; mstr = s->d;
mstr_allocated = 0; mstr_allocated = 0;
if (s->type.t == MACRO_FUNC) { if (s->type.t == MACRO_FUNC) {
TokenString ws_str; /* whitespace between macro name and
* argument list */
tok_str_new(&ws_str);
spc = 0;
/* NOTE: we do not use next_nomacro to avoid eating the /* NOTE: we do not use next_nomacro to avoid eating the
next token. XXX: find better solution */ next token. XXX: find better solution */
redo: redo:
if (macro_ptr) { if (macro_ptr) {
p = macro_ptr; p = macro_ptr;
while (is_space(t = *p) || TOK_LINEFEED == t) while (is_space(t = *p) || TOK_LINEFEED == t) {
tok_str_add(&ws_str, t);
++p; ++p;
}
if (t == 0 && can_read_stream) { if (t == 0 && can_read_stream) {
/* end of macro stream: we must look at the token /* end of macro stream: we must look at the token
after in the file */ after in the file */
@ -2910,7 +2917,7 @@ static int macro_subst_tok(TokenString *tok_str,
while (is_space(ch) || ch == '\n' || ch == '/') while (is_space(ch) || ch == '\n' || ch == '/')
{ {
if (ch == '/') if (ch == '/')
{ {
int c; int c;
uint8_t *p = file->buf_ptr; uint8_t *p = file->buf_ptr;
PEEKC(c, p); PEEKC(c, p);
@ -2921,18 +2928,29 @@ static int macro_subst_tok(TokenString *tok_str,
p = parse_line_comment(p); p = parse_line_comment(p);
file->buf_ptr = p - 1; file->buf_ptr = p - 1;
} else } else
break; break;
} ch = ' ';
cinp(); }
} tok_str_add(&ws_str, ch);
cinp();
}
t = ch; t = ch;
} }
if (t != '(') { if (t != '(') {
/* no macro subst */ /* not a macro substitution after all, restore the
* macro token plus all whitespace we've read.
* whitespace is intentionally not merged to preserve
* newlines. */
int i;
tok_str_add(tok_str, mtok);
for(i=0; i<ws_str.len; i++)
tok_str_add(tok_str, ws_str.str[i]);
tok_str_free(ws_str.str);
parse_flags = saved_parse_flags; parse_flags = saved_parse_flags;
return -1; return -1;
} else {
tok_str_free(ws_str.str);
} }
/* argument macro */ /* argument macro */
next_nomacro(); next_nomacro();
next_nomacro(); next_nomacro();
@ -3101,7 +3119,7 @@ static void macro_subst(TokenString *tok_str, Sym **nested_list,
Sym *s; Sym *s;
int *macro_str1; int *macro_str1;
const int *ptr; const int *ptr;
int t, ret, spc; int t, spc;
CValue cval; CValue cval;
struct macro_level ml; struct macro_level ml;
int force_blank; int force_blank;
@ -3145,14 +3163,12 @@ static void macro_subst(TokenString *tok_str, Sym **nested_list,
ml.prev = *can_read_stream, *can_read_stream = &ml; ml.prev = *can_read_stream, *can_read_stream = &ml;
macro_ptr = (int *)ptr; macro_ptr = (int *)ptr;
tok = t; tok = t;
ret = macro_subst_tok(tok_str, nested_list, s, can_read_stream); macro_subst_tok(tok_str, nested_list, s, can_read_stream);
spc = tok_str->len && is_space(tok_str->str[tok_str->len-1]); spc = tok_str->len && is_space(tok_str->str[tok_str->len-1]);
ptr = (int *)macro_ptr; ptr = (int *)macro_ptr;
macro_ptr = ml.p; macro_ptr = ml.p;
if (can_read_stream && *can_read_stream == &ml) if (can_read_stream && *can_read_stream == &ml)
*can_read_stream = ml.prev; *can_read_stream = ml.prev;
if (ret != 0)
goto no_subst;
if (parse_flags & PARSE_FLAG_SPACES) if (parse_flags & PARSE_FLAG_SPACES)
force_blank = 1; force_blank = 1;
} else { } else {
@ -3199,6 +3215,13 @@ ST_FUNC void next(void)
macro_ptr = str.str; macro_ptr = str.str;
macro_ptr_allocated = str.str; macro_ptr_allocated = str.str;
goto redo; goto redo;
} else {
tok_str_add(&str, 0);
if (str.len > 1) {
macro_ptr = str.str + 1;
macro_ptr_allocated = str.str;
}
tok = str.str[0];
} }
} }
} }