wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader: Implement #else.

Browse Source 
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2020-12-15 17:13:22 -06:00 committed by Alexandre Julliard
parent 86cb863bc2
commit 78e31bff16
3 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/vkd3d-shader/preproc.h
View File

@ -27,6 +27,10 @@ struct preproc_if_state
{
/* Are we currently in a "true" block? */
bool current_true;
/* Have we seen a "true" block in this #if..#endif yet? */
bool seen_true;
/* Have we seen an #else yet? */
bool seen_else;
};
struct preproc_ctx

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

@ -100,6 +100,8 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]*
for (p = yytext + 1; strchr(" \t", *p); ++p)
;
if (!strcmp(p, "else"))
return T_ELSE;
if (!strcmp(p, "endif"))
return T_ENDIF;
if (!strcmp(p, "if"))
@ -187,6 +189,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner)
{
switch (token)
{
case T_ELSE:
case T_ENDIF:
case T_IF:
ctx->current_directive = token;

25
libs/vkd3d-shader/preproc.y
View File

@ -81,6 +81,8 @@ static bool preproc_push_if(struct preproc_ctx *ctx, bool condition)
return false;
state = &ctx->if_stack[ctx->if_count++];
state->current_true = condition && preproc_was_writing(ctx);
state->seen_true = condition;
state->seen_else = false;
return true;
}
@ -138,6 +140,7 @@ static uint32_t preproc_parse_integer(const char *s)
%token T_NEWLINE
%token T_ELSE "#else"
%token T_ENDIF "#endif"
%token T_IF "#if"
@ -158,6 +161,28 @@ directive
if (!preproc_push_if(ctx, !!$2))
YYABORT;
}
| T_ELSE T_NEWLINE
{
if (ctx->if_count)
{
struct preproc_if_state *state = &ctx->if_stack[ctx->if_count - 1];
if (state->seen_else)
{
preproc_warning(ctx, &@$, VKD3D_SHADER_WARNING_PP_INVALID_DIRECTIVE, "Ignoring #else after #else.");
}
else
{
state->current_true = !state->seen_true && preproc_was_writing(ctx);
state->seen_else = true;
}
}
else
{
preproc_warning(ctx, &@$, VKD3D_SHADER_WARNING_PP_INVALID_DIRECTIVE,
"Ignoring #else without prior #if.");
}
}
| T_ENDIF T_NEWLINE
{
if (ctx->if_count)