diff options
| author | Carl Worth <[email protected]> | 2010-07-28 11:10:52 -0700 |
|---|---|---|
| committer | Carl Worth <[email protected]> | 2010-07-28 11:10:52 -0700 |
| commit | efef950f393dfe6cb7ef60bee646f2197143df41 (patch) | |
| tree | 048049cc5e9882ef608f422a334a7b8c10aecc8e /src/glsl | |
| parent | 2233d10442f1e19d18693fc030aefe292b14cf29 (diff) | |
glcpp: Explicitly expect 0 shift/reduce conflicts.
The "%expect 0" construct will make bison emit an error if any future
changes to the grammar introduce shift/reduce conflicts, (without also
increasing the number after "%expect").
Diffstat (limited to 'src/glsl')
| -rw-r--r-- | src/glsl/glcpp/glcpp-parse.y | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y index 3322db06ed3..41cfff5551c 100644 --- a/src/glsl/glcpp/glcpp-parse.y +++ b/src/glsl/glcpp/glcpp-parse.y @@ -141,6 +141,7 @@ glcpp_parser_lex_from (glcpp_parser_t *parser, token_list_t *list); %parse-param {glcpp_parser_t *parser} %lex-param {glcpp_parser_t *parser} +%expect 0 %token COMMA_FINAL DEFINED ELIF_EXPANDED HASH HASH_DEFINE_FUNC HASH_DEFINE_OBJ HASH_ELIF HASH_ELSE HASH_ENDIF HASH_IF HASH_IFDEF HASH_IFNDEF HASH_UNDEF IDENTIFIER IF_EXPANDED INTEGER INTEGER_STRING NEWLINE OTHER PLACEHOLDER SPACE %token PASTE %type <ival> expression INTEGER operator SPACE |