summaryrefslogtreecommitdiffstats
path: root/src/compiler/glsl/glcpp/glcpp-parse.y
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2016-03-04 18:52:47 -0800
committerKenneth Graunke <[email protected]>2016-03-07 23:02:05 -0800
commitea9fa5ff056846029435d2969e1de8da33a5b50d (patch)
treeae04e82cf44c4b78ab7adea3e87b6abc105dd68b /src/compiler/glsl/glcpp/glcpp-parse.y
parente816c8b54a3b2a4e430e0c52eb4068480561b45e (diff)
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 <[email protected]> Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/compiler/glsl/glcpp/glcpp-parse.y')
-rw-r--r--src/compiler/glsl/glcpp/glcpp-parse.y2
1 files changed, 1 insertions, 1 deletions
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