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

[qfcc] Make __VA_ARGS__ an actual macro parameter

Browse source 
It seems I hadn't understood the C spec very well when I implemented
__VA_ARGS__ as reading it again now was (after a bit of extra thought)
helpful in realizing that __VA_ARGS__ is simply a proper name for the
... "parameter". Fixes __VA_ARGS__ not expanding in the arguments to
another macro.

I think the __VA_ARGS__ magic macro is no longer needed, but I need to
test it properly before deleting it outright.
This commit is contained in:
Bill Currie 2025-02-11 19:52:25 +09:00
parent 6af42e979e
commit 447af36d43
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/qfcc/source/cpp.c
View file

@ -427,7 +427,7 @@ void cpp_define (const char *arg)
cpp_macros = new_symtab (0, stab_global);
make_magic_macro (cpp_macros, "__FILE__", rua_macro_file);
make_magic_macro (cpp_macros, "__LINE__", rua_macro_line);
make_magic_macro (cpp_macros, "__VA_ARGS__", rua_macro_va_args);
//make_magic_macro (cpp_macros, "__VA_ARGS__", rua_macro_va_args);
}
size_t len = strlen (arg);
if (len > 0x10000) {

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

@ -1756,7 +1756,11 @@ rua_macro_param (rua_macro_t *macro, const rua_tok_t *token, rua_ctx_t *ctx)
error (0, "duplicate macro parameter \"%s\"", token->text);
return macro;
}
auto sym = new_symbol (token->text);
auto name = token->text;
if (token->token == -rua_ellipsis) {
name = "__VA_ARGS__";
}
auto sym = new_symbol (name);
sym->sy_type = sy_offset;
sym->offset = macro->num_params++;
symtab_addsymbol (macro->params, sym);