From ea9fa5ff056846029435d2969e1de8da33a5b50d Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Fri, 4 Mar 2016 18:52:47 -0800 Subject: glcpp: Remove empty mid-rule action which changes test behavior. Apparently this causes a slight difference in the parser's token expectations, leading to a different error message. It seems harmless, but I wanted to be cautious and separate it out. Signed-off-by: Kenneth Graunke Reviewed-by: Ian Romanick --- src/compiler/glsl/glcpp/glcpp-parse.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/compiler/glsl/glcpp/glcpp-parse.y') diff --git a/src/compiler/glsl/glcpp/glcpp-parse.y b/src/compiler/glsl/glcpp/glcpp-parse.y index 1f416a16305..e677811d6a7 100644 --- a/src/compiler/glsl/glcpp/glcpp-parse.y +++ b/src/compiler/glsl/glcpp/glcpp-parse.y @@ -279,7 +279,7 @@ control_line: ; control_line_success: - HASH_TOKEN DEFINE_TOKEN { } define + HASH_TOKEN DEFINE_TOKEN define | HASH_TOKEN UNDEF IDENTIFIER NEWLINE { macro_t *macro; if (strcmp("__LINE__", $3) == 0 -- cgit v1.2.3