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: Implement #undef.

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 2021-01-07 11:48:10 -06:00 committed by Alexandre Julliard
parent 8c927c491c
commit 1fc8b85879
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -126,6 +126,8 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]*
return T_IFDEF; return T_IFDEF;
if (!strcmp(p, "ifndef")) if (!strcmp(p, "ifndef"))
return T_IFNDEF; return T_IFNDEF;
if (!strcmp(p, "undef"))
return T_UNDEF;
preproc_warning(ctx, yyget_lloc(yyscanner), VKD3D_SHADER_WARNING_PP_UNKNOWN_DIRECTIVE, preproc_warning(ctx, yyget_lloc(yyscanner), VKD3D_SHADER_WARNING_PP_UNKNOWN_DIRECTIVE,
"Ignoring unknown directive \"%s\".", yytext); "Ignoring unknown directive \"%s\".", yytext);
@ -257,6 +259,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner)
case T_IFDEF: case T_IFDEF:
case T_IFNDEF: case T_IFNDEF:
case T_INCLUDE: case T_INCLUDE:
case T_UNDEF:
ctx->current_directive = token; ctx->current_directive = token;
break; break;

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

@ -282,6 +282,7 @@ static const void *get_parent_data(struct preproc_ctx *ctx)
%token T_IFDEF "#ifdef" %token T_IFDEF "#ifdef"
%token T_IFNDEF "#ifndef" %token T_IFNDEF "#ifndef"
%token T_INCLUDE "#include" %token T_INCLUDE "#include"
%token T_UNDEF "#undef"
%type <integer> expr %type <integer> expr
%type <string> body_token %type <string> body_token
@ -313,6 +314,18 @@ directive
if (!preproc_add_macro(ctx, &@$, $2)) if (!preproc_add_macro(ctx, &@$, $2))
YYABORT; YYABORT;
} }
| T_UNDEF T_IDENTIFIER T_NEWLINE
{
struct preproc_macro *macro;
if ((macro = preproc_find_macro(ctx, $2)))
{
TRACE("Removing macro definition %s.\n", debugstr_a($2));
rb_remove(&ctx->macros, &macro->entry);
preproc_free_macro(macro);
}
vkd3d_free($2);
}
| T_IF expr T_NEWLINE | T_IF expr T_NEWLINE
{ {
if (!preproc_push_if(ctx, !!$2)) if (!preproc_push_if(ctx, !!$2))