Zebediah Figura : vkd3d-shader: Implement the ternary operator in #if directives.
Alexandre Julliard
julliard at winehq.org
Fri Jan 22 15:48:01 CST 2021
Module: vkd3d
Branch: master
Commit: e15b884e1a9f149ee0c07abdb83f0d287d4bd5af
URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e15b884e1a9f149ee0c07abdb83f0d287d4bd5af
Author: Zebediah Figura <zfigura at codeweavers.com>
Date: Thu Jan 21 16:10:46 2021 -0600
vkd3d-shader: Implement the ternary operator 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 | 20 ++++++++++++++++++--
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l
index 37acc5e..1bf14ff 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 051f94b..aa381e8 100644
--- a/libs/vkd3d-shader/preproc.y
+++ b/libs/vkd3d-shader/preproc.y
@@ -351,6 +351,7 @@ static void free_parse_arg_names(struct parse_arg_names *args)
%type <integer> bitor_expr
%type <integer> logicand_expr
%type <integer> logicor_expr
+%type <integer> expr
%type <string> body_token
%type <const_string> body_token_const
%type <string_buffer> body_text
@@ -483,6 +484,14 @@ body_token_const
{
$$ = "^";
}
+ | '?'
+ {
+ $$ = "?";
+ }
+ | ':'
+ {
+ $$ = ":";
+ }
| T_CONCAT
{
$$ = "##";
@@ -548,7 +557,7 @@ directive
}
vkd3d_free($2);
}
- | T_IF logicor_expr T_NEWLINE
+ | T_IF expr T_NEWLINE
{
if (!preproc_push_if(ctx, !!$2))
YYABORT;
@@ -563,7 +572,7 @@ directive
preproc_push_if(ctx, !preproc_find_macro(ctx, $2));
vkd3d_free($2);
}
- | T_ELIF logicor_expr T_NEWLINE
+ | T_ELIF expr T_NEWLINE
{
const struct preproc_file *file = preproc_get_top_file(ctx);
@@ -791,3 +800,10 @@ logicor_expr
{
$$ = $1 || $3;
}
+
+expr
+ : logicor_expr
+ | expr '?' logicor_expr ':' logicor_expr
+ {
+ $$ = $1 ? $3 : $5;
+ }
More information about the wine-cvs
mailing list