From 5b9e2f6766bd19e3a71a10ec0336b9cd858b48a4 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Sat, 15 Feb 2025 13:14:58 +0900 Subject: [PATCH] [qfcc] simplify __VA_OPT__ handling It turns out it didn't need to expand the arguments itself. Now my @image tests get past the pre-processor. ie, the following works (until spir-v segs): #define __image(t,...) @image(t __VA_OPT__(,) __VA_ARGS__) #define _image(d,...) __image(float, d __VA_OPT__(,) __VA_ARGS__) @generic(foo=[_image(1D,Array)]) { void bar(foo baz); } --- tools/qfcc/source/qc-lex.l | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/tools/qfcc/source/qc-lex.l b/tools/qfcc/source/qc-lex.l index 375bde818..cdd7ba67d 100644 --- a/tools/qfcc/source/qc-lex.l +++ b/tools/qfcc/source/qc-lex.l @@ -2329,31 +2329,6 @@ rua_macro_line (rua_macro_t *macro, rua_ctx_t *ctx) macro->tail = &expr->next; } -static void -expand_arg (rua_macro_t *macro, rua_macro_t *arg, yyscan_t scanner, rua_ctx_t *ctx) -{ - auto extra = qc_yyget_extra (scanner); - rua_extra_t arg_extra = *extra; - arg_extra.macro = 0; - arg_extra.no_lex = true; - queue_macro (&arg_extra, arg); - qc_yyset_extra (&arg_extra, scanner); - - while (true) { - rua_tok_t e; - if (next_token (&e, scanner, ctx)) { - if (macro->tokens - || (e.token != -rua_space && e.token != -rua_ignore)) { - append_token (macro, &e); - } - continue; - } - break; - } - - qc_yyset_extra (extra, scanner); -} - static bool macro_empty (rua_macro_t *macro, yyscan_t scanner) { @@ -2421,7 +2396,7 @@ rua_macro_va_opt (rua_macro_t *macro, rua_ctx_t *ctx) arg->num_args = cur->num_args; arg->args = cur->args; - expand_arg (macro, arg, ctx->scanner, ctx); + queue_macro (extra, arg); } void