mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-05-05 07:28:11 +02:00
glsl: Add an internal-error catch-all rule
This is to avoid the default, silent flex rule which simply prints the character to stdout. For the following Khronos GLES3 conformance tests: invalid_char_in_name_vertex invalid_char_in_name_fragment With this commit, these tests now report Pass where they previously reported Fail, but Mesa isn't behaving correctly yet. It's now reporting the internal error where what is really desired is a syntax error. Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
This commit is contained in:
parent
f062f0506a
commit
f196eb2d39
1 changed files with 13 additions and 0 deletions
|
|
@ -153,6 +153,9 @@ literal_integer(char *text, int len, struct _mesa_glsl_parse_state *state,
|
|||
%option prefix="_mesa_glsl_lexer_"
|
||||
%option extra-type="struct _mesa_glsl_parse_state *"
|
||||
|
||||
/* Note: When adding any start conditions to this list, you must also
|
||||
* update the "Internal compiler error" catch-all rule near the end of
|
||||
* this file. */
|
||||
%x PP PRAGMA
|
||||
|
||||
DEC_INT [1-9][0-9]*
|
||||
|
|
@ -555,6 +558,16 @@ subroutine KEYWORD(0, 300, 0, 0, SUBROUTINE);
|
|||
|
||||
. { return yytext[0]; }
|
||||
|
||||
/* This is a catch-all to avoid the annoying default flex action which
|
||||
* matches any character and prints it. If any input ever matches this
|
||||
* rule, then we have made a mistake above and need to fix one or more
|
||||
* of the preceding patterns to match that input. */
|
||||
<PP,PRAGMA>. {
|
||||
_mesa_glsl_error(yylloc, yyextra,
|
||||
"Internal compiler error: Unexpected character: %s", yytext);
|
||||
}
|
||||
|
||||
|
||||
%%
|
||||
|
||||
int
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue