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

glcpp: Ignore junk tokens at end of #ifdef/#ifndef (with warning)

Browse source 
Both nVidia's compiler and GCC accept this.
Fixes CorrectPreprocess11.frag.
This commit is contained in:
Kenneth Graunke 2010-06-18 20:08:15 -07:00
parent c9529c4d77
commit 6587574354
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
glcpp/glcpp-parse.y
View file

@ -232,12 +232,12 @@ control_line:
_token_list_append_list (expanded, $2);
glcpp_parser_lex_from (parser, expanded);
}
| HASH_IFDEF IDENTIFIER NEWLINE {
| HASH_IFDEF IDENTIFIER junk NEWLINE {
macro_t *macro = hash_table_find (parser->defines, $2);
talloc_free ($2);
_glcpp_parser_skip_stack_push_if (parser, & @1, macro != NULL);
}
| HASH_IFNDEF IDENTIFIER NEWLINE {
| HASH_IFNDEF IDENTIFIER junk NEWLINE {
macro_t *macro = hash_table_find (parser->defines, $2);
talloc_free ($2);
_glcpp_parser_skip_stack_push_if (parser, & @1, macro == NULL);
@ -377,6 +377,12 @@ replacement_list:
| pp_tokens
;
junk:
/* empty */
| pp_tokens {
glcpp_warning(&@1, parser, "extra tokens at end of directive");
}
pp_tokens:
preprocessing_token {
parser->space_tokens = 1;