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

glcpp: Reject #version and #line not followed by whitespace

Browse source 
Fixes part of es3conform's preprocess16_frag test.
Reviewed-by: Carl Worth <cworth@cworth.org>
This commit is contained in:
Matt Turner 2012-11-20 17:23:42 -08:00
parent 91ca053714
commit aed466192a
5 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/glsl/glcpp/glcpp-lex.l
View file

@ -120,7 +120,7 @@ HEXADECIMAL_INTEGER 0[xX][0-9a-fA-F]+[uU]?
return SPACE;
}
{HASH}version {
{HASH}version{HSPACE}+ {
yylval->str = ralloc_strdup (yyextra, yytext);
yyextra->space_tokens = 0;
return HASH_VERSION;
@ -135,7 +135,7 @@ HEXADECIMAL_INTEGER 0[xX][0-9a-fA-F]+[uU]?
return OTHER;
}
{HASH}line {
{HASH}line{HSPACE}+ {
return HASH_LINE;
}

1
src/glsl/glcpp/tests/108-no-space-after-hash-version.c Normal file
View file

@ -0,0 +1 @@
#version110

2
src/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected Normal file
View file

@ -0,0 +1,2 @@
0:1(3): preprocessor error: Invalid tokens after #

1
src/glsl/glcpp/tests/109-no-space-after-hash-line.c Normal file
View file

@ -0,0 +1 @@
#line2

2
src/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected Normal file
View file

@ -0,0 +1,2 @@
0:1(3): preprocessor error: Invalid tokens after #