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

[qfcc] Rework token pasting

Browse source 
Now it seems to actually work. I don't know if it's compliant with the
spec, but I do at least get expected results, even for some error
conditions.
This commit is contained in:
Bill Currie 2024-12-13 23:25:34 +09:00
parent 15ddd8fea9
commit 79411aabc4
1 changed files with 23 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -861,12 +861,18 @@ save_text (rua_tok_t *tok, const char *text, size_t textlen, int state,
tok->textlen = textlen; tok->textlen = textlen;
} }
static bool
is_blank (const rua_tok_t *tok)
{
return !tok || tok->token == -rua_space || tok->token == -rua_ignore;
}
static bool static bool
join_tokens (rua_tok_t *out, const rua_tok_t *p1, const rua_tok_t *p2, join_tokens (rua_tok_t *out, const rua_tok_t *p1, const rua_tok_t *p2,
rua_extra_t *extra) rua_extra_t *extra)
{ {
if (!p1 || p1->token == -rua_space || p1->token == -rua_ignore) { if (is_blank (p1)) {
if (!p2 || p2->token == -rua_space || p2->token == -rua_ignore) { if (is_blank (p2)) {
*out = (rua_tok_t) { *out = (rua_tok_t) {
.token = -rua_ignore, .token = -rua_ignore,
.text = "", .text = "",
@ -876,7 +882,7 @@ join_tokens (rua_tok_t *out, const rua_tok_t *p1, const rua_tok_t *p2,
} }
return true; return true;
} }
if (!p2 || p2->token == -rua_space || p1->token == -rua_ignore) { if (is_blank (p2)) {
// p1 cannot be null, space or ignore here // p1 cannot be null, space or ignore here
*out = *p1; *out = *p1;
return true; return true;
@ -1239,41 +1245,6 @@ copy_token (rua_macro_t *dst, const rua_tok_t *t)
dst->tail = &e->next; dst->tail = &e->next;
} }
static void
do_arg_copy (rua_macro_t *dst, const rua_macro_t *a,
bool skip_first, bool skip_last)
{
if (!a->tokens) {
return;
}
for (auto t = skip_first ? a->tokens->next : a->tokens;
t; t = t->next) {
if (skip_last && !t->next) {
break;
}
copy_token (dst, t);
}
}
static void
copy_arg_token (rua_macro_t *dst, bool skip_first, bool skip_last,
const rua_tok_t *arg, const rua_macro_t *macro)
{
symbol_t *sym;
if (arg->token == -rua_va_opt) {
sym = symtab_lookup (macro->params, arg->text);
// __VA_OPT__'s macro was updated by get_arg_token
do_arg_copy (dst, sym->macro, skip_first, skip_last);
} else if (arg->token == -rua_id && macro->params
&& (sym = symtab_lookup (macro->params, arg->text))
&& !macro->args[sym->offset]->next) {
do_arg_copy (dst, macro->args[sym->offset], skip_first, skip_last);
} else if (!skip_first && !skip_last) {
copy_token (dst, arg);
}
}
static void static void
collect_args (rua_macro_t *m, rua_macro_t *macro, yyscan_t scanner) collect_args (rua_macro_t *m, rua_macro_t *macro, yyscan_t scanner)
{ {
@ -1458,26 +1429,27 @@ rescan:
.tail = &m->tokens, .tail = &m->tokens,
}; };
bool sf = false; auto p = get_arg_token (true, &e, macro, scanner, ctx);
bool sl; rua_tok_t con = {};
do { do {
auto p = get_arg_token (true, &e, macro, scanner, ctx);
auto n = get_arg_token (false, e.next->next, macro, scanner, ctx); auto n = get_arg_token (false, e.next->next, macro, scanner, ctx);
rua_tok_t cat; rua_tok_t cat;
if (!(sl = join_tokens (&cat, p, n, extra))) { if (join_tokens (&cat, p, n, extra)) {
cat.location = e.next->location; con = cat;
cat.token = -rua_space; p = &con;
cat.text = " "; } else {
} if (p) {
copy_arg_token (m, sf, sl, &e, macro); copy_token (m, p);
if (cat.token) { }
copy_token (m, &cat); con = (rua_tok_t) {};
p = n;
} }
next_macro_token (extra->macro); // consume ## next_macro_token (extra->macro); // consume ##
e = next_macro_token (extra->macro); e = next_macro_token (extra->macro);
sf = sl;
} while (e.next && e.next->token == PRE_CONCAT); } while (e.next && e.next->token == PRE_CONCAT);
copy_arg_token (m, sl, false, &e, macro); if (con.token) {
copy_token (m, &con);
}
m->cursor = m->tokens; m->cursor = m->tokens;
m->next = extra->macro; m->next = extra->macro;
extra->macro = m; extra->macro = m;