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] Partially implement __VA_OPT__ and __VA_ARGS__

Browse source 
__VA_ARGS__ seems to be working but __VA_OPT__ still needs a lot of work
for dealing with its expansions, but basic error checking and simple
expansions seem to work.
This commit is contained in:
Bill Currie 2023-11-07 12:26:37 +09:00
parent d21260d9f6
commit 881b6626e4
3 changed files with 154 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/qfcc/include/rua-lang.h
View file

@ -112,6 +112,8 @@ void rua_line_info (const expr_t *line_expr, const char *text,
void rua_macro_file (rua_macro_t *macro, void *scanner);
void rua_macro_line (rua_macro_t *macro, void *scanner);
void rua_macro_va_opt (rua_macro_t *macro, void *scanner);
void rua_macro_va_args (rua_macro_t *macro, void *scanner);
#include "tools/qfcc/source/pre-parse.h"

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

@ -384,7 +384,7 @@ cpp_include (const char *opt, const char *arg)
}
#undef CPP_INCLUDE
static void
static rua_macro_t *
make_magic_macro (symtab_t *tab, const char *name, rua_macro_f update)
{
rua_macro_t *macro = malloc (sizeof (*macro));
@ -401,6 +401,7 @@ make_magic_macro (symtab_t *tab, const char *name, rua_macro_f update)
sym->sy_type = sy_macro;
sym->s.macro = macro;
symtab_addsymbol (tab, sym);
return macro;
}
void cpp_define (const char *arg)
@ -409,6 +410,13 @@ 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);
auto m = make_magic_macro (cpp_macros, "__VA_OPT__", rua_macro_va_opt);
m->params = new_symtab (0, stab_param);
m->num_params = -1;
m->args = calloc (1, sizeof (rua_macro_t *));
m->args[0] = malloc (sizeof (rua_macro_t));
}
size_t len = strlen (arg);
if (len > 0x10000) {

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

@ -1127,7 +1127,7 @@ join_tokens (rua_expr_t *out, const rua_expr_t *p1, const rua_expr_t *p2,
{
auto str = va (0, "%s%s", p1 ? p1->text : "", p2 ? p2->text : "");
yy_scan_string (str, extra->subscanner);
rua_tok_t tok = {};
rua_tok_t tok = { .text = str, };
if (p1) {
tok.location = p1->location;
}
@ -1364,7 +1364,8 @@ qc_process (rua_extra_t *extra, int token, rua_tok_t *tok, yyscan_t scanner)
rua_end_args (scanner);
macro = extra->pending_macro;
extra->pending_macro = 0;
extra->pending_macro = macro->next;
macro->next = 0;
if (status != 0) {
error (0, "unterminated argument list invoking macro \"%s\"",
macro->name);
@ -1461,11 +1462,7 @@ static rua_expr_t
next_macro_token (rua_extra_t *extra)
{
auto e = *extra->macro->cursor;
if (!(extra->macro->cursor = e.next)) {
auto macro = extra->macro;
extra->macro = extra->macro->next;
macro->next = 0;
}
extra->macro->cursor = e.next;
return e;
}
@ -1525,6 +1522,42 @@ copy_arg_token (rua_macro_t *dst, bool skip_first, bool skip_last,
}
}
static void
collect_args (rua_macro_t *m, rua_macro_t *macro, void *scanner)
{
auto extra = qc_yyget_extra (scanner);
m->next = extra->pending_macro;
extra->pending_macro = m;
auto t = macro->cursor;
for (; t && t->token == -rua_space; t = t->next) continue;
// to be in an arg, a function-like macro must either have
// both open and close parans, or none
if (t && t->token == '(') {
rua_reset_args (m);
int paren = 1;
auto tk = expr_token (t);
auto a = rua_macro_arg (&tk, scanner);
for (t = t->next; t; t = t->next) {
if (t->token == '(') {
paren++;
} else if (t->token == ')') {
if (!(--paren)) {
t = t->next;
break;
}
}
tk = expr_token (t);
if (t->token == ',' && paren == 1) {
a = rua_macro_arg (&tk, scanner);
} else {
rua_macro_append (a, &tk, scanner);
}
}
}
macro->cursor = t;
extra->pending_macro = m->next;
}
static int
next_token (rua_tok_t *tok, yyscan_t scanner)
{
@ -1542,10 +1575,20 @@ rescan:
auto e = next_macro_token (extra);
token = e.token;
if (token == '#') {
sym = symtab_lookup (macro->params, e.next->text);
auto arg = macro->args[sym->s.offset];
auto n = e.next;
rua_macro_t *arg;
macro->cursor = macro->cursor->next; // consume arg
if (strcmp (n->text, "__VA_OPT__") == 0) {
sym = symtab_lookup (extra->macro_tab, n->text);
auto m = sym->s.macro;
collect_args (m, macro, scanner);
m->next = 0;
arg = m->args[0];
} else {
sym = symtab_lookup (macro->params, n->text);
arg = macro->args[sym->s.offset];
}
stringize_arg (&e, arg, extra);
next_macro_token (extra); // consume arg
} else if (e.next && e.next->token == PRE_CONCAT) {
rua_macro_t *m = malloc (sizeof (*m));
*m = (rua_macro_t) {
@ -1564,7 +1607,9 @@ rescan:
cat.text = " ";
}
copy_arg_token (m, sf, sl, &e, macro);
copy_token (m, &cat);
if (cat.token) {
copy_token (m, &cat);
}
next_macro_token (extra); // consume ##
e = next_macro_token (extra);
sf = sl;
@ -1596,36 +1641,7 @@ rescan:
goto rescan;
}
m->next = extra->pending_macro;
extra->pending_macro = m;
auto t = macro->cursor;
for (; t && t->token == -rua_space; t = t->next) continue;
// to be in an arg, a function-like macro must either have
// both open and close parans, or none
if (t && t->token == '(') {
rua_reset_args (m);
int paren = 1;
auto tk = expr_token (t);
auto a = rua_macro_arg (&tk, scanner);
for (t = t->next; t; t = t->next) {
if (t->token == '(') {
paren++;
} else if (t->token == ')') {
if (!(--paren)) {
t = t->next;
break;
}
}
tk = expr_token (t);
if (t->token == ',' && paren == 1) {
a = rua_macro_arg (&tk, scanner);
} else {
rua_macro_append (a, &tk, scanner);
}
}
}
macro->cursor = t;
extra->pending_macro = m->next;
collect_args (m, macro, scanner);
m->next = extra->macro;
extra->macro = m;
goto rescan;
@ -1636,6 +1652,7 @@ rescan:
token = yylex (tok, &extra->location, scanner);
tok->location = extra->location;
}
tok->token = token;
return token;
}
@ -1826,10 +1843,49 @@ rua_macro_finish (rua_macro_t *macro, void *scanner)
if (t->token == '#'
&& (!t->next
|| t->next->token != -rua_id
|| !symtab_lookup (macro->params, t->next->text))) {
|| (!symtab_lookup (macro->params, t->next->text)
&& strcmp (t->next->text, "__VA_OPT__") != 0))) {
error (0, "'#' is not followed by a macro parameter");
return;
}
if (t->token == -rua_id && strcmp (t->text, "__VA_OPT__") == 0) {
auto u = t->next;
for (; u && u->token == -rua_space; u = u->next) continue;
if (!u) {
unterminated_va_opt:
error (0, "unterminated __VA_OPT__");
return;
} else if (u->token != '(') {
error (0, "__VA_OPT__ must be followed by an open "
"parenthesis");
return;
}
if (u->next && u->next->token == PRE_CONCAT) {
hashhash_error:
error (0, "'##' cannot appear at either end of __VA_OPT__");
return;
}
int paren = 1;
for (u = u->next; u; u = u->next) {
if (u->token == '(') {
paren++;
} else if (u->token == ')') {
if (!(--paren)) {
break;
}
} else if (u->token == -rua_id
&& strcmp (u->text, "__VA_OPT__") == 0) {
error (0, "__VA_OPT__ may not appear in a __VA_OPT__");
return;
} else if (u->token == PRE_CONCAT && paren == 1
&& u->next && u->next->token == ')') {
goto hashhash_error;
}
}
if (!u) {
goto unterminated_va_opt;
}
}
}
}
@ -1973,10 +2029,10 @@ dump_state_stack (void *scanner)
static void
dump_token (rua_tok_t *tok, rua_loc_t *loc, int state)
{
printf ("start: %2d [%3d %3d] [%3d %3d] '%s'\n", state,
printf ("start: %2d [%3d %3d] [%3d %3d] %d '%s'\n", state,
loc->line, loc->column,
loc->last_line, loc->last_column,
quote_string (tok->text));
tok->token, quote_string (tok->text));
}
void
@ -2268,3 +2324,46 @@ rua_macro_line (rua_macro_t *macro, void *scanner)
*macro->tail = expr;
macro->tail = &expr->next;
}
void
rua_macro_va_opt (rua_macro_t *macro, void *scanner)
{
macro->tokens = 0;
macro->tail = &macro->tokens;
auto extra = qc_yyget_extra (scanner);
auto cur = extra->macro;
if (!cur || !cur->params || cur->num_params >= 0) {
warning (0, "__VA_OPT__ can appear only in the expansion of a "
"variadic macro");
return;
}
auto arg = cur->args[~cur->num_params];
if (arg->tokens) {
macro->tokens = macro->args[0]->tokens;
macro->tail = macro->args[0]->tail;
}
}
void
rua_macro_va_args (rua_macro_t *macro, void *scanner)
{
macro->tokens = 0;
macro->tail = &macro->tokens;
auto extra = qc_yyget_extra (scanner);
auto cur = extra->macro;
if (cur && strcmp (cur->name, "__VA_OPT__") == 0) {
cur = cur->next;
}
if (!cur || !cur->params || cur->num_params >= 0) {
warning (0, "__VA_ARGS__ can appear only in the expansion of a "
"variadic macro");
return;
}
auto arg = cur->args[~cur->num_params];
if (arg->tokens) {
macro->tokens = arg->tokens;
macro->tail = arg->tail;
}
}