fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 17:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl/glcpp: Promote "extra token at end of directive" from warning to error

Browse source 
We've always warned about this case, but a recent confromance test expects
this to be an error that causes compilation to fail. Make it so.

Also add a "make check" test to ensure these errors are generated.

This fixes the following Khronos GLES3 conformance tests:

	invalid_conditionals.tokens_after_ifdef_vertex
	invalid_conditionals.tokens_after_ifdef_fragment
	invalid_conditionals.tokens_after_ifndef_vertex
	invalid_conditionals.tokens_after_ifndef_fragment

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Carl Worth 2014-06-13 15:40:42 -07:00
parent dac3c986c5
commit 43047384c3
3 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/glsl/glcpp/glcpp-parse.y
View file

@ -625,7 +625,7 @@ replacement_list:
junk: junk:
/* empty */ /* empty */
| pp_tokens { | pp_tokens {
glcpp_warning(&@1, parser, "extra tokens at end of directive"); glcpp_error(&@1, parser, "extra tokens at end of directive");
} }
; ;

5
src/glsl/glcpp/tests/126-garbage-after-directive.c Normal file
View file

@ -0,0 +1,5 @@
#ifdef MACRO garbage
#endif
#ifndef MORE garbage
#endif

8
src/glsl/glcpp/tests/126-garbage-after-directive.c.expected Normal file
View file

@ -0,0 +1,8 @@
0:1(15): preprocessor error: extra tokens at end of directive
0:4(14): preprocessor error: extra tokens at end of directive