wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/preproc: Separate a preproc_stringify() helper.

Browse Source
This commit is contained in:
Zebediah Figura 2023-07-29 18:14:23 -05:00 committed by Alexandre Julliard
parent 3a235b57f6
commit cbb1d84069
Notes: Alexandre Julliard 2023-08-02 21:24:27 +09:00 
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/291
1 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
libs/vkd3d-shader/preproc.l
View File

@ -346,6 +346,34 @@ static bool preproc_push_expansion(struct preproc_ctx *ctx,
return true; return true;
} }
static void preproc_stringify(struct preproc_ctx *ctx, struct vkd3d_string_buffer *buffer, const char *text)
{
const struct preproc_text *expansion;
const char *p = text + 1;
unsigned int i;
while (*p == ' ' || *p == '\t')
++p;
vkd3d_string_buffer_printf(buffer, "\"");
if ((expansion = find_arg_expansion(ctx, p)))
{
for (i = 0; i < expansion->text.content_size; ++i)
{
char c = expansion->text.buffer[i];
if (c == '\\' || c == '"')
vkd3d_string_buffer_printf(buffer, "\\");
vkd3d_string_buffer_printf(buffer, "%c", c);
}
}
else
{
vkd3d_string_buffer_printf(buffer, "%s", p);
}
vkd3d_string_buffer_printf(buffer, "\"");
}
int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner)
{ {
struct preproc_ctx *ctx = yyget_extra(scanner); struct preproc_ctx *ctx = yyget_extra(scanner);
@ -463,33 +491,15 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner)
if (token == T_HASHSTRING) if (token == T_HASHSTRING)
{ {
const struct preproc_text *expansion; struct vkd3d_string_buffer buffer;
const char *p = text + 1;
unsigned int i;
if (ctx->current_directive) if (ctx->current_directive)
return return_token(token, lval, text); return return_token(token, lval, text);
while (*p == ' ' || *p == '\t') vkd3d_string_buffer_init(&buffer);
++p; preproc_stringify(ctx, &buffer, text);
vkd3d_string_buffer_printf(&ctx->buffer, "%s", buffer.buffer);
vkd3d_string_buffer_printf(&ctx->buffer, "\""); vkd3d_string_buffer_cleanup(&buffer);
if ((expansion = find_arg_expansion(ctx, p)))
{
for (i = 0; i < expansion->text.content_size; ++i)
{
char c = expansion->text.buffer[i];
if (c == '\\' || c == '"')
vkd3d_string_buffer_printf(&ctx->buffer, "\\");
vkd3d_string_buffer_printf(&ctx->buffer, "%c", c);
}
}
else
{
vkd3d_string_buffer_printf(&ctx->buffer, "%s", p);
}
vkd3d_string_buffer_printf(&ctx->buffer, "\"");
break; break;
} }