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

Fix #if-skipping to *really* skip the skipped group.

Browse Source 
Previously we were avoiding printing within a skipped group, but we
were still evluating directives such as #define and #undef and still
emitting diagnostics for things such as macro calls with the wrong
number of arguments.

Add a test for this and fix it with a high-priority rule in the lexer
that consumes the skipped content.
This commit is contained in:
Carl Worth
2010-06-01 11:20:18 -07:00
parent 96d3994881
commit a771a40e22
4 changed files with 50 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glcpp-parse.y
+4 -11
View File
@@ -159,19 +159,11 @@ input:
line:
control_line {
if (parser->skip_stack == NULL ||
parser->skip_stack->type == SKIP_NO_SKIP)
{
printf ("\n");
}
printf ("\n");
}
| text_line {
if (parser->skip_stack == NULL ||
parser->skip_stack->type == SKIP_NO_SKIP)
{
_glcpp_parser_print_expanded_token_list (parser, $1);
printf ("\n");
}
_glcpp_parser_print_expanded_token_list (parser, $1);
printf ("\n");
talloc_free ($1);
}
| expanded_line
@@ -889,6 +881,7 @@ glcpp_parser_create (void)
parser->defines = hash_table_ctor (32, hash_table_string_hash,
hash_table_string_compare);
parser->active = _string_list_create (parser);
parser->lexing_if = 0;
parser->space_tokens = 1;
parser->newline_as_space = 0;
parser->in_control_line = 0;