[PATCH 0/2] MR478: vkd3d-shader/hlsl: Parse integers with the 'u' postfix.

[PATCH 1/2] tests: Test integers with the 'u' postfix.

[Francisco Casas]

From: Francisco Casas

---
 tests/hlsl/initializer-numeric.shader_test | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tests/hlsl/initializer-numeric.shader_test b/tests/hlsl/initializer-numeric.shader_test
index 40576887a..185c1ffb4 100644
--- a/tests/hlsl/initializer-numeric.shader_test
+++ b/tests/hlsl/initializer-numeric.shader_test
@@ -46,3 +46,15 @@ float4 main() : sv_target
 [test]
 draw quad
 probe all rgba (10.1, 1.1, 1.2, 2.1) 4
+
+
+[pixel shader todo]
+float4 main() : sv_target
+{
+    uint4 aa = { 3u, 0xfau, 020u, -1u};
+    return float4(aa);
+}
+
+[test]
+todo(sm<6) draw quad
+todo(sm<6) probe all rgba (3.0, 250.0, 16.0, 4.2949673e+009) 4

[PATCH 2/2] vkd3d-shader/hlsl: Parse integers with the 'u' postfix.

[Francisco Casas]

From: Francisco Casas

---
 libs/vkd3d-shader/hlsl.l                   | 6 +++---
 tests/hlsl/initializer-numeric.shader_test | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l
index 0e5f2bb61..3e08fa0a7 100644
--- a/libs/vkd3d-shader/hlsl.l
+++ b/libs/vkd3d-shader/hlsl.l
@@ -203,15 +203,15 @@ while                   {return KW_WHILE;               }
                             yylval->floatval = atof(yytext);
                             return C_FLOAT;
                         }
-0x[0-9a-fA-F]+          {
+0x[0-9a-fA-F]+u?        {
                             yylval->intval = vkd3d_parse_integer(yytext);
                             return C_INTEGER;
                         }
-0[0-7]+                 {
+0[0-7]+u?               {
                             yylval->intval = vkd3d_parse_integer(yytext);
                             return C_INTEGER;
                         }
-[0-9]+                  {
+[0-9]+u?                {
                             yylval->intval = vkd3d_parse_integer(yytext);
                             return C_INTEGER;
                         }
diff --git a/tests/hlsl/initializer-numeric.shader_test b/tests/hlsl/initializer-numeric.shader_test
index 185c1ffb4..af8a00026 100644
--- a/tests/hlsl/initializer-numeric.shader_test
+++ b/tests/hlsl/initializer-numeric.shader_test
@@ -48,7 +48,7 @@ draw quad
 probe all rgba (10.1, 1.1, 1.2, 2.1) 4

-[pixel shader todo]
+[pixel shader]
 float4 main() : sv_target
 {
     uint4 aa = { 3u, 0xfau, 020u, -1u};
@@ -56,5 +56,5 @@ float4 main() : sv_target
 }

[test]
-todo(sm<6) draw quad
-todo(sm<6) probe all rgba (3.0, 250.0, 16.0, 4.2949673e+009) 4
+draw quad
+probe all rgba (3.0, 250.0, 16.0, 4.2949673e+009) 4

[Nikolay Sivov (＠nsivov)]

Uppercase 'U' suffix also needs to work.

[Francisco Casas (＠fcasas)]

On Thu Nov 16 16:10:50 2023 +0000, Nikolay Sivov wrote:
> Uppercase 'U' suffix also needs to work.

Thanks for pointing it out!