Skip to content
Snippets Groups Projects
Commit f8a89877 authored by Elizabeth Figura's avatar Elizabeth Figura Committed by Alexandre Julliard
Browse files

vkd3d-shader: Implement unary operators in #if directives.

parent d4929660
No related branches found
No related tags found
No related merge requests found
......@@ -157,7 +157,7 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]*
}
<INITIAL>{WS}+ {}
<INITIAL>[()\[\]{},] {return yytext[0];}
<INITIAL>[-()\[\]{},+!] {return yytext[0];}
<INITIAL>. {return T_TEXT;}
%%
......
......@@ -333,7 +333,8 @@ static void free_parse_arg_names(struct parse_arg_names *args)
%token T_CONCAT "##"
%token T_DEFINED "defined"
%type <integer> expr
%type <integer> primary_expr
%type <integer> unary_expr
%type <string> body_token
%type <const_string> body_token_const
%type <string_buffer> body_text
......@@ -426,6 +427,18 @@ body_token_const
{
$$ = ",";
}
| '+'
{
$$ = "+";
}
| '-'
{
$$ = "-";
}
| '!'
{
$$ = "!";
}
| T_CONCAT
{
$$ = "##";
......@@ -467,7 +480,7 @@ directive
}
vkd3d_free($2);
}
| T_IF expr T_NEWLINE
| T_IF unary_expr T_NEWLINE
{
if (!preproc_push_if(ctx, !!$2))
YYABORT;
......@@ -482,7 +495,7 @@ directive
preproc_push_if(ctx, !preproc_find_macro(ctx, $2));
vkd3d_free($2);
}
| T_ELIF expr T_NEWLINE
| T_ELIF unary_expr T_NEWLINE
{
const struct preproc_file *file = preproc_get_top_file(ctx);
......@@ -582,7 +595,7 @@ directive
vkd3d_free($2);
}
expr
primary_expr
: T_INTEGER
{
$$ = preproc_parse_integer($1);
......@@ -603,3 +616,18 @@ expr
$$ = !!preproc_find_macro(ctx, $3);
vkd3d_free($3);
}
unary_expr
: primary_expr
| '+' unary_expr
{
$$ = $2;
}
| '-' unary_expr
{
$$ = -$2;
}
| '!' unary_expr
{
$$ = !$2;
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment