From: Zebediah Figura zfigura@codeweavers.com
None of these currently have any meaning, and none of these can currently be parsed as distinct tokens either (i.e. they will generate a syntax error anyway). --- libs/vkd3d-shader/hlsl.l | 5 ----- libs/vkd3d-shader/hlsl.y | 5 ----- 2 files changed, 10 deletions(-)
diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index 527d853a..d21d03bb 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -165,7 +165,6 @@ while {return KW_WHILE; } <<= {return OP_LEFTSHIFTASSIGN; } >> {return OP_RIGHTSHIFT; } >>= {return OP_RIGHTSHIFTASSIGN; } -... {return OP_ELLIPSIS; } <= {return OP_LE; } >= {return OP_GE; } != {return OP_NE; } @@ -177,10 +176,6 @@ while {return KW_WHILE; } &= {return OP_ANDASSIGN; } |= {return OP_ORASSIGN; } ^= {return OP_XORASSIGN; } -## {return OP_UNKNOWN1; } -#@ {return OP_UNKNOWN2; } -:: {return OP_UNKNOWN3; } --> {return OP_UNKNOWN4; }
column_major {return KW_COLUMN_MAJOR; } row_major {return KW_ROW_MAJOR; } diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 5fd140fb..f26f81e8 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -4833,7 +4833,6 @@ static void check_duplicated_switch_cases(struct hlsl_ctx *ctx, const struct hls %token OP_LEFTSHIFTASSIGN %token OP_RIGHTSHIFT %token OP_RIGHTSHIFTASSIGN -%token OP_ELLIPSIS %token OP_LE %token OP_GE %token OP_NE @@ -4845,10 +4844,6 @@ static void check_duplicated_switch_cases(struct hlsl_ctx *ctx, const struct hls %token OP_ANDASSIGN %token OP_ORASSIGN %token OP_XORASSIGN -%token OP_UNKNOWN1 -%token OP_UNKNOWN2 -%token OP_UNKNOWN3 -%token OP_UNKNOWN4
%token <floatval> C_FLOAT