qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-04-19 07:51:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

[qfcc] Fix macro expansion basics (again)

Browse source 
It turned out I had simply forgotten to ensure the token chains were
properly terminated (the struct copy would copy the next of the source
token and thus macro args always expanded to the last token of the
parent macro). And then I'd missed saving the token text when parsing
predefined macros. __VA_OPT__ is still a problem, but this work was for
making that a little easier.
This commit is contained in:
Bill Currie 2023-11-12 13:20:35 +09:00
parent 8de214c782
commit 37819523d0
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tools/qfcc/source/qc-lex.l
View file

@ -1687,7 +1687,7 @@ qc_yyparse (FILE *in)
//printf ("*** pop include %d\n", (int) extra.include_stack.size);
auto incl = DARRAY_REMOVE (&extra.include_stack);
extra.location = incl.location;
struct yyguts_t * yyg = (struct yyguts_t*)scanner;//FIXME
struct yyguts_t *yyg = (struct yyguts_t*) scanner;//FIXME
yy_delete_buffer (YY_CURRENT_BUFFER, scanner);
set_line_file (-1, 0, 2);
yy_switch_to_buffer (incl.buffer, scanner);
@ -1778,6 +1778,7 @@ rua_macro_append (rua_macro_t *macro, const rua_tok_t *token, void *scanner)
macro->num_tokens++;
}
*expr = *token;
expr->next = 0;
*macro->tail = expr;
macro->tail = &expr->next;
return macro;
@ -2228,6 +2229,9 @@ rua_parse_define (const char *def)
tok.token = PRE_DEFINE;
} else {
tok.token = yylex (&tok, &tok.location, scanner);
if (tok.text == extra.str_text) {
tok.text = save_string (tok.text);
}
status = 0;
}
while (tok.token) {