diff options
| author | Kenneth Graunke <[email protected]> | 2016-03-04 18:52:47 -0800 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2016-03-07 23:02:05 -0800 |
| commit | ea9fa5ff056846029435d2969e1de8da33a5b50d (patch) | |
| tree | ae04e82cf44c4b78ab7adea3e87b6abc105dd68b /src/compiler/glsl | |
| parent | e816c8b54a3b2a4e430e0c52eb4068480561b45e (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')
| -rw-r--r-- | src/compiler/glsl/glcpp/glcpp-parse.y | 2 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/129-define-non-identifier.c.expected | 2 |
2 files changed, 2 insertions, 2 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 diff --git a/src/compiler/glsl/glcpp/tests/129-define-non-identifier.c.expected b/src/compiler/glsl/glcpp/tests/129-define-non-identifier.c.expected index fd0b41347fa..5206a5c553c 100644 --- a/src/compiler/glsl/glcpp/tests/129-define-non-identifier.c.expected +++ b/src/compiler/glsl/glcpp/tests/129-define-non-identifier.c.expected @@ -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 |