KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Kenneth Graunke 2016-03-04 18:52:47 -08:00
parent e816c8b54a
commit ea9fa5ff05
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/glsl/glcpp/glcpp-parse.y
View File

@ -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

2
src/compiler/glsl/glcpp/tests/129-define-non-identifier.c.expected
View File

@ -1,2 +1,2 @@
0:1(9): preprocessor error: #define followed by a non-identifier: 123
0:1(9): preprocessor error: syntax error, unexpected INTEGER_STRING, expecting FUNC_IDENTIFIER or OBJ_IDENTIFIER
0:1(9): preprocessor error: syntax error, unexpected INTEGER_STRING, expecting FUNC_IDENTIFIER or OBJ_IDENTIFIER or NEWLINE