Mesa (master): glcpp: Allow vertical tab and form feed characters in GLSL
Kenneth Graunke
kwg at kemper.freedesktop.org
Thu Jan 5 01:26:18 UTC 2017
Module: Mesa
Branch: master
Commit: 16b480547ffaa5bcc8fdac184349b13ce8f019f5
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=16b480547ffaa5bcc8fdac184349b13ce8f019f5
Author: Carl Worth <cworth at cworth.org>
Date: Tue Aug 5 16:33:03 2014 -0700
glcpp: Allow vertical tab and form feed characters in GLSL
Of course, these aren't really useful for anything, but the GLSL language
specification does allow them:
The source character set used for the OpenGL shading languages,
outside of comments, is a subset of UTF-8. It includes the following
characters:
...
White space: the space character, horizontal tab, vertical tab, form
feed, carriage-return, and line- feed.
[GLSL Language Specification 4.30.6, section 3.1]
So treat vertical tab ('\v' or ^K) and form-feed ('\f' or ^L) as horizontal
space characters.
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
---
src/compiler/glsl/glcpp/glcpp-lex.l | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/compiler/glsl/glcpp/glcpp-lex.l b/src/compiler/glsl/glcpp/glcpp-lex.l
index f4a6876..381b973 100644
--- a/src/compiler/glsl/glcpp/glcpp-lex.l
+++ b/src/compiler/glsl/glcpp/glcpp-lex.l
@@ -175,7 +175,7 @@ glcpp_lex_update_state_per_token (glcpp_parser_t *parser, int token)
SPACE [[:space:]]
NONSPACE [^[:space:]]
-HSPACE [ \t]
+HSPACE [ \t\v\f]
HASH #
NEWLINE (\r\n|\n\r|\r|\n)
IDENTIFIER [_a-zA-Z][_a-zA-Z0-9]*
More information about the mesa-commit
mailing list