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 inequality operators in #if directives.

Browse Source 
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2021-01-19 11:18:21 -06:00 committed by Alexandre Julliard
parent 76383b244b
commit eecfe9c2a2
2 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,6 +78,9 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]*
<INITIAL>{IDENTIFIER}/\( {return T_IDENTIFIER_PAREN;}
<INITIAL>{IDENTIFIER} {return T_IDENTIFIER;}
<INITIAL>"<=" {return T_LE;}
<INITIAL>">=" {return T_GE;}
/* We have no use for floats, but shouldn't parse them as integers. */
<INITIAL>[0-9]*\.[0-9]+([eE][+-]?[0-9]+)?[hHfF]? {return T_TEXT;}
@ -96,7 +99,7 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]*
<INITIAL>"--" {return T_TEXT;}
<INITIAL>"<<"=? {return T_TEXT;}
<INITIAL>">>"=? {return T_TEXT;}
<INITIAL>[-+*/%&|^=><!]= {return T_TEXT;}
<INITIAL>[-+*/%&|^=!]= {return T_TEXT;}
<INCLUDE>\"[^"]*\" {return T_STRING;}
<INCLUDE>\<[^>]*\> {return T_STRING;}
@ -157,7 +160,7 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]*
}
<INITIAL>{WS}+ {}
<INITIAL>[-()\[\]{},+!*/] {return yytext[0];}
<INITIAL>[-()\[\]{},+!*/<>] {return yytext[0];}
<INITIAL>. {return T_TEXT;}
%%

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

@ -331,12 +331,16 @@ static void free_parse_arg_names(struct parse_arg_names *args)
%token T_UNDEF "#undef"
%token T_CONCAT "##"
%token T_LE "<="
%token T_GE ">="
%token T_DEFINED "defined"
%type <integer> primary_expr
%type <integer> unary_expr
%type <integer> mul_expr
%type <integer> add_expr
%type <integer> ineq_expr
%type <string> body_token
%type <const_string> body_token_const
%type <string_buffer> body_text
@ -449,10 +453,26 @@ body_token_const
{
$$ = "/";
}
| '<'
{
$$ = "<";
}
| '>'
{
$$ = ">";
}
| T_CONCAT
{
$$ = "##";
}
| T_LE
{
$$ = "<=";
}
| T_GE
{
$$ = ">=";
}
| T_DEFINED
{
$$ = "defined";
@ -490,7 +510,7 @@ directive
}
vkd3d_free($2);
}
| T_IF add_expr T_NEWLINE
| T_IF ineq_expr T_NEWLINE
{
if (!preproc_push_if(ctx, !!$2))
YYABORT;
@ -505,7 +525,7 @@ directive
preproc_push_if(ctx, !preproc_find_macro(ctx, $2));
vkd3d_free($2);
}
| T_ELIF add_expr T_NEWLINE
| T_ELIF ineq_expr T_NEWLINE
{
const struct preproc_file *file = preproc_get_top_file(ctx);
@ -668,3 +688,22 @@ add_expr
{
$$ = $1 - $3;
}
ineq_expr
: add_expr
| ineq_expr '<' add_expr
{
$$ = $1 < $3;
}
| ineq_expr '>' add_expr
{
$$ = $1 > $3;
}
| ineq_expr T_LE add_expr
{
$$ = $1 <= $3;
}
| ineq_expr T_GE add_expr
{
$$ = $1 >= $3;
}