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-lex.l
+40 -20
View File
@@ -47,6 +47,45 @@ HEXADECIMAL_INTEGER 0[xX][0-9a-fA-F]+[uU]?
%%
{HASH}if/.*\n {
yyextra->lexing_if = 1;
yyextra->space_tokens = 0;
return HASH_IF;
}
{HASH}elif/.*\n {
yyextra->lexing_if = 1;
yyextra->space_tokens = 0;
return HASH_ELIF;
}
{HASH}else/.*\n {
yyextra->space_tokens = 0;
return HASH_ELSE;
}
{HASH}endif/.*\n {
yyextra->space_tokens = 0;
return HASH_ENDIF;
}
/* When skipping (due to an #if 0 or similar) consume anything
* up to a newline. We do this less priroty than any
* #if-related directive (#if, #elif, #else, #endif), but with
* more priority than any other directive or token to avoid
* any side-effects from skipped content.
*
* We use the lexing_if flag to avoid skipping any part of an
* if conditional expression. */
[^\n]+/\n {
if (yyextra->lexing_if ||
yyextra->skip_stack == NULL ||
yyextra->skip_stack->type == SKIP_NO_SKIP)
{
REJECT;
}
}
{HASH}define{HSPACE}+/{IDENTIFIER}"(" {
yyextra->space_tokens = 0;
return HASH_DEFINE_FUNC;
@@ -62,26 +101,6 @@ HEXADECIMAL_INTEGER 0[xX][0-9a-fA-F]+[uU]?
return HASH_UNDEF;
}
{HASH}if {
yyextra->space_tokens = 0;
return HASH_IF;
}
{HASH}elif {
yyextra->space_tokens = 0;
return HASH_ELIF;
}
{HASH}else {
yyextra->space_tokens = 0;
return HASH_ELSE;
}
{HASH}endif {
yyextra->space_tokens = 0;
return HASH_ENDIF;
}
{HASH} {
yyextra->space_tokens = 0;
return HASH;
@@ -163,6 +182,7 @@ HEXADECIMAL_INTEGER 0[xX][0-9a-fA-F]+[uU]?
}
\n {
yyextra->lexing_if = 0;
return NEWLINE;
}