Zebediah Figura : vkd3d-shader: Implement bitwise operators in #if directives.
Alexandre Julliard
julliard at winehq.org
Fri Jan 22 15:48:01 CST 2021
Module: vkd3d
Branch: master
Commit: c1d2edc9d57d8c584b90b487f9f301bdf3b55b15
URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c1d2edc9d57d8c584b90b487f9f301bdf3b55b15
Author: Zebediah Figura <zfigura at codeweavers.com>
Date: Thu Jan 21 16:10:44 2021 -0600
vkd3d-shader: Implement bitwise operators in #if directives.
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
libs/vkd3d-shader/preproc.l | 2 +-
libs/vkd3d-shader/preproc.y | 40 ++++++++++++++++++++++++++++++++++++++--
2 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l
index d21ddd1..4c82bab 100644
--- a/libs/vkd3d-shader/preproc.l
+++ b/libs/vkd3d-shader/preproc.l
@@ -162,7 +162,7 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]*
}
<INITIAL>{WS}+ {}
-<INITIAL>[-()\[\]{},+!*/<>] {return yytext[0];}
+<INITIAL>[-()\[\]{},+!*/<>&|^] {return yytext[0];}
<INITIAL>. {return T_TEXT;}
%%
diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y
index 089fd76..fa5e5cc 100644
--- a/libs/vkd3d-shader/preproc.y
+++ b/libs/vkd3d-shader/preproc.y
@@ -344,6 +344,9 @@ static void free_parse_arg_names(struct parse_arg_names *args)
%type <integer> add_expr
%type <integer> ineq_expr
%type <integer> eq_expr
+%type <integer> bitand_expr
+%type <integer> bitxor_expr
+%type <integer> bitor_expr
%type <string> body_token
%type <const_string> body_token_const
%type <string_buffer> body_text
@@ -464,6 +467,18 @@ body_token_const
{
$$ = ">";
}
+ | '&'
+ {
+ $$ = "&";
+ }
+ | '|'
+ {
+ $$ = "|";
+ }
+ | '^'
+ {
+ $$ = "^";
+ }
| T_CONCAT
{
$$ = "##";
@@ -521,7 +536,7 @@ directive
}
vkd3d_free($2);
}
- | T_IF eq_expr T_NEWLINE
+ | T_IF bitor_expr T_NEWLINE
{
if (!preproc_push_if(ctx, !!$2))
YYABORT;
@@ -536,7 +551,7 @@ directive
preproc_push_if(ctx, !preproc_find_macro(ctx, $2));
vkd3d_free($2);
}
- | T_ELIF eq_expr T_NEWLINE
+ | T_ELIF bitor_expr T_NEWLINE
{
const struct preproc_file *file = preproc_get_top_file(ctx);
@@ -729,3 +744,24 @@ eq_expr
{
$$ = $1 != $3;
}
+
+bitand_expr
+ : eq_expr
+ | bitand_expr '&' eq_expr
+ {
+ $$ = $1 & $3;
+ }
+
+bitxor_expr
+ : bitand_expr
+ | bitxor_expr '^' bitand_expr
+ {
+ $$ = $1 ^ $3;
+ }
+
+bitor_expr
+ : bitxor_expr
+ | bitor_expr '|' bitxor_expr
+ {
+ $$ = $1 | $3;
+ }
More information about the wine-cvs
mailing list