diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2016-03-04 18:47:39 -0800 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2016-03-07 23:02:03 -0800 |
| commit | e816c8b54a3b2a4e430e0c52eb4068480561b45e (patch) | |
| tree | 966275eaf4e329b659ee6f2808e1863dbf178183 /src/compiler/glsl/glcpp | |
| parent | 639bbe3cb46c271aea57a9f849efe0d0f6d16e2a (diff) | |
| download | external_mesa3d-e816c8b54a3b2a4e430e0c52eb4068480561b45e.zip external_mesa3d-e816c8b54a3b2a4e430e0c52eb4068480561b45e.tar.gz external_mesa3d-e816c8b54a3b2a4e430e0c52eb4068480561b45e.tar.bz2 | |
glcpp: Clean up most empty mid-rule actions left by previous commit.
I didn't want to pollute the previous patch with all the $4 -> $3
changes.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/compiler/glsl/glcpp')
| -rw-r--r-- | src/compiler/glsl/glcpp/glcpp-parse.y | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/compiler/glsl/glcpp/glcpp-parse.y b/src/compiler/glsl/glcpp/glcpp-parse.y index a93a138..1f416a1 100644 --- a/src/compiler/glsl/glcpp/glcpp-parse.y +++ b/src/compiler/glsl/glcpp/glcpp-parse.y @@ -266,13 +266,13 @@ control_line: ralloc_asprintf_rewrite_tail (&parser->output, &parser->output_length, "\n"); } | control_line_error -| HASH_TOKEN LINE { } pp_tokens NEWLINE { +| HASH_TOKEN LINE pp_tokens NEWLINE { if (parser->skip_stack == NULL || parser->skip_stack->type == SKIP_NO_SKIP) { _glcpp_parser_expand_and_lex_from (parser, - LINE_EXPANDED, $4, + LINE_EXPANDED, $3, EXPANSION_MODE_IGNORE_DEFINED); } } @@ -280,23 +280,23 @@ control_line: control_line_success: HASH_TOKEN DEFINE_TOKEN { } define -| HASH_TOKEN UNDEF { } IDENTIFIER NEWLINE { +| HASH_TOKEN UNDEF IDENTIFIER NEWLINE { macro_t *macro; - if (strcmp("__LINE__", $4) == 0 - || strcmp("__FILE__", $4) == 0 - || strcmp("__VERSION__", $4) == 0 - || strncmp("GL_", $4, 3) == 0) + if (strcmp("__LINE__", $3) == 0 + || strcmp("__FILE__", $3) == 0 + || strcmp("__VERSION__", $3) == 0 + || strncmp("GL_", $3, 3) == 0) glcpp_error(& @1, parser, "Built-in (pre-defined)" " macro names cannot be undefined."); - macro = hash_table_find (parser->defines, $4); + macro = hash_table_find (parser->defines, $3); if (macro) { - hash_table_remove (parser->defines, $4); + hash_table_remove (parser->defines, $3); ralloc_free (macro); } - ralloc_free ($4); + ralloc_free ($3); } -| HASH_TOKEN IF { } pp_tokens NEWLINE { +| HASH_TOKEN IF pp_tokens NEWLINE { /* Be careful to only evaluate the 'if' expression if * we are not skipping. When we are skipping, we * simply push a new 0-valued 'if' onto the skip @@ -308,7 +308,7 @@ control_line_success: parser->skip_stack->type == SKIP_NO_SKIP) { _glcpp_parser_expand_and_lex_from (parser, - IF_EXPANDED, $4, + IF_EXPANDED, $3, EXPANSION_MODE_EVALUATE_DEFINED); } else @@ -327,14 +327,14 @@ control_line_success: } _glcpp_parser_skip_stack_push_if (parser, & @1, 0); } -| HASH_TOKEN IFDEF { } IDENTIFIER junk NEWLINE { - macro_t *macro = hash_table_find (parser->defines, $4); - ralloc_free ($4); +| HASH_TOKEN IFDEF IDENTIFIER junk NEWLINE { + macro_t *macro = hash_table_find (parser->defines, $3); + ralloc_free ($3); _glcpp_parser_skip_stack_push_if (parser, & @1, macro != NULL); } -| HASH_TOKEN IFNDEF { } IDENTIFIER junk NEWLINE { - macro_t *macro = hash_table_find (parser->defines, $4); - ralloc_free ($4); +| HASH_TOKEN IFNDEF IDENTIFIER junk NEWLINE { + macro_t *macro = hash_table_find (parser->defines, $3); + ralloc_free ($3); _glcpp_parser_skip_stack_push_if (parser, & @3, macro == NULL); } | HASH_TOKEN ELIF pp_tokens NEWLINE { |