Zebediah Figura : d3dcompiler: Avoid using the lookahead token for location.
Alexandre Julliard
julliard at winehq.org
Fri Apr 17 16:12:54 CDT 2020
Module: wine
Branch: master
Commit: 53e6b328f68901ed2fc141bbd7146d055796442e
URL: https://source.winehq.org/git/wine.git/?a=commit;h=53e6b328f68901ed2fc141bbd7146d055796442e
Author: Zebediah Figura <zfigura at codeweavers.com>
Date: Tue Apr 14 19:39:56 2020 -0500
d3dcompiler: Avoid using the lookahead token for location.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3dcompiler_43/hlsl.y | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y
index d3ef18bb6e..ccabd6d29f 100644
--- a/dlls/d3dcompiler_43/hlsl.y
+++ b/dlls/d3dcompiler_43/hlsl.y
@@ -2035,7 +2035,7 @@ primary_expr: C_FLOAT
YYABORT;
}
c->node.type = HLSL_IR_CONSTANT;
- c->node.loc = get_location(&yylloc);
+ c->node.loc = get_location(&@1);
c->node.data_type = new_hlsl_type(d3dcompiler_strdup("float"), HLSL_CLASS_SCALAR, HLSL_TYPE_FLOAT, 1, 1);
c->v.value.f[0] = $1;
if (!($$ = make_list(&c->node)))
@@ -2050,7 +2050,7 @@ primary_expr: C_FLOAT
YYABORT;
}
c->node.type = HLSL_IR_CONSTANT;
- c->node.loc = get_location(&yylloc);
+ c->node.loc = get_location(&@1);
c->node.data_type = new_hlsl_type(d3dcompiler_strdup("int"), HLSL_CLASS_SCALAR, HLSL_TYPE_INT, 1, 1);
c->v.value.i[0] = $1;
if (!($$ = make_list(&c->node)))
@@ -2065,7 +2065,7 @@ primary_expr: C_FLOAT
YYABORT;
}
c->node.type = HLSL_IR_CONSTANT;
- c->node.loc = get_location(&yylloc);
+ c->node.loc = get_location(&@1);
c->node.data_type = new_hlsl_type(d3dcompiler_strdup("bool"), HLSL_CLASS_SCALAR, HLSL_TYPE_BOOL, 1, 1);
c->v.value.b[0] = $1;
if (!($$ = make_list(&c->node)))
More information about the wine-cvs
mailing list