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

[Alexandre Julliard]

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

Author: Zebediah Figura 
Date:   Tue Jan 19 11:18:21 2021 -0600

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

Signed-off-by: Zebediah Figura 
Signed-off-by: Henri Verbeet 
Signed-off-by: Matteo Bruni 
Signed-off-by: Alexandre Julliard

---

libs/vkd3d-shader/preproc.l |  7 +++++--
 libs/vkd3d-shader/preproc.y | 43 +++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l
index a522b7c..6779a39 100644
--- a/libs/vkd3d-shader/preproc.l
+++ b/libs/vkd3d-shader/preproc.l
@@ -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;}

%%
diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y
index 61b6baf..6d88419 100644
--- a/libs/vkd3d-shader/preproc.y
+++ b/libs/vkd3d-shader/preproc.y
@@ -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;
+        }