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

[qfcc] Recursively expand __VA_OPT__'s argument

Browse source 
This seems to do the right thing, and my test case (copied from the C
spec) passes finally.
This commit is contained in:
Bill Currie 2023-11-18 18:08:23 +09:00
parent 344b79a401
commit fc03e7eb7a
3 changed files with 44 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -113,6 +113,7 @@ typedef struct rua_extra_s {
bool params;
bool expand;
bool suppressed;
bool no_lex;
qc_yypstate *qc_state;
pre_yypstate *pre_state;
pre_yypstate *args_state;
@ -1548,10 +1549,10 @@ rescan:
extra->macro = macro->next;
macro->next = 0;
}
rua_tok_t e;
rua_tok_t e = {};
if (extra->macro) {
e = next_macro_token (extra->macro);
} else {
} else if (!extra->no_lex) {
tok->token = yylex (tok, &extra->location, scanner);
tok->location = extra->location;
if ((extra->pending_macro || extra->recording)
@ -2407,17 +2408,28 @@ rua_macro_va_opt (rua_macro_t *macro, void *scanner)
if (!cur->args[~cur->num_params]->tokens) {
return;
}
for (auto t = macro->args[0]->tokens; t; t = t->next) {
symbol_t *sym;
if (t->token == -rua_id
&& (sym = symtab_lookup (cur->params, t->text))) {
for (auto a = cur->args[sym->s.offset]->tokens; a; a = a->next) {
append_token (macro, a);
}
} else {
append_token (macro, t);
auto arg = macro->args[0];
arg->params = cur->params;
arg->num_params = cur->num_params;
arg->num_args = cur->num_args;
arg->args = cur->args;
rua_extra_t va_extra = *extra;
va_extra.macro = 0;
va_extra.no_lex = true;
queue_macro (&va_extra, arg);
qc_yyset_extra (&va_extra, scanner);
while (true) {
rua_tok_t e;
if (next_token (&e, scanner)) {
append_token (macro, &e);
continue;
}
break;
}
qc_yyset_extra (extra, scanner);
}
void

11
tools/qfcc/test/Makemodule.am
View file

@ -47,6 +47,7 @@ test_progs_dat=\
tools/qfcc/test/pga2d.dat \
tools/qfcc/test/pga3d.dat \
tools/qfcc/test/postop.dat \
tools/qfcc/test/preproc-1.dat \
tools/qfcc/test/ptraliasenc.dat \
tools/qfcc/test/ptrfunc.dat \
tools/qfcc/test/ptrstructcast.dat \
@ -582,6 +583,16 @@ tools/qfcc/test/postop.run: $(qfcc_test_run_deps)
include $(postop_dep) # am--include-marker
r_depfiles_remade += $(postop_dep)
tools_qfcc_test_preproc_1_dat_SOURCES=tools/qfcc/test/preproc-1.r
preproc_1_obj=$(tools_qfcc_test_preproc_1_dat_SOURCES:.r=.o)
preproc_1_dep=$(call qcautodep,$(tools_qfcc_test_preproc_1_dat_SOURCES))
tools/qfcc/test/preproc-1.dat$(EXEEXT): $(preproc_1_obj) $(QFCC_DEP)
$(V_QFCCLD)$(QLINK) -o $@ $(preproc_1_obj)
tools/qfcc/test/preproc-1.run: $(qfcc_test_run_deps)
@$(top_srcdir)/tools/qfcc/test/build-run $@
include $(preproc_1_dep) # am--include-marker
r_depfiles_remade += $(preproc_1_dep)
tools_qfcc_test_ptraliasenc_dat_SOURCES=tools/qfcc/test/ptraliasenc.r
ptraliasenc_obj=$(tools_qfcc_test_ptraliasenc_dat_SOURCES:.r=.o)
ptraliasenc_dep=$(call qcautodep,$(tools_qfcc_test_ptraliasenc_dat_SOURCES))

10
tools/qfcc/test/preproc-1.r Normal file
View file

@ -0,0 +1,10 @@
#define LPAREN() (
#define G(Q) 42
#define F(R, X, ...) __VA_OPT__(G R X) )
int x = F(LPAREN(), 0, <:-); // replaced by int x = 42;
int
main ()
{
return x != 42;
}