glcpp: Clean up most empty mid-rule actions left by previous commit.
authorKenneth Graunke <kenneth@whitecape.org>
Sat, 5 Mar 2016 02:47:39 +0000 (18:47 -0800)
committerKenneth Graunke <kenneth@whitecape.org>
Tue, 8 Mar 2016 07:02:03 +0000 (23:02 -0800)
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>
src/compiler/glsl/glcpp/glcpp-parse.y

index a93a138a9c6f58faa52072962a3fabdcf3dd4bd9..1f416a16305267779b192234a18cc2b6bd1d732e 100644 (file)
@@ -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 {