fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 05:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

glcpp: Accept #elif without an expression if the expression doesn't matter.

Browse source 
Issue a warning.  nVidia's compiler seems to accept this; apparently
GCC < 4.4 did as well: http://gcc.gnu.org/gcc-4.4/porting_to.html
This commit is contained in:
Kenneth Graunke 2010-06-21 12:20:22 -07:00
parent 74704e80c6
commit 332fc47dc0
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
glcpp/glcpp-parse.y
View file

@ -249,6 +249,17 @@ control_line:
_token_list_append_list (expanded, $2);
glcpp_parser_lex_from (parser, expanded);
}
| HASH_ELIF NEWLINE {
/* #elif without an expression results in a warning if the
* condition doesn't matter (we just handled #if 1 or such)
* but an error otherwise. */
if (parser->skip_stack != NULL && parser->skip_stack->type == SKIP_NO_SKIP) {
parser->skip_stack->type = SKIP_TO_ENDIF;
glcpp_warning(& @1, parser, "ignoring illegal #elif without expression");
} else {
glcpp_error(& @1, parser, "#elif needs an expression");
}
}
| HASH_ELSE NEWLINE {
_glcpp_parser_skip_stack_change_if (parser, & @1, "else", 1);
}