Zebediah Figura : vkd3d-shader: Implement logical operators in #if directives.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 338399d5636ae3c2e6204c815821413292902bc6
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=338399d5636ae3c2e6204c815821413292902bc6

Author: Zebediah Figura <zfigura at codeweavers.com>
Date:   Thu Jan 21 16:10:45 2021 -0600

vkd3d-shader: Implement logical 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 |  4 ++--
 libs/vkd3d-shader/preproc.y | 30 ++++++++++++++++++++++++++++--
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l
index 4c82bab..37acc5e 100644
--- a/libs/vkd3d-shader/preproc.l
+++ b/libs/vkd3d-shader/preproc.l
@@ -82,6 +82,8 @@ IDENTIFIER      [A-Za-z_][A-Za-z0-9_]*
 <INITIAL>">="                       {return T_GE;}
 <INITIAL>"=="                       {return T_EQ;}
 <INITIAL>"!="                       {return T_NE;}
+<INITIAL>"&&"                       {return T_AND;}
+<INITIAL>"||"                       {return T_OR;}
 
     /* We have no use for floats, but shouldn't parse them as integers. */
 
@@ -95,8 +97,6 @@ IDENTIFIER      [A-Za-z_][A-Za-z0-9_]*
 
 <INITIAL>##                         {return T_CONCAT;}
 
-<INITIAL>"&&"                       {return T_TEXT;}
-<INITIAL>"||"                       {return T_TEXT;}
 <INITIAL>"++"                       {return T_TEXT;}
 <INITIAL>"--"                       {return T_TEXT;}
 <INITIAL>"<<"=?                     {return T_TEXT;}
diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y
index fa5e5cc..051f94b 100644
--- a/libs/vkd3d-shader/preproc.y
+++ b/libs/vkd3d-shader/preproc.y
@@ -336,6 +336,8 @@ static void free_parse_arg_names(struct parse_arg_names *args)
 %token T_GE ">="
 %token T_EQ "=="
 %token T_NE "!="
+%token T_AND "&&"
+%token T_OR "||"
 %token T_DEFINED "defined"
 
 %type <integer> primary_expr
@@ -347,6 +349,8 @@ static void free_parse_arg_names(struct parse_arg_names *args)
 %type <integer> bitand_expr
 %type <integer> bitxor_expr
 %type <integer> bitor_expr
+%type <integer> logicand_expr
+%type <integer> logicor_expr
 %type <string> body_token
 %type <const_string> body_token_const
 %type <string_buffer> body_text
@@ -499,6 +503,14 @@ body_token_const
         {
             $$ = "!=";
         }
+    | T_AND
+        {
+            $$ = "&&";
+        }
+    | T_OR
+        {
+            $$ = "||";
+        }
     | T_DEFINED
         {
             $$ = "defined";
@@ -536,7 +548,7 @@ directive
             }
             vkd3d_free($2);
         }
-    | T_IF bitor_expr T_NEWLINE
+    | T_IF logicor_expr T_NEWLINE
         {
             if (!preproc_push_if(ctx, !!$2))
                 YYABORT;
@@ -551,7 +563,7 @@ directive
             preproc_push_if(ctx, !preproc_find_macro(ctx, $2));
             vkd3d_free($2);
         }
-    | T_ELIF bitor_expr T_NEWLINE
+    | T_ELIF logicor_expr T_NEWLINE
         {
             const struct preproc_file *file = preproc_get_top_file(ctx);
 
@@ -765,3 +777,17 @@ bitor_expr
         {
             $$ = $1 | $3;
         }
+
+logicand_expr
+    : bitor_expr
+    | logicand_expr T_AND bitor_expr
+        {
+            $$ = $1 && $3;
+        }
+
+logicor_expr
+    : logicand_expr
+    | logicor_expr T_OR logicand_expr
+        {
+            $$ = $1 || $3;
+        }